move all Result to RXingResult

2026-07-26 12:22:34 +00:00 · 2022-08-20 12:12:30 -05:00
parent 9f72478dc8
commit 90ace738b7
149 changed files with 1658 additions and 1658 deletions
--- a/java_test/java/com/google/zxing/oned/Code128WriterTestCase.java
+++ b/java_test/java/com/google/zxing/oned/Code128WriterTestCase.java
@@ -23,7 +23,7 @@ import org.junit.Test;

 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.EncodeHintType;
-import com.google.zxing.Result;
+import com.google.zxing.RXingResult;
 import com.google.zxing.Writer;
 import com.google.zxing.common.BitArray;
 import com.google.zxing.common.BitMatrix;
@@ -118,12 +118,12 @@ public class Code128WriterTestCase extends Assert {
    String toEncode = "\u00f1" + "10958" + "\u00f1" + "17160526";
    String expected = "1095817160526";

-    BitMatrix encResult = encode(toEncode, false, expected);
+    BitMatrix encRXingResult = encode(toEncode, false, expected);

-    int width = encResult.getWidth();
-    encResult = encode(toEncode, true, expected);
+    int width = encRXingResult.getWidth();
+    encRXingResult = encode(toEncode, true, expected);
    //Compact encoding has one latch less and encodes as STARTA,FNC1,1,CODEC,09,58,FNC1,17,16,05,26
-    assertEquals(width, encResult.getWidth() + 11);
+    assertEquals(width, encRXingResult.getWidth() + 11);
  }

  @Test
@@ -337,23 +337,23 @@ public class Code128WriterTestCase extends Assert {
    if (compact) {
      hints.put(EncodeHintType.CODE128_COMPACT, Boolean.TRUE);
    }
-    BitMatrix encResult = writer.encode(toEncode, BarcodeFormat.CODE_128, 0, 0, hints);
+    BitMatrix encRXingResult = writer.encode(toEncode, BarcodeFormat.CODE_128, 0, 0, hints);
    if (expectedLoopback != null) {
-      BitArray row = encResult.getRow(0, null);
-      Result rtResult = reader.decodeRow(0, row, null);
-      String actual = rtResult.getText();
+      BitArray row = encRXingResult.getRow(0, null);
+      RXingResult rtRXingResult = reader.decodeRow(0, row, null);
+      String actual = rtRXingResult.getText();
      assertEquals(expectedLoopback, actual);
    }
    if (compact) {
      //check that what is encoded compactly yields the same on loopback as what was encoded fast.
-      BitArray row = encResult.getRow(0, null);
-      Result rtResult = reader.decodeRow(0, row, null);
-      String actual = rtResult.getText();
-      BitMatrix encResultFast = writer.encode(toEncode, BarcodeFormat.CODE_128, 0, 0);
-      row = encResultFast.getRow(0, null);
-      rtResult = reader.decodeRow(0, row, null);
-      assertEquals(rtResult.getText(), actual);
+      BitArray row = encRXingResult.getRow(0, null);
+      RXingResult rtRXingResult = reader.decodeRow(0, row, null);
+      String actual = rtRXingResult.getText();
+      BitMatrix encRXingResultFast = writer.encode(toEncode, BarcodeFormat.CODE_128, 0, 0);
+      row = encRXingResultFast.getRow(0, null);
+      rtRXingResult = reader.decodeRow(0, row, null);
+      assertEquals(rtRXingResult.getText(), actual);
    }
-    return encResult;
+    return encRXingResult;
  }
 }
--- a/java_test/java/com/google/zxing/oned/Code39ExtendedModeTestCase.java
+++ b/java_test/java/com/google/zxing/oned/Code39ExtendedModeTestCase.java
@@ -24,7 +24,7 @@ import com.google.zxing.common.BitArray;
 import com.google.zxing.ChecksumException;
 import com.google.zxing.FormatException;
 import com.google.zxing.NotFoundException;
-import com.google.zxing.Result;
+import com.google.zxing.RXingResult;

 /**
 * @author Michael Jahn
@@ -44,14 +44,14 @@ public final class Code39ExtendedModeTestCase extends Assert {
           "000001001011011010101001001001011001101010101001010010010110101001011010010100100101011010010110100101001001011011010010101001010010010101011001011010010100100101101011001010100101001001010110110010101001010010010101010011011010010100100101101010011010100101001001010110100110101001010010010101011001101010010100100101101010100110100101001001010110101001101001010010010110110101001010010100100101010110100110100101001001011010110100101001010010010101101101001010010100100101010101100110100101001001011010101100101001010010010101101011001010010100100101010110110010100101001001011001010101101001010010010100110101011010010100100101100110101010100101001001010010110101101001010010010110010110101010010100100101001101101010101001001001010110110100101010010010010101010110011010100100100101101010110010101001001001010110101100101010010010010101011011001010010110110100000");
  }

-  private static void doTest(String expectedResult, String encodedResult)
+  private static void doTest(String expectedRXingResult, String encodedRXingResult)
      throws FormatException, ChecksumException, NotFoundException {
    Code39Reader sut = new Code39Reader(false, true);
-    BitMatrix matrix = BitMatrix.parse(encodedResult, "1", "0");
+    BitMatrix matrix = BitMatrix.parse(encodedRXingResult, "1", "0");
    BitArray row = new BitArray(matrix.getWidth());
    matrix.getRow(0, row);
-    Result result = sut.decodeRow(0, row, null);
-    assertEquals(expectedResult, result.getText());
+    RXingResult result = sut.decodeRow(0, row, null);
+    assertEquals(expectedRXingResult, result.getText());
  }

 }
--- a/java_test/java/com/google/zxing/oned/Code93ReaderTestCase.java
+++ b/java_test/java/com/google/zxing/oned/Code93ReaderTestCase.java
@@ -24,7 +24,7 @@ import com.google.zxing.common.BitArray;
 import com.google.zxing.ChecksumException;
 import com.google.zxing.FormatException;
 import com.google.zxing.NotFoundException;
-import com.google.zxing.Result;
+import com.google.zxing.RXingResult;

 /**
 * @author Daisuke Makiuchi
@@ -38,14 +38,14 @@ public final class Code93ReaderTestCase extends Assert {
           "0000001010111101101000101001100101001011001001100101100101001001100101100100101000010101010000101110101101101010001001001101001101001110010101101011101011011101011101101110100101110101101001110101110110101101010001110110101100010101110110101000110101110110101000101101110110101101001101110110101100101101110110101100110101110110101011011001110110101011001101110110101001101101110110101001110101001100101101010001010111101111");
  }

-  private static void doTest(String expectedResult, String encodedResult)
+  private static void doTest(String expectedRXingResult, String encodedRXingResult)
      throws FormatException, ChecksumException, NotFoundException {
    Code93Reader sut = new Code93Reader();
-    BitMatrix matrix = BitMatrix.parse(encodedResult, "1", "0");
+    BitMatrix matrix = BitMatrix.parse(encodedRXingResult, "1", "0");
    BitArray row = new BitArray(matrix.getWidth());
    matrix.getRow(0, row);
-    Result result = sut.decodeRow(0, row, null);
-    assertEquals(expectedResult, result.getText());
+    RXingResult result = sut.decodeRow(0, row, null);
+    assertEquals(expectedRXingResult, result.getText());
  }

 }
--- a/java_test/java/com/google/zxing/oned/rss/expanded/RSSExpandedImage2resultTestCase.java
+++ b/java_test/java/com/google/zxing/oned/rss/expanded/RSSExpandedImage2resultTestCase.java
@@ -43,10 +43,10 @@ import com.google.zxing.BinaryBitmap;
 import com.google.zxing.BufferedImageLuminanceSource;
 import com.google.zxing.NotFoundException;
 import com.google.zxing.ReaderException;
-import com.google.zxing.Result;
-import com.google.zxing.client.result.ExpandedProductParsedResult;
-import com.google.zxing.client.result.ParsedResult;
-import com.google.zxing.client.result.ResultParser;
+import com.google.zxing.RXingResult;
+import com.google.zxing.client.result.ExpandedProductParsedRXingResult;
+import com.google.zxing.client.result.ParsedRXingResult;
+import com.google.zxing.client.result.RXingResultParser;
 import com.google.zxing.common.AbstractBlackBoxTestCase;
 import com.google.zxing.common.BitArray;
 import com.google.zxing.common.GlobalHistogramBinarizer;
@@ -63,18 +63,18 @@ public final class RSSExpandedImage2resultTestCase extends Assert {
  @Test
  public void testDecodeRow2result2() throws Exception {
    // (01)90012345678908(3103)001750
-    ExpandedProductParsedResult expected =
-        new ExpandedProductParsedResult("(01)90012345678908(3103)001750",
+    ExpandedProductParsedRXingResult expected =
+        new ExpandedProductParsedRXingResult("(01)90012345678908(3103)001750",
                                        "90012345678908",
                                        null, null, null, null, null, null,
                                        "001750",
-                                        ExpandedProductParsedResult.KILOGRAM,
+                                        ExpandedProductParsedRXingResult.KILOGRAM,
                                        "3", null, null, null, new HashMap<>());

    assertCorrectImage2result("2.png", expected);
  }

-  private static void assertCorrectImage2result(String fileName, ExpandedProductParsedResult expected)
+  private static void assertCorrectImage2result(String fileName, ExpandedProductParsedRXingResult expected)
      throws IOException, NotFoundException {
    Path path = AbstractBlackBoxTestCase.buildTestBase("src/test/resources/blackbox/rssexpanded-1/").resolve(fileName);

@@ -83,18 +83,18 @@ public final class RSSExpandedImage2resultTestCase extends Assert {
    int rowNumber = binaryMap.getHeight() / 2;
    BitArray row = binaryMap.getBlackRow(rowNumber, null);

-    Result theResult;
+    RXingResult theRXingResult;
    try {
      RSSExpandedReader rssExpandedReader = new RSSExpandedReader();
-      theResult = rssExpandedReader.decodeRow(rowNumber, row, null);
+      theRXingResult = rssExpandedReader.decodeRow(rowNumber, row, null);
    } catch (ReaderException re) {
      fail(re.toString());
      return;
    }

-    assertSame(BarcodeFormat.RSS_EXPANDED, theResult.getBarcodeFormat());
+    assertSame(BarcodeFormat.RSS_EXPANDED, theRXingResult.getBarcodeFormat());

-    ParsedResult result = ResultParser.parseResult(theResult);
+    ParsedRXingResult result = RXingResultParser.parseRXingResult(theRXingResult);

    assertEquals(expected, result);
  }
--- a/java_test/java/com/google/zxing/oned/rss/expanded/RSSExpandedImage2stringTestCase.java
+++ b/java_test/java/com/google/zxing/oned/rss/expanded/RSSExpandedImage2stringTestCase.java
@@ -37,7 +37,7 @@ import com.google.zxing.BinaryBitmap;
 import com.google.zxing.BufferedImageLuminanceSource;
 import com.google.zxing.NotFoundException;
 import com.google.zxing.ReaderException;
-import com.google.zxing.Result;
+import com.google.zxing.RXingResult;
 import com.google.zxing.common.AbstractBlackBoxTestCase;
 import com.google.zxing.common.BitArray;
 import com.google.zxing.common.GlobalHistogramBinarizer;
@@ -196,7 +196,7 @@ public final class RSSExpandedImage2stringTestCase extends Assert {
    int rowNumber = binaryMap.getHeight() / 2;
    BitArray row = binaryMap.getBlackRow(rowNumber, null);

-    Result result;
+    RXingResult result;
    try {
      RSSExpandedReader rssExpandedReader = new RSSExpandedReader();
      result = rssExpandedReader.decodeRow(rowNumber, row, null);
--- a/java_test/java/com/google/zxing/oned/rss/expanded/RSSExpandedStackedInternalTestCase.java
+++ b/java_test/java/com/google/zxing/oned/rss/expanded/RSSExpandedStackedInternalTestCase.java
@@ -34,7 +34,7 @@ import org.junit.Test;

 import com.google.zxing.BinaryBitmap;
 import com.google.zxing.NotFoundException;
-import com.google.zxing.Result;
+import com.google.zxing.RXingResult;
 import com.google.zxing.common.BitArray;

 /**
@@ -71,7 +71,7 @@ public final class RSSExpandedStackedInternalTestCase extends Assert {

    List<ExpandedPair> totalPairs = rssExpandedReader.decodeRow2pairs(secondRowNumber, secondRow);

-    Result result = RSSExpandedReader.constructResult(totalPairs);
+    RXingResult result = RSSExpandedReader.constructRXingResult(totalPairs);
    assertEquals("(01)98898765432106(3202)012345(15)991231", result.getText());
  }

@@ -81,7 +81,7 @@ public final class RSSExpandedStackedInternalTestCase extends Assert {

    BinaryBitmap binaryMap = TestCaseUtil.getBinaryBitmap("src/test/resources/blackbox/rssexpandedstacked-2/1000.png");

-    Result result = rssExpandedReader.decode(binaryMap);
+    RXingResult result = rssExpandedReader.decode(binaryMap);
    assertEquals("(01)98898765432106(3202)012345(15)991231", result.getText());
  }