From 7ff131b3cc8af909aa19d02f01856e89d89dfe9a Mon Sep 17 00:00:00 2001
From: Sean Owen <srowen@gmail.com>
Date: Sat, 2 Jun 2018 22:51:28 -0500
Subject: [PATCH] Move and slightly add to new GenericGFPoly tests

---
 .../common/reedsolomon/GenericGFPoly.java     |  4 +-
 .../reedsolomon/GenericGFPolyTestCase.java    | 45 +++++++++++++++++++
 .../reedsolomon/ReedSolomonTestCase.java      |  7 ---
 3 files changed, 47 insertions(+), 9 deletions(-)
 create mode 100644 core/src/test/java/com/google/zxing/common/reedsolomon/GenericGFPolyTestCase.java

diff --git a/core/src/main/java/com/google/zxing/common/reedsolomon/GenericGFPoly.java b/core/src/main/java/com/google/zxing/common/reedsolomon/GenericGFPoly.java
index 99695cae1..2c73c7fbb 100644
--- a/core/src/main/java/com/google/zxing/common/reedsolomon/GenericGFPoly.java
+++ b/core/src/main/java/com/google/zxing/common/reedsolomon/GenericGFPoly.java
@@ -225,8 +225,8 @@ final class GenericGFPoly {
 
   @Override
   public String toString() {
-    if (isZero()) {
-      return "0";
+    if (getDegree() == 0) {
+      return Integer.toString(getCoefficient(0));
     }
     StringBuilder result = new StringBuilder(8 * getDegree());
     for (int degree = getDegree(); degree >= 0; degree--) {
diff --git a/core/src/test/java/com/google/zxing/common/reedsolomon/GenericGFPolyTestCase.java b/core/src/test/java/com/google/zxing/common/reedsolomon/GenericGFPolyTestCase.java
new file mode 100644
index 000000000..965f9a29e
--- /dev/null
+++ b/core/src/test/java/com/google/zxing/common/reedsolomon/GenericGFPolyTestCase.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2018 ZXing authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.zxing.common.reedsolomon;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public final class GenericGFPolyTestCase extends Assert {
+
+  private static final GenericGF FIELD = GenericGF.QR_CODE_FIELD_256;
+
+  @Test
+  public void testPolynomialString() {
+    assertEquals("0", FIELD.getZero().toString());
+    assertEquals("-1", FIELD.buildMonomial(0, -1).toString());
+    GenericGFPoly p = new GenericGFPoly(FIELD, new int[] {3, 0, -2, 1, 1});
+    assertEquals("a^25x^4 - ax^2 + x + 1", p.toString());
+  }
+
+  @Test
+  public void testZero() {
+    assertEquals(FIELD.getZero(),FIELD.buildMonomial(1, 0));
+    assertEquals(FIELD.getZero(), FIELD.buildMonomial(1, 2).multiply(0));
+  }
+
+  @Test
+  public void testEvaluate() {
+    assertEquals(3, FIELD.buildMonomial(0, 3).evaluateAt(0));
+  }
+
+}
diff --git a/core/src/test/java/com/google/zxing/common/reedsolomon/ReedSolomonTestCase.java b/core/src/test/java/com/google/zxing/common/reedsolomon/ReedSolomonTestCase.java
index c483d50e7..a6fe1f4fb 100644
--- a/core/src/test/java/com/google/zxing/common/reedsolomon/ReedSolomonTestCase.java
+++ b/core/src/test/java/com/google/zxing/common/reedsolomon/ReedSolomonTestCase.java
@@ -393,13 +393,6 @@ public final class ReedSolomonTestCase extends Assert {
     testEncodeDecodeRandom(GenericGF.AZTEC_DATA_12, 3072, 1023);
   }
 
-  @Test
-  public void testPolynomialString() {
-    assertEquals("0", GenericGF.QR_CODE_FIELD_256.getZero().toString());
-    GenericGFPoly p = new GenericGFPoly(GenericGF.QR_CODE_FIELD_256, new int[] {3, 0, -2, 1, 1});
-    assertEquals("a^25x^4 - ax^2 + x + 1", p.toString());
-  }
-
   public static void corrupt(int[] received, int howMany, Random random, int max) {
     BitSet corrupted = new BitSet(received.length);
     for (int j = 0; j < howMany; j++) {