From 450afbe54b4bb2c01cbee326069d9e7a34e8fae8 Mon Sep 17 00:00:00 2001
From: favoritas37 <ftylitak@gmail.com>
Date: Fri, 22 Jul 2016 02:09:55 +0300
Subject: [PATCH] Enable new tests.

---
 src/zxing/zxing/qrcode/encoder/QRCode.cpp | 14 ++++++++------
 tests/src/QZXingTests/EncodeValidator.cpp |  4 ++++
 tests/src/QZXingTests/QZXingTests.pro     |  6 ++++--
 tests/src/QZXingTests/TestCase.h          |  8 ++++++++
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/src/zxing/zxing/qrcode/encoder/QRCode.cpp b/src/zxing/zxing/qrcode/encoder/QRCode.cpp
index 46bd1fd..0ea5b7f 100644
--- a/src/zxing/zxing/qrcode/encoder/QRCode.cpp
+++ b/src/zxing/zxing/qrcode/encoder/QRCode.cpp
@@ -44,22 +44,24 @@ Ref<ByteMatrix> QRCode::getMatrix() const
 const std::string QRCode::toString()
 {
     std::stringstream result;
-    result << "<<\n";
-//    result << " mode: {unimpl}";
+    result << "<<";
+//    result << "\n mode: {unimpl}";
 //    result << mode_;
     result << "\n ecLevel: {unimpl}";
     //result << ecLevel_;
-    result << "\n version: ";
+    result << "\n version: {unimpl}";
     //result << version_;
     result << "\n maskPattern: ";
     result << maskPattern_;
     //  if (matrix_ == null) {
     //    result.append("\n matrix: null\n");
     //  } else {
-    result << "\n matrix:\n";
-    result << matrix_ptr_->toString();
+    if (matrix_ptr_)
+        result << "\n matrix:\n" << matrix_ptr_->toString();
+    else
+        result << "\n matrix: null\n";
     //  }
-    result << ">>\n";
+    result << "\n>>";
     return result.str();
 }
 
diff --git a/tests/src/QZXingTests/EncodeValidator.cpp b/tests/src/QZXingTests/EncodeValidator.cpp
index bc7176a..9b79c76 100644
--- a/tests/src/QZXingTests/EncodeValidator.cpp
+++ b/tests/src/QZXingTests/EncodeValidator.cpp
@@ -6,6 +6,7 @@
 #include "zxing/qrcode/encoder/MatrixUtilTests.h"
 #include "zxing/qrcode/encoder/MaskUtilTests.h"
 #include "zxing/qrcode/encoder/BitArrayTests.h"
+#include "zxing/qrcode/encoder/QRCodeTests.h"
 
 namespace zxing {
 namespace qrcode {
@@ -27,6 +28,9 @@ void EncodeValidator::execute()
 
         BitArrayTests t2;
         t2.execute();
+
+        QRCodeTests t3;
+        t3.execute();
     }
     catch(zxing::Exception &e)
     {
diff --git a/tests/src/QZXingTests/QZXingTests.pro b/tests/src/QZXingTests/QZXingTests.pro
index 05a725a..58d1274 100644
--- a/tests/src/QZXingTests/QZXingTests.pro
+++ b/tests/src/QZXingTests/QZXingTests.pro
@@ -16,7 +16,8 @@ SOURCES += main.cpp \
     EncodeValidator.cpp \
     zxing/qrcode/encoder/MatrixUtilTests.cpp \
     zxing/qrcode/encoder/MaskUtilTests.cpp \
-    zxing/qrcode/encoder/BitArrayTests.cpp
+    zxing/qrcode/encoder/BitArrayTests.cpp \
+    zxing/qrcode/encoder/QRCodeTests.cpp
 
 HEADERS += \
     DecodeValidator.h \
@@ -25,6 +26,7 @@ HEADERS += \
     zxing/qrcode/encoder/MatrixUtilTests.h \
     TestCase.h \
     zxing/qrcode/encoder/MaskUtilTests.h \
-    zxing/qrcode/encoder/BitArrayTests.h
+    zxing/qrcode/encoder/BitArrayTests.h \
+    zxing/qrcode/encoder/QRCodeTests.h
 
 include(../../../src/QZXing.pri)
diff --git a/tests/src/QZXingTests/TestCase.h b/tests/src/QZXingTests/TestCase.h
index 84b948b..2f5d13c 100644
--- a/tests/src/QZXingTests/TestCase.h
+++ b/tests/src/QZXingTests/TestCase.h
@@ -18,6 +18,10 @@ private:
         return QString::number(item);
     }
 
+    static QString itemToString(long unsigned item) {
+        return QString::number(item);
+    }
+
     static QString itemToString(byte item) {
         return QString::number(item);
     }
@@ -40,6 +44,10 @@ protected:
         assertEquals(1, (int)actual);
     }
 
+    void assertFalse(bool actual) {
+        assertEquals(0, (int)actual);
+    }
+
 public:
     virtual void execute()=0;
 };