From 66ce29602cbced1e3fb4b9fba235e110915e339f Mon Sep 17 00:00:00 2001
From: "Brian S. O'Neill" <bronee@gmail.com>
Date: Mon, 3 Nov 2008 02:42:40 +0000
Subject: Add back support for BigDecimal now that key encoding works
 correctly.

---
 .../java/com/amazon/carbonado/TestStorables.java   |  3 ---
 .../com/amazon/carbonado/raw/TestDataEncoding.java |  2 --
 .../com/amazon/carbonado/raw/TestKeyEncoding.java  | 26 ++++++++--------------
 .../com/amazon/carbonado/repo/jdbc/TestH2.java     |  2 --
 4 files changed, 9 insertions(+), 24 deletions(-)

(limited to 'src/test/java/com/amazon')

diff --git a/src/test/java/com/amazon/carbonado/TestStorables.java b/src/test/java/com/amazon/carbonado/TestStorables.java
index 43ccec0..6301c30 100644
--- a/src/test/java/com/amazon/carbonado/TestStorables.java
+++ b/src/test/java/com/amazon/carbonado/TestStorables.java
@@ -3110,7 +3110,6 @@ public class TestStorables extends TestCase {
         return bi;
     }
 
-    /*
     public void test_BigDecimal() throws Exception {
         BigDecimal bd = new BigDecimal("12345678901234567890.1234567890");
         BigDecimal expected = expected(bd);
@@ -3298,7 +3297,6 @@ public class TestStorables extends TestCase {
         WithBigDecimalPk last = null;
         while (cursor.hasNext()) {
             s = cursor.next();
-            System.out.println(s);
             if (last != null) {
                 assertTrue(s.getId().compareTo(last.getId()) > 0);
             }
@@ -3345,7 +3343,6 @@ public class TestStorables extends TestCase {
         assertFalse(s2.equals(s3));
         assertFalse(s1.equals(s3));
     }
-    */
 
     private void assertUninitialized(boolean expected, Storable storable, String... properties) {
         for (String property : properties) {
diff --git a/src/test/java/com/amazon/carbonado/raw/TestDataEncoding.java b/src/test/java/com/amazon/carbonado/raw/TestDataEncoding.java
index b473b66..2538a28 100644
--- a/src/test/java/com/amazon/carbonado/raw/TestDataEncoding.java
+++ b/src/test/java/com/amazon/carbonado/raw/TestDataEncoding.java
@@ -503,7 +503,6 @@ public class TestDataEncoding extends TestCase {
         }
     }
 
-    /*
     public void test_BigDecimal() throws Exception {
         byte[] bytes = new byte[5 + 1 + 100];
         BigDecimal[] ref = new BigDecimal[1];
@@ -544,7 +543,6 @@ public class TestDataEncoding extends TestCase {
             assertEquals(value, ref[0]);
         }
     }
-    */
 
     public void test_String() throws Exception {
         String[] ref = new String[1];
diff --git a/src/test/java/com/amazon/carbonado/raw/TestKeyEncoding.java b/src/test/java/com/amazon/carbonado/raw/TestKeyEncoding.java
index bc0f292..de59653 100644
--- a/src/test/java/com/amazon/carbonado/raw/TestKeyEncoding.java
+++ b/src/test/java/com/amazon/carbonado/raw/TestKeyEncoding.java
@@ -39,6 +39,7 @@ public class TestKeyEncoding extends TestCase {
     private static final int SHORT_TEST = 100;
     private static final int MEDIUM_TEST = 1000;
     private static final int LONG_TEST = 10000;
+    private static final int LONG_LONG_TEST = 100000;
 
     public static void main(String[] args) {
         junit.textui.TestRunner.run(suite());
@@ -445,7 +446,6 @@ public class TestKeyEncoding extends TestCase {
         }
     }
 
-    /*
     public void test_BigDecimal() throws Exception {
         BigDecimal[] ref = new BigDecimal[1];
 
@@ -502,36 +502,29 @@ public class TestKeyEncoding extends TestCase {
                 new BigDecimal("-10.01"),
                 new BigDecimal("-10.001"),
                 new BigDecimal("10.001"),
+                new BigDecimal("10.01"),
+                new BigDecimal("10.1"),
+                new BigDecimal("11"),
                 new BigDecimal("90.01"),
             };
 
             byte[][] encoded = new byte[values.length][];
 
-            System.out.println();
             for (int i=0; i<values.length; i++) {
                 encoded[i] = new byte[KeyEncoder.calculateEncodedLength(values[i])];
                 KeyEncoder.encode(values[i], encoded[i], 0);
-                for (int j=0; j<encoded[i].length; j++) {
-                    int b = encoded[i][j] & 0xff;
-                    System.out.print(' ');
-                    if (b < 0x10) {
-                        System.out.print('0');
-                    }
-                    System.out.print(Integer.toHexString(b));
-                }
-                System.out.println();
             }
 
             for (int i=1; i<values.length; i++) {
-                assertTrue(TestDataEncoding.byteArrayCompare(encoded[i - 1], encoded[1]) < 0);
+                assertTrue(TestDataEncoding.byteArrayCompare(encoded[i - 1], encoded[i]) < 0);
             }
         }
 
-        byte[] bytes = new byte[5 + 1 + 100 + 5];
+        byte[] bytes = new byte[1000];
 
         BigDecimal lastValue = null;
         byte[] lastBytes = null;
-        for (int i=0; i<LONG_TEST; i++) {
+        for (int i=0; i<LONG_LONG_TEST; i++) {
             BigDecimal value;
             int mode = mRandom.nextInt(10);
             if (mode == 1) {
@@ -626,11 +619,11 @@ public class TestKeyEncoding extends TestCase {
             assertEquals(d2, ref[0]);
         }
 
-        byte[] bytes = new byte[5 + 1 + 100 + 5];
+        byte[] bytes = new byte[1000];
 
         BigDecimal lastValue = null;
         byte[] lastBytes = null;
-        for (int i=0; i<LONG_TEST; i++) {
+        for (int i=0; i<LONG_LONG_TEST; i++) {
             BigDecimal value;
             int mode = mRandom.nextInt(10);
             if (mode == 1) {
@@ -673,7 +666,6 @@ public class TestKeyEncoding extends TestCase {
             lastBytes = bytes.clone();
         }
     }
-    */
 
     public void test_String() throws Exception {
         String lastValue = null;
diff --git a/src/test/java/com/amazon/carbonado/repo/jdbc/TestH2.java b/src/test/java/com/amazon/carbonado/repo/jdbc/TestH2.java
index 7851c1e..f7b5580 100644
--- a/src/test/java/com/amazon/carbonado/repo/jdbc/TestH2.java
+++ b/src/test/java/com/amazon/carbonado/repo/jdbc/TestH2.java
@@ -353,12 +353,10 @@ public class TestH2 extends com.amazon.carbonado.TestStorables {
         return bi.add(BigInteger.ONE);
     }
 
-    /*
     @Override
     protected BigDecimal expected(BigDecimal bd) {
         return bd;
     }
-    */
 
     private RepositoryBuilder jdbcBuilder(boolean isMaster) throws RepositoryException {
         JDBCRepositoryBuilder builder = new JDBCRepositoryBuilder();
-- 
cgit v1.2.3