Fix cmpInt of CobolNumericPackedField and add tests

libcobj/src/jp/osscons/opensourcecobol/libcobj/data/CobolNumericPackedField.java

@@ -911,9 +911,11 @@ private int cmpPacked(int n) {
     for (size = 0; size < 20; size++) {
       if (val1[size] != CobolDecimal.packedValue[size]) {
         if (sign < 0) {
-          return CobolDecimal.packedValue[size] - val1[size];
+          return Byte.toUnsignedInt(CobolDecimal.packedValue[size])
+              - Byte.toUnsignedInt(val1[size]);
         } else {
-          return val1[size] - CobolDecimal.packedValue[size];
+          return Byte.toUnsignedInt(val1[size])
+              - Byte.toUnsignedInt(CobolDecimal.packedValue[size]);
         }
       }
     }

tests/Makefile.am

@@ -161,7 +161,8 @@ misc_DEPENDENCIES = \
 	misc.src/comp3-is-numeric.at \
 	misc.src/high-low-value.at \
 	misc.src/move-sign-leading-separate-to-signed-comp3.at \
-	misc.src/java-interface.at
+	misc.src/java-interface.at \
+	misc.src/comp3-int.at
 
 EXTRA_DIST = $(srcdir)/package.m4 \
 	$(TESTS) \

tests/Makefile.in

@@ -700,7 +700,8 @@ misc_DEPENDENCIES = \
 	misc.src/comp3-is-numeric.at \
 	misc.src/high-low-value.at \
 	misc.src/move-sign-leading-separate-to-signed-comp3.at \
-	misc.src/java-interface.at
+	misc.src/java-interface.at \
+	misc.src/comp3-int.at
 
 EXTRA_DIST = $(srcdir)/package.m4 \
 	$(TESTS) \

tests/misc.at

@@ -24,3 +24,4 @@ m4_include([comp3-is-numeric.at])
 m4_include([high-low-value.at])
 m4_include([move-sign-leading-separate-to-signed-comp3.at])
 m4_include([java-interface.at])
+m4_include([comp3-int.at])

tests/misc.src/comp3-int.at

@@ -0,0 +1,70 @@
+AT_SETUP([Compare comp3 and int])
+
+AT_DATA([a.java],[
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import jp.osscons.opensourcecobol.libcobj.data.*;
+
+public class a {
+	public static void main(String@<:@@:>@ args) {
+                byte@<:@@:>@ data = new byte@<:@7@:>@;
+                CobolNumericPackedField packedField = new CobolNumericPackedField(
+                        7,
+                        new CobolDataStorage(data),
+                        new CobolFieldAttribute(
+                                CobolFieldAttribute.COB_TYPE_NUMERIC_PACKED,
+                                13,
+                                0,
+                                CobolFieldAttribute.COB_FLAG_HAVE_SIGN,
+                                null
+                        )
+                );
+                int@<:@@:>@ positive_data = {
+                        1,
+                        2,
+                        99,
+                        999,
+                        9999,
+                        99999,
+                        999999,
+                        9999999,
+                        99999999,
+                        999999999,
+                        Integer.MAX_VALUE
+                };
+                int@<:@@:>@ negative_data = {
+                        -1,
+                        -2,
+                        -99,
+                        -999,
+                        -9999,
+                        -99999,
+                        -999999,
+                        -9999999,
+                        -99999999,
+                        -999999999,
+                        Integer.MIN_VALUE+1
+                };
+                for(int v : positive_data) {
+                        packedField.moveFrom(v);
+                        if(packedField.cmpInt(0) <= 0) {
+                                System.out.println("error: " + v);
+                        }
+                }
+                for(int v : negative_data) {
+                        packedField.moveFrom(v);
+                        if(packedField.cmpInt(0) >= 0) {
+                                System.out.println("error: " + v);
+                        }
+                }
+                packedField.moveFrom(0);
+                if(packedField.cmpInt(0) != 0) {
+                        System.out.println("error: " + 0);
+                }
+        }
+}
+])
+AT_CHECK([javac a.java])
+AT_CHECK([java a], [0],[])
+
+AT_CLEANUP