diff options
author | Morgan Deters <mdeters@gmail.com> | 2010-04-09 16:25:32 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2010-04-09 16:25:32 +0000 |
commit | e390a4207d3858927354b3d4b40d540c00f8064c (patch) | |
tree | 589fd13ed8f6ba835cd79a2894092860b66b7696 /test/unit/theory | |
parent | c3a6ff8c6e4a0c743cd33eb29931f837eeb2959e (diff) |
added experimental "make lcov" target (it runs only unit tests); better coverage for util and context classes; implemented some output functionality that was missing; reclassified some tests white -> black or black -> public; other minor fixes
Diffstat (limited to 'test/unit/theory')
-rw-r--r-- | test/unit/theory/theory_black.h | 2 | ||||
-rw-r--r-- | test/unit/theory/theory_uf_white.h | 15 |
2 files changed, 7 insertions, 10 deletions
diff --git a/test/unit/theory/theory_black.h b/test/unit/theory/theory_black.h index 24c8e407c..097724d48 100644 --- a/test/unit/theory/theory_black.h +++ b/test/unit/theory/theory_black.h @@ -243,7 +243,7 @@ public: TS_ASSERT_EQUALS(got, x_eq_f_f_x); - TS_ASSERT_EQUALS(7, d_dummy->d_registered.size()); + TS_ASSERT_EQUALS(7u, d_dummy->d_registered.size()); TS_ASSERT(d_dummy->d_registered.find(f_f_x) != d_dummy->d_registered.end()); TS_ASSERT(d_dummy->d_registered.find(x_eq_f_f_x) != d_dummy->d_registered.end()); diff --git a/test/unit/theory/theory_uf_white.h b/test/unit/theory/theory_uf_white.h index c02214a25..f5da06a0b 100644 --- a/test/unit/theory/theory_uf_white.h +++ b/test/unit/theory/theory_uf_white.h @@ -154,13 +154,13 @@ public: d_euf->check(d_level); //Test that no additional calls to the output channel occurred. - TS_ASSERT_EQUALS(1, d_outputChannel.getNumCalls()); + TS_ASSERT_EQUALS(1u, d_outputChannel.getNumCalls()); d_euf->assertFact( f5_x_eq_x ); d_euf->check(d_level); - TS_ASSERT_EQUALS(2, d_outputChannel.getNumCalls()); + TS_ASSERT_EQUALS(2u, d_outputChannel.getNumCalls()); TS_ASSERT_EQUALS(CONFLICT, d_outputChannel.getIthCallType(0)); TS_ASSERT_EQUALS(CONFLICT, d_outputChannel.getIthCallType(1)); Node firstConflict = d_outputChannel.getIthNode(0); @@ -189,7 +189,7 @@ public: d_euf->assertFact(f_f_f_x_neq_f_x); d_euf->check(d_level); - TS_ASSERT_EQUALS(1, d_outputChannel.getNumCalls()); + TS_ASSERT_EQUALS(1u, d_outputChannel.getNumCalls()); TS_ASSERT_EQUALS(CONFLICT, d_outputChannel.getIthCallType(0)); Node realConflict = d_outputChannel.getIthNode(0); @@ -205,7 +205,7 @@ public: d_euf->assertFact(x_neq_x); d_euf->check(d_level); - TS_ASSERT_EQUALS(1, d_outputChannel.getNumCalls()); + TS_ASSERT_EQUALS(1u, d_outputChannel.getNumCalls()); TS_ASSERT_EQUALS(x_neq_x, d_outputChannel.getIthNode(0)); TS_ASSERT_EQUALS(CONFLICT, d_outputChannel.getIthCallType(0)); } @@ -218,7 +218,7 @@ public: d_euf->assertFact(x_eq_x); d_euf->check(d_level); - TS_ASSERT_EQUALS(0, d_outputChannel.getNumCalls()); + TS_ASSERT_EQUALS(0u, d_outputChannel.getNumCalls()); } @@ -251,7 +251,7 @@ public: d_euf->assertFact( f1_x_neq_x ); d_euf->check(d_level); - TS_ASSERT_EQUALS(1, d_outputChannel.getNumCalls()); + TS_ASSERT_EQUALS(1u, d_outputChannel.getNumCalls()); TS_ASSERT_EQUALS(CONFLICT, d_outputChannel.getIthCallType(0)); Node realConflict = d_outputChannel.getIthNode(0); TS_ASSERT_EQUALS(expectedConflict, realConflict); @@ -282,7 +282,4 @@ public: d_euf->check(d_level); } - - - }; |