summaryrefslogtreecommitdiff
path: root/test/unit/util/integer_black.h
diff options
context:
space:
mode:
authorMorgan Deters <mdeters@gmail.com>2010-04-08 20:49:11 +0000
committerMorgan Deters <mdeters@gmail.com>2010-04-08 20:49:11 +0000
commitc3a6ff8c6e4a0c743cd33eb29931f837eeb2959e (patch)
treedf8d8a97baebea55aaf94cc816974a86475c3a4b /test/unit/util/integer_black.h
parentde2b6c4ee9c2ecad88bddd0a60f10e94d6f8c71f (diff)
A handful of build system fixes:
* (test/unit/Makefile.am) libtool was being passed relative paths of sources in .cpp, confusing lcov if -b wasn't given. Fixed. Closes bug #102. * (configure.ac) --enable-coverage now implies --enable-static --enable-static-binary --disable-shared. * (configure.ac) Create top-level config.status for informational and re-configuration purposes. * (configure.ac) Remove -fvisibility=hidden for debug builds. Closes bug #104. * (test/unit/Makefile.am) Build unit tests with -Wall. * (various unit tests) Fixed trivially-fixable warnings in building unit tests. (Signedness in comparison, unused variables, etc.) * (Makefile.builds.in) Copy the binary correctly if it is static. (It was failing, but only with --enable-static --enable-shared --enable-static-binary.) Closes bug #103. * (src/parser/Makefile.am) libcvc4parser.so now links with libcvc4.so. * Other minor cleanups to the build system.
Diffstat (limited to 'test/unit/util/integer_black.h')
-rw-r--r--test/unit/util/integer_black.h28
1 files changed, 14 insertions, 14 deletions
diff --git a/test/unit/util/integer_black.h b/test/unit/util/integer_black.h
index afd2145e3..c09db2207 100644
--- a/test/unit/util/integer_black.h
+++ b/test/unit/util/integer_black.h
@@ -45,16 +45,16 @@ public:
TS_ASSERT_EQUALS(z4.getLong(), 0);
Integer z5("7896890");
- TS_ASSERT_EQUALS(z5.getUnsignedLong(), 7896890);
+ TS_ASSERT_EQUALS(z5.getUnsignedLong(), 7896890ul);
Integer z6(z5);
- TS_ASSERT_EQUALS(z5.getUnsignedLong(), 7896890);
- TS_ASSERT_EQUALS(z6.getUnsignedLong(), 7896890);
+ TS_ASSERT_EQUALS(z5.getUnsignedLong(), 7896890ul);
+ TS_ASSERT_EQUALS(z6.getUnsignedLong(), 7896890ul);
string bigValue("1536729");
Integer z7(bigValue);
- TS_ASSERT_EQUALS(z7.getUnsignedLong(), 1536729);
+ TS_ASSERT_EQUALS(z7.getUnsignedLong(), 1536729ul);
}
void testOperatorAssign(){
@@ -62,24 +62,24 @@ public:
Integer y(79);
Integer z(45789);
- TS_ASSERT_EQUALS(x.getUnsignedLong(), 0);
- TS_ASSERT_EQUALS(y.getUnsignedLong(), 79);
- TS_ASSERT_EQUALS(z.getUnsignedLong(), 45789);
+ TS_ASSERT_EQUALS(x.getUnsignedLong(), 0ul);
+ TS_ASSERT_EQUALS(y.getUnsignedLong(), 79ul);
+ TS_ASSERT_EQUALS(z.getUnsignedLong(), 45789ul);
x = y = z;
- TS_ASSERT_EQUALS(x.getUnsignedLong(), 45789);
- TS_ASSERT_EQUALS(y.getUnsignedLong(), 45789);
- TS_ASSERT_EQUALS(z.getUnsignedLong(), 45789);
+ TS_ASSERT_EQUALS(x.getUnsignedLong(), 45789ul);
+ TS_ASSERT_EQUALS(y.getUnsignedLong(), 45789ul);
+ TS_ASSERT_EQUALS(z.getUnsignedLong(), 45789ul);
Integer a(2);
y = a;
- TS_ASSERT_EQUALS(a.getUnsignedLong(), 2);
- TS_ASSERT_EQUALS(y.getUnsignedLong(), 2);
- TS_ASSERT_EQUALS(x.getUnsignedLong(), 45789);
- TS_ASSERT_EQUALS(z.getUnsignedLong(), 45789);
+ TS_ASSERT_EQUALS(a.getUnsignedLong(), 2ul);
+ TS_ASSERT_EQUALS(y.getUnsignedLong(), 2ul);
+ TS_ASSERT_EQUALS(x.getUnsignedLong(), 45789ul);
+ TS_ASSERT_EQUALS(z.getUnsignedLong(), 45789ul);
}
void testOperatorEquals(){
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback