Many changes to the C++ port.

[zxing.git] / cpp / core / tests / src / common / BitArrayTest.cpp

diff --git a/cpp/core/tests/src/common/BitArrayTest.cpp b/cpp/core/tests/src/common/BitArrayTest.cpp
index 7c645c1..495bf67 100644 (file)
--- a/cpp/core/tests/src/common/BitArrayTest.cpp
+++ b/cpp/core/tests/src/common/BitArrayTest.cpp
@@ -23,74 +23,74 @@
 
 using namespace std;
 
-namespace common {
-  
-  CPPUNIT_TEST_SUITE_REGISTRATION(BitArrayTest);
-  
-  void BitArrayTest::testGetSet() {
-    size_t bits = numeric_limits<unsigned int>::digits + 1;
-    BitArray array(bits);
-    for (size_t i = 0; i < bits; i++) {
-      CPPUNIT_ASSERT_EQUAL(false, array.get(i));
-      array.set(i);
-      CPPUNIT_ASSERT_EQUAL(true, array.get(i));
-    }
+namespace zxing {
+
+CPPUNIT_TEST_SUITE_REGISTRATION(BitArrayTest);
+
+void BitArrayTest::testGetSet() {
+  size_t bits = numeric_limits<unsigned int>::digits + 1;
+  BitArray array(bits);
+  for (size_t i = 0; i < bits; i++) {
+    CPPUNIT_ASSERT_EQUAL(false, array.get(i));
+    array.set(i);
+    CPPUNIT_ASSERT_EQUAL(true, array.get(i));
   }
-  
-  void BitArrayTest::testSetBulk() {
-    BitArray array(64);
-    array.setBulk(32, 0xFFFF0000);
-    for (int i = 0; i < 48; i++) {
-      CPPUNIT_ASSERT_EQUAL(false, array.get(i));
-    }
-    for (int i = 48; i < 64; i++) {
-      CPPUNIT_ASSERT_EQUAL(true, array.get(i));
-    }
+}
+
+void BitArrayTest::testSetBulk() {
+  BitArray array(64);
+  array.setBulk(32, 0xFFFF0000);
+  for (int i = 0; i < 48; i++) {
+    CPPUNIT_ASSERT_EQUAL(false, array.get(i));
   }
-  
-  void BitArrayTest::testClear() {
-    size_t bits = numeric_limits<unsigned int>::digits;
-    BitArray array(bits);
-    for (size_t i = 0; i < bits; i++) {
-      array.set(i);
-    }
-    array.clear();
-    for (size_t i = 0; i < bits; i++) {
-      CPPUNIT_ASSERT_EQUAL(false, array.get(i));
-    }
+  for (int i = 48; i < 64; i++) {
+    CPPUNIT_ASSERT_EQUAL(true, array.get(i));
   }
-  
-  void BitArrayTest::testGetArray() {
-    size_t bits = numeric_limits<unsigned int>::digits;
-    BitArray array(2*bits);
-    array.set(0);
-    array.set(2*bits-1);
-    valarray<unsigned> words(array.getBitArray());
-    CPPUNIT_ASSERT_EQUAL(1u, words[0]);
-    CPPUNIT_ASSERT_EQUAL((1u << bits-1), words[1]);
+}
+
+void BitArrayTest::testClear() {
+  size_t bits = numeric_limits<unsigned int>::digits;
+  BitArray array(bits);
+  for (size_t i = 0; i < bits; i++) {
+    array.set(i);
   }
-  
-  void BitArrayTest::testIsRange() {
-    size_t bits = numeric_limits<unsigned int>::digits;
-    size_t bits2 = 2 * bits;
-    BitArray array(bits2);
-    CPPUNIT_ASSERT_EQUAL(true, array.isRange(0, bits2, false));
-    CPPUNIT_ASSERT_EQUAL(false, array.isRange(0, bits2, true));
-    array.set(bits);
-    CPPUNIT_ASSERT_EQUAL(true, array.isRange(bits, bits+1, true));
-    array.set(bits-1);
-    CPPUNIT_ASSERT_EQUAL(true, array.isRange(bits-1, bits+1, true));
-    array.set(bits+2);
-    CPPUNIT_ASSERT_EQUAL(false, array.isRange(bits-1, bits+3, true));
-    for (size_t i = 0; i < bits-1; i++) {
-      array.set(i);
-    }
-    CPPUNIT_ASSERT_EQUAL(true, array.isRange(0, bits+1, true));
-    for (int i = 33; i < 64; i++) {
-      array.set(i);
-    }
-    CPPUNIT_ASSERT_EQUAL(true, array.isRange(0, 64, true));
-    CPPUNIT_ASSERT_EQUAL(false, array.isRange(0, 64, false));
+  array.clear();
+  for (size_t i = 0; i < bits; i++) {
+    CPPUNIT_ASSERT_EQUAL(false, array.get(i));
   }
 }
 
+void BitArrayTest::testGetArray() {
+  size_t bits = numeric_limits<unsigned int>::digits;
+  BitArray array(2*bits);
+  array.set(0);
+  array.set(2*bits - 1);
+  valarray<unsigned> words(array.getBitArray());
+  CPPUNIT_ASSERT_EQUAL(1u, words[0]);
+  CPPUNIT_ASSERT_EQUAL((1u << (bits - 1)), words[1]);
+}
+
+void BitArrayTest::testIsRange() {
+  size_t bits = numeric_limits<unsigned int>::digits;
+  size_t bits2 = 2 * bits;
+  BitArray array(bits2);
+  CPPUNIT_ASSERT_EQUAL(true, array.isRange(0, bits2, false));
+  CPPUNIT_ASSERT_EQUAL(false, array.isRange(0, bits2, true));
+  array.set(bits);
+  CPPUNIT_ASSERT_EQUAL(true, array.isRange(bits, bits + 1, true));
+  array.set(bits - 1);
+  CPPUNIT_ASSERT_EQUAL(true, array.isRange(bits - 1, bits + 1, true));
+  array.set(bits + 2);
+  CPPUNIT_ASSERT_EQUAL(false, array.isRange(bits - 1, bits + 3, true));
+  for (size_t i = 0; i < bits - 1; i++) {
+    array.set(i);
+  }
+  CPPUNIT_ASSERT_EQUAL(true, array.isRange(0, bits + 1, true));
+  for (int i = 33; i < 64; i++) {
+    array.set(i);
+  }
+  CPPUNIT_ASSERT_EQUAL(true, array.isRange(0, 64, true));
+  CPPUNIT_ASSERT_EQUAL(false, array.isRange(0, 64, false));
+}
+}
+