fixed tests build

Author: odahcam

src/core/util/StringBuilder.ts

@@ -1,9 +1,7 @@
 import CharacterSetECI from '../common/CharacterSetECI';
-import StringEncoding from './StringEncoding';
 import { int, char } from '../../customTypings';
 import StringUtils from '../common/StringUtils';
 
-
 export default class StringBuilder {
 
   private encoding: CharacterSetECI;

src/index.ts

@@ -115,4 +115,6 @@ export { default as ITFReader } from './core/oned/ITFReader';
 export { default as Code39Reader } from './core/oned/Code39Reader';
 export { default as RSS14Reader } from './core/oned/rss/RSS14Reader';
 export { default as RSSExpandedReader } from './core/oned/rss/expanded/RSSExpandedReader';
+export { default as AbstractExpandedDecoder } from './core/oned/rss/expanded/decoders/AbstractExpandedDecoder';
+export { createDecoder as createAbstractExpandedDecoder } from './core/oned/rss/expanded/decoders/AbstractExpandedDecoderComplement';
 export { default as MultiFormatOneDReader } from './core/oned/MultiFormatOneDReader';

src/test/core/common/AbstractBlackBox.ts

@@ -16,19 +16,23 @@
 
 /*package com.google.zxing.common;*/
 
+import {
+  BarcodeFormat,
+  BinaryBitmap,
+  DecodeHintType,
+  HybridBinarizer,
+  LuminanceSource,
+  Reader,
+  Result,
+  ResultMetadataType,
+  ZXingStringEncoding
+} from '@zxing/library';
+import * as fs from 'fs';
+import * as path from 'path';
+import TestResult from '../common/TestResult';
+import SharpImageLuminanceSource from '../SharpImageLuminanceSource';
 import { assertEquals } from '../util/AssertUtils';
 import SharpImage from '../util/SharpImage';
-import SharpImageLuminanceSource from '../SharpImageLuminanceSource';
-import { BarcodeFormat } from '@zxing/library';
-import { BinaryBitmap } from '@zxing/library';
-import { DecodeHintType } from '@zxing/library';
-import { LuminanceSource } from '@zxing/library';
-import { Reader } from '@zxing/library';
-import { Result } from '@zxing/library';
-import { ResultMetadataType } from '@zxing/library';
-import TestResult from '../common/TestResult';
-import { HybridBinarizer } from '@zxing/library';
-import { ZXingStringEncoding } from '@zxing/library';
 
 
 /*import javax.imageio.ImageIO;*/

src/test/core/oned/rss/expanded/BinaryUtil.spec.ts

@@ -1,4 +1,4 @@
-import BitArray from '../../../../../core/common/BitArray';
+import { BitArray } from '@zxing/library';
 import { assertEquals } from '../../../util/AssertUtils';
 import BinaryUtil from './BinaryUtil';
 

src/test/core/oned/rss/expanded/BinaryUtil.ts

@@ -1,5 +1,4 @@
-import { BitArray } from '../../../../..';
-import IllegalStateException from '../../../../../core/IllegalStateException';
+import { BitArray, IllegalStateException } from '@zxing/library';
 import StringBuilder from '../../../../../core/util/StringBuilder';
 
 /*

src/test/core/oned/rss/expanded/ExpandedInformationDecoder.spec.ts

@@ -1,10 +1,3 @@
-import { BitArray } from '../../../../..';
-import AbstractExpandedDecoder from '../../../../../core/oned/rss/expanded/decoders/AbstractExpandedDecoder';
-import { assertEquals } from '../../../util/AssertUtils';
-import BinaryUtil from './BinaryUtil';
-
-
-
 /*
  * Copyright (C) 2010 ZXing authors
  *
@@ -39,6 +32,10 @@ import BinaryUtil from './BinaryUtil';
 // import org.junit.Assert;
 // import org.junit.Test;
 
+import { BitArray, AbstractExpandedDecoder, createAbstractExpandedDecoder } from '@zxing/library';
+import { assertEquals } from '../../../util/AssertUtils';
+import BinaryUtil from './BinaryUtil';
+
 /**
  * @author Pablo Orduña, University of Deusto ([email protected])
  * @author Eduardo Castillejo, University of Deusto ([email protected])
@@ -48,7 +45,7 @@ it('ExpandedInformationDecoderTest', () => {
   it('testNoAi', () => {
     let information: BitArray = BinaryUtil.buildBitArrayFromString(' .......X ..XX..X. X.X....X .......X ....');
 
-    let decoder: AbstractExpandedDecoder = AbstractExpandedDecoder.createDecoder(information);
+    let decoder: AbstractExpandedDecoder = createAbstractExpandedDecoder(information);
     let decoded: String = decoder.parseInformation();
     assertEquals('(10)12A', decoded);
   });

src/test/core/oned/rss/expanded/RSSExpandedBlackBox1.spec.ts

@@ -26,8 +26,7 @@
 
 // package com.google.zxing.oned;
 
-import BarcodeFormat from '../../../../../core/BarcodeFormat';
-import MultiFormatReader from '../../../../../core/MultiFormatReader';
+import { BarcodeFormat, MultiFormatReader } from '@zxing/library';
 import AbstractBlackBoxSpec from '../../../common/AbstractBlackBox';
 
 /**
@@ -43,8 +42,8 @@ class RSSExpandedBlackBox1Spec extends AbstractBlackBoxSpec {
 }
 
 describe('RSSExpandedBlackBox1Spec', () => {
-  it('testBlackBox', done => {
+  it('testBlackBox', async () => {
     const test = new RSSExpandedBlackBox1Spec();
-    return test.testBlackBox(done);
+    await test.testBlackBox();
   });
 });

src/test/core/oned/rss/expanded/RSSExpandedBlackBox2.spec.ts

@@ -26,8 +26,7 @@
 
 // package com.google.zxing.oned;
 
-import BarcodeFormat from '../../../../../core/BarcodeFormat';
-import MultiFormatReader from '../../../../../core/MultiFormatReader';
+import { BarcodeFormat, MultiFormatReader } from '@zxing/library';
 import AbstractBlackBoxSpec from '../../../common/AbstractBlackBox';
 
 /**
@@ -43,9 +42,9 @@ class RSSExpandedBlackBox2TestCase extends AbstractBlackBoxSpec {
 }
 
 describe('RSSExpandedBlackBox2TestCase', () => {
-  it('testBlackBox', done => {
+  it('testBlackBox', async () => {
     const test = new RSSExpandedBlackBox2TestCase();
-    return test.testBlackBox(done);
+    await test.testBlackBox();
   });
 });
 

src/test/core/oned/rss/expanded/RSSExpandedBlackBox3.spec.ts

@@ -26,8 +26,7 @@
 
 // package com.google.zxing.oned;
 
-import BarcodeFormat from '../../../../../core/BarcodeFormat';
-import MultiFormatReader from '../../../../../core/MultiFormatReader';
+import { BarcodeFormat, MultiFormatReader } from '@zxing/library';
 import AbstractBlackBoxSpec from '../../../common/AbstractBlackBox';
 
 /**
@@ -43,8 +42,8 @@ class RSSExpandedBlackBox3TestCase extends AbstractBlackBoxSpec {
 }
 
 describe('RSSExpandedBlackBox3TestCase', () => {
-  it('testBlackBox', done => {
+  it('testBlackBox', async () => {
     const test = new RSSExpandedBlackBox3TestCase();
-    return test.testBlackBox(done);
+    await test.testBlackBox();
   });
 });

src/test/core/oned/rss/expanded/RSSExpandedStackedBlackBox1.spec.ts

@@ -1,4 +1,4 @@
-import { BarcodeFormat, MultiFormatReader } from '../../../../..';
+import { BarcodeFormat, MultiFormatReader } from '@zxing/library';
 import AbstractBlackBoxSpec from '../../../common/AbstractBlackBox';
 
 /*
@@ -48,9 +48,9 @@ class RSSExpandedStackedBlackBox1TestCase extends AbstractBlackBoxSpec {
 }
 
 describe('RSSExpandedStackedBlackBox1TestCase', () => {
-  it('testBlackBox', done => {
+  it('testBlackBox', async () => {
     const test = new RSSExpandedStackedBlackBox1TestCase();
-    return test.testBlackBox(done);
+    await test.testBlackBox();
   });
 });