Many changes to the C++ port.

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

diff --git a/cpp/core/tests/src/common/BitMatrixTest.cpp b/cpp/core/tests/src/common/BitMatrixTest.cpp
index 33dcba4..c75fa14 100644 (file)
--- a/cpp/core/tests/src/common/BitMatrixTest.cpp
+++ b/cpp/core/tests/src/common/BitMatrixTest.cpp
@@ -21,46 +21,47 @@
 #include "BitMatrixTest.h"
 #include <limits>
 
-namespace common {
+namespace zxing {
+using namespace std;
 
-  CPPUNIT_TEST_SUITE_REGISTRATION(BitMatrixTest);
-  
-  void BitMatrixTest::testGetSet() {
-    size_t bits = numeric_limits<unsigned int>::digits;
-    BitMatrix matrix(bits+1);
-    CPPUNIT_ASSERT_EQUAL(bits+1, matrix.getDimension());
-    for (size_t i = 0; i < bits+1; i++) {
-      for (size_t j = 0; j < bits+1; j++) {
-        if (i * j % 3 == 0) {
-          matrix.set(i, j);
-        }
+CPPUNIT_TEST_SUITE_REGISTRATION(BitMatrixTest);
+
+void BitMatrixTest::testGetSet() {
+  size_t bits = numeric_limits<unsigned int>::digits;
+  BitMatrix matrix(bits + 1);
+  CPPUNIT_ASSERT_EQUAL(bits + 1, matrix.getDimension());
+  for (size_t i = 0; i < bits + 1; i++) {
+    for (size_t j = 0; j < bits + 1; j++) {
+      if (i * j % 3 == 0) {
+        matrix.set(i, j);
       }
     }
-    for (size_t i = 0; i < bits+1; i++) {
-      for (size_t j = 0; j < bits+1; j++) {
-        CPPUNIT_ASSERT_EQUAL(i * j % 3 == 0, matrix.get(i, j));
-      }
-    }    
   }
-  
-  void BitMatrixTest::testSetRegion() {
-    BitMatrix matrix(5);
-    matrix.setRegion(1, 1, 3, 3);
-    for (int i = 0; i < 5; i++) {
-      for (int j = 0; j < 5; j++) {
-        CPPUNIT_ASSERT_EQUAL(i >= 1 && i <= 3 && j >= 1 && j <= 3,
-                             matrix.get(i, j));
-      }
+  for (size_t i = 0; i < bits + 1; i++) {
+    for (size_t j = 0; j < bits + 1; j++) {
+      CPPUNIT_ASSERT_EQUAL(i * j % 3 == 0, matrix.get(i, j));
+    }
+  }
+}
+
+void BitMatrixTest::testSetRegion() {
+  BitMatrix matrix(5);
+  matrix.setRegion(1, 1, 3, 3);
+  for (int i = 0; i < 5; i++) {
+    for (int j = 0; j < 5; j++) {
+      CPPUNIT_ASSERT_EQUAL(i >= 1 && i <= 3 && j >= 1 && j <= 3,
+                           matrix.get(i, j));
     }
   }
-  
-  void BitMatrixTest::testGetBits() {
-    BitMatrix matrix(6);
-    matrix.set(0, 0);
-    matrix.set(5, 5);
-    valarray<unsigned int> bits = matrix.getBits();
-    CPPUNIT_ASSERT_EQUAL(1u, bits[0]);
-    CPPUNIT_ASSERT_EQUAL(8u, bits[1]);
-  }  
+}
+
+void BitMatrixTest::testGetBits() {
+  BitMatrix matrix(6);
+  matrix.set(0, 0);
+  matrix.set(5, 5);
+  unsigned int* bits = matrix.getBits();
+  CPPUNIT_ASSERT_EQUAL(1u, bits[0]);
+  CPPUNIT_ASSERT_EQUAL(8u, bits[1]);
+}
 
 }