From cd3a9e12a665ffa67d9e93b5d6c362a2ed7854c5 Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Mon, 6 Mar 2017 09:33:02 +0100
Subject: [PATCH] take out cppunit private macros
---
.../test-src/automaton/determinize/determinizeTest.cpp | 2 --
.../automaton/simplify/FSMSingleInitialStateTest.cpp | 2 --
.../automaton/simplify/minimizeBrzozowskiTest.cpp | 2 --
alib2algo/test-src/automaton/simplify/minimizeTest.cpp | 2 --
.../test-src/automaton/simplify/normalizeTest.cpp | 2 --
alib2algo/test-src/automaton/simplify/trimTest.cpp | 2 --
.../automaton/transform/AutomataCompactionTest.cpp | 2 --
.../automaton/transform/AutomataConcatenationTest.cpp | 2 --
.../test-src/automaton/transform/AutomataUnionTest.cpp | 2 --
.../automaton/transform/AutomatonIterationTest.cpp | 2 --
.../grammar/generate/GrammarGenerateUpToLength.cpp | 2 --
.../grammar/properties/GrammarPropertiesTest.cpp | 2 --
.../grammar/simplify/GrammarEpsilonRemoverTest.cpp | 2 --
.../simplify/GrammarLeftRecursionRemoverTest.cpp | 2 --
.../grammar/simplify/GrammarSimpleRulesRemoverTest.cpp | 2 --
.../test-src/grammar/simplify/GrammarToCNFTest.cpp | 2 --
.../test-src/grammar/simplify/GrammarToGNFTest.cpp | 2 --
alib2algo/test-src/grammar/toGrammar/rg2rgTest.cpp | 2 --
alib2algo/test-src/playTest.cpp | 2 --
alib2algo/test-src/regexp/RegExpTest.cpp | 3 ---
.../test-src/regexp/simplify/RegExpOptimizeTest.cpp | 3 ---
.../test-src/regexp/transform/RegExpDerivationTest.cpp | 2 --
.../test-src/regexp/transform/RegExpIntegralTest.cpp | 2 --
alib2algo/test-src/string/compare/compareTest.cpp | 2 --
.../test-src/string/properties/borderArrayTest.cpp | 2 --
.../test-src/stringology/exact/stringMatchTest.cpp | 2 --
.../test-src/graph/sort/TopologicalSortTest.cpp | 4 +---
.../exact/BackwardNondeterministicDAWGMatchingTest.cpp | 2 --
.../stringology/exact/FactorOracleAutomatonTest.cpp | 2 --
.../test-src/stringology/exact/SuffixAutomatonTest.cpp | 2 --
alib2common/test-src/common/CreateUniqueTest.cpp | 3 ---
alib2common/test-src/container/ContainerTest.cpp | 3 ---
alib2common/test-src/object/AnyObjectTest.cpp | 3 ---
alib2common/test-src/object/ObjectTest.cpp | 3 ---
alib2common/test-src/primitive/PrimitiveTest.cpp | 2 --
alib2common/test-src/sax/SaxTest.cpp | 2 --
alib2data/test-src/alphabet/SymbolTest.cpp | 3 ---
.../test-src/automaton/AutomatonTemplatesTest.cpp | 2 --
alib2data/test-src/automaton/AutomatonTest.cpp | 2 --
alib2data/test-src/common/SparseBoolVectorTest.cpp | 3 ---
alib2data/test-src/grammar/GrammarTest.cpp | 2 --
alib2data/test-src/label/LabelTest.cpp | 2 --
alib2data/test-src/regexp/RegExpTest.cpp | 3 ---
alib2data/test-src/rte/RTETest.cpp | 3 ---
alib2data/test-src/string/StringTest.cpp | 2 --
alib2data/test-src/tree/PatternTest.cpp | 2 --
alib2data/test-src/tree/TreeTest.cpp | 2 --
.../test-src/automaton/simplify/efficient/trimTest.cpp | 2 --
.../test-src/provisioner/provisionerTest.cpp | 2 --
alib2std/src/cppunit/extensions/HelperMacros.h | 10 ++++++++++
alib2std/test-src/extensions/TypeInfoTest.cpp | 2 --
alib2str/test-src/automaton/AutomatonTest.cpp | 2 --
alib2str/test-src/grammar/GrammarTest.cpp | 2 --
alib2str/test-src/object/LabelTest.cpp | 2 --
alib2str/test-src/object/ObjectTest.cpp | 2 --
alib2str/test-src/object/SymbolTest.cpp | 3 ---
alib2str/test-src/regexp/RegExpTest.cpp | 3 ---
alib2str/test-src/string/StringTest.cpp | 2 --
alib2str/test-src/tree/TreeTest.cpp | 2 --
alib2str_experimental/test-src/graph/GraphTest.cpp | 2 --
60 files changed, 11 insertions(+), 131 deletions(-)
create mode 100644 alib2std/src/cppunit/extensions/HelperMacros.h
diff --git a/alib2algo/test-src/automaton/determinize/determinizeTest.cpp b/alib2algo/test-src/automaton/determinize/determinizeTest.cpp
index 66b5ea9f40..67d3a88216 100644
--- a/alib2algo/test-src/automaton/determinize/determinizeTest.cpp
+++ b/alib2algo/test-src/automaton/determinize/determinizeTest.cpp
@@ -10,8 +10,6 @@
#include "automaton/determinize/Determinize.h"
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( determinizeTest, "automaton" );
CPPUNIT_TEST_SUITE_REGISTRATION( determinizeTest );
diff --git a/alib2algo/test-src/automaton/simplify/FSMSingleInitialStateTest.cpp b/alib2algo/test-src/automaton/simplify/FSMSingleInitialStateTest.cpp
index 3ceffeabb7..9c0eef59d7 100644
--- a/alib2algo/test-src/automaton/simplify/FSMSingleInitialStateTest.cpp
+++ b/alib2algo/test-src/automaton/simplify/FSMSingleInitialStateTest.cpp
@@ -7,8 +7,6 @@
#include "automaton/FSM/MultiInitialStateNFA.h"
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( FSMSingleInitialStateTest, "automaton" );
CPPUNIT_TEST_SUITE_REGISTRATION( FSMSingleInitialStateTest );
diff --git a/alib2algo/test-src/automaton/simplify/minimizeBrzozowskiTest.cpp b/alib2algo/test-src/automaton/simplify/minimizeBrzozowskiTest.cpp
index 9501072b2e..d0ed481f4f 100644
--- a/alib2algo/test-src/automaton/simplify/minimizeBrzozowskiTest.cpp
+++ b/alib2algo/test-src/automaton/simplify/minimizeBrzozowskiTest.cpp
@@ -6,8 +6,6 @@
#include "automaton/simplify/Trim.h"
#include "automaton/simplify/Normalize.h"
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( minimizeBrzozowskiTest, "automaton" );
CPPUNIT_TEST_SUITE_REGISTRATION( minimizeBrzozowskiTest );
diff --git a/alib2algo/test-src/automaton/simplify/minimizeTest.cpp b/alib2algo/test-src/automaton/simplify/minimizeTest.cpp
index 2a15aac841..bf891143c2 100644
--- a/alib2algo/test-src/automaton/simplify/minimizeTest.cpp
+++ b/alib2algo/test-src/automaton/simplify/minimizeTest.cpp
@@ -3,8 +3,6 @@
#include "automaton/simplify/Minimize.h"
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( minimizeTest, "automaton" );
CPPUNIT_TEST_SUITE_REGISTRATION( minimizeTest );
diff --git a/alib2algo/test-src/automaton/simplify/normalizeTest.cpp b/alib2algo/test-src/automaton/simplify/normalizeTest.cpp
index 06316d5a2d..2c5d8ccade 100644
--- a/alib2algo/test-src/automaton/simplify/normalizeTest.cpp
+++ b/alib2algo/test-src/automaton/simplify/normalizeTest.cpp
@@ -3,8 +3,6 @@
#include "automaton/simplify/Normalize.h"
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( normalizeTest, "automaton" );
CPPUNIT_TEST_SUITE_REGISTRATION( normalizeTest );
diff --git a/alib2algo/test-src/automaton/simplify/trimTest.cpp b/alib2algo/test-src/automaton/simplify/trimTest.cpp
index f8abc7b7a9..6c17786b04 100644
--- a/alib2algo/test-src/automaton/simplify/trimTest.cpp
+++ b/alib2algo/test-src/automaton/simplify/trimTest.cpp
@@ -7,8 +7,6 @@
#include "automaton/FSM/DFA.h"
#include "grammar/Regular/RightRG.h"
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( trimTest, "automaton" );
CPPUNIT_TEST_SUITE_REGISTRATION( trimTest );
diff --git a/alib2algo/test-src/automaton/transform/AutomataCompactionTest.cpp b/alib2algo/test-src/automaton/transform/AutomataCompactionTest.cpp
index 4e7138102b..b9dc737145 100644
--- a/alib2algo/test-src/automaton/transform/AutomataCompactionTest.cpp
+++ b/alib2algo/test-src/automaton/transform/AutomataCompactionTest.cpp
@@ -5,8 +5,6 @@
#include <automaton/FSM/DFA.h>
#include <automaton/FSM/CompactNFA.h>
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( AutomataCompactionTest, "automaton" );
CPPUNIT_TEST_SUITE_REGISTRATION( AutomataCompactionTest );
diff --git a/alib2algo/test-src/automaton/transform/AutomataConcatenationTest.cpp b/alib2algo/test-src/automaton/transform/AutomataConcatenationTest.cpp
index 688977ccc3..a49ae21255 100644
--- a/alib2algo/test-src/automaton/transform/AutomataConcatenationTest.cpp
+++ b/alib2algo/test-src/automaton/transform/AutomataConcatenationTest.cpp
@@ -11,8 +11,6 @@
#include "automaton/simplify/Total.h"
#include "automaton/determinize/Determinize.h"
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( AutomataConcatenationTest, "automaton" );
CPPUNIT_TEST_SUITE_REGISTRATION( AutomataConcatenationTest );
diff --git a/alib2algo/test-src/automaton/transform/AutomataUnionTest.cpp b/alib2algo/test-src/automaton/transform/AutomataUnionTest.cpp
index ccebb48f9a..7eb0e5af85 100644
--- a/alib2algo/test-src/automaton/transform/AutomataUnionTest.cpp
+++ b/alib2algo/test-src/automaton/transform/AutomataUnionTest.cpp
@@ -12,8 +12,6 @@
#include <exception/CommonException.h>
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( AutomataUnionTest, "automaton" );
CPPUNIT_TEST_SUITE_REGISTRATION( AutomataUnionTest );
diff --git a/alib2algo/test-src/automaton/transform/AutomatonIterationTest.cpp b/alib2algo/test-src/automaton/transform/AutomatonIterationTest.cpp
index 75d72b2a78..27e2dfdaf4 100644
--- a/alib2algo/test-src/automaton/transform/AutomatonIterationTest.cpp
+++ b/alib2algo/test-src/automaton/transform/AutomatonIterationTest.cpp
@@ -11,8 +11,6 @@
#include "automaton/simplify/Total.h"
#include "automaton/determinize/Determinize.h"
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( AutomatonIterationTest, "automaton" );
CPPUNIT_TEST_SUITE_REGISTRATION( AutomatonIterationTest );
diff --git a/alib2algo/test-src/grammar/generate/GrammarGenerateUpToLength.cpp b/alib2algo/test-src/grammar/generate/GrammarGenerateUpToLength.cpp
index 0d7ea54da8..aa4a2ea8a4 100644
--- a/alib2algo/test-src/grammar/generate/GrammarGenerateUpToLength.cpp
+++ b/alib2algo/test-src/grammar/generate/GrammarGenerateUpToLength.cpp
@@ -8,8 +8,6 @@
#include <factory/StringDataFactory.hpp>
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GrammarGenerateUpToLength, "grammar" );
CPPUNIT_TEST_SUITE_REGISTRATION( GrammarGenerateUpToLength );
diff --git a/alib2algo/test-src/grammar/properties/GrammarPropertiesTest.cpp b/alib2algo/test-src/grammar/properties/GrammarPropertiesTest.cpp
index 6d9012befb..dcc270198f 100644
--- a/alib2algo/test-src/grammar/properties/GrammarPropertiesTest.cpp
+++ b/alib2algo/test-src/grammar/properties/GrammarPropertiesTest.cpp
@@ -8,8 +8,6 @@
#include "grammar/properties/NonterminalUnitRuleCycle.h"
#include "grammar/properties/RecursiveNonterminal.h"
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GrammarPropertiesTest, "grammar" );
CPPUNIT_TEST_SUITE_REGISTRATION( GrammarPropertiesTest );
diff --git a/alib2algo/test-src/grammar/simplify/GrammarEpsilonRemoverTest.cpp b/alib2algo/test-src/grammar/simplify/GrammarEpsilonRemoverTest.cpp
index 833c6544f9..cc535a8ac9 100644
--- a/alib2algo/test-src/grammar/simplify/GrammarEpsilonRemoverTest.cpp
+++ b/alib2algo/test-src/grammar/simplify/GrammarEpsilonRemoverTest.cpp
@@ -5,8 +5,6 @@
#include "grammar/ContextFree/CFG.h"
#include "grammar/ContextFree/EpsilonFreeCFG.h"
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GrammarEpsilonRemoverTest, "grammar" );
CPPUNIT_TEST_SUITE_REGISTRATION( GrammarEpsilonRemoverTest );
diff --git a/alib2algo/test-src/grammar/simplify/GrammarLeftRecursionRemoverTest.cpp b/alib2algo/test-src/grammar/simplify/GrammarLeftRecursionRemoverTest.cpp
index 440d5a5a0c..6deb01082c 100644
--- a/alib2algo/test-src/grammar/simplify/GrammarLeftRecursionRemoverTest.cpp
+++ b/alib2algo/test-src/grammar/simplify/GrammarLeftRecursionRemoverTest.cpp
@@ -9,8 +9,6 @@
#include <factory/StringDataFactory.hpp>
#include <common/createUnique.hpp>
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GrammarLeftRecursionRemoverTest, "grammar" );
CPPUNIT_TEST_SUITE_REGISTRATION( GrammarLeftRecursionRemoverTest );
diff --git a/alib2algo/test-src/grammar/simplify/GrammarSimpleRulesRemoverTest.cpp b/alib2algo/test-src/grammar/simplify/GrammarSimpleRulesRemoverTest.cpp
index d774ad5ee5..4b75a48ad7 100644
--- a/alib2algo/test-src/grammar/simplify/GrammarSimpleRulesRemoverTest.cpp
+++ b/alib2algo/test-src/grammar/simplify/GrammarSimpleRulesRemoverTest.cpp
@@ -5,8 +5,6 @@
#include "grammar/ContextFree/CFG.h"
#include "grammar/ContextFree/EpsilonFreeCFG.h"
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GrammarSimpleRulesRemoverTest, "grammar" );
CPPUNIT_TEST_SUITE_REGISTRATION( GrammarSimpleRulesRemoverTest );
diff --git a/alib2algo/test-src/grammar/simplify/GrammarToCNFTest.cpp b/alib2algo/test-src/grammar/simplify/GrammarToCNFTest.cpp
index 71da54971b..153db1a211 100644
--- a/alib2algo/test-src/grammar/simplify/GrammarToCNFTest.cpp
+++ b/alib2algo/test-src/grammar/simplify/GrammarToCNFTest.cpp
@@ -9,8 +9,6 @@
#include <common/DefaultSymbolsPairType.h>
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GrammarToCNFTest, "grammar" );
CPPUNIT_TEST_SUITE_REGISTRATION( GrammarToCNFTest );
diff --git a/alib2algo/test-src/grammar/simplify/GrammarToGNFTest.cpp b/alib2algo/test-src/grammar/simplify/GrammarToGNFTest.cpp
index 166eea59c8..0a701b47bd 100644
--- a/alib2algo/test-src/grammar/simplify/GrammarToGNFTest.cpp
+++ b/alib2algo/test-src/grammar/simplify/GrammarToGNFTest.cpp
@@ -9,8 +9,6 @@
#include <factory/StringDataFactory.hpp>
#include <common/createUnique.hpp>
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GrammarToGNFTest, "grammar" );
CPPUNIT_TEST_SUITE_REGISTRATION( GrammarToGNFTest );
diff --git a/alib2algo/test-src/grammar/toGrammar/rg2rgTest.cpp b/alib2algo/test-src/grammar/toGrammar/rg2rgTest.cpp
index f68c6034a2..3facdea247 100644
--- a/alib2algo/test-src/grammar/toGrammar/rg2rgTest.cpp
+++ b/alib2algo/test-src/grammar/toGrammar/rg2rgTest.cpp
@@ -4,8 +4,6 @@
#include "grammar/convert/ToGrammarLeftRG.h"
#include "grammar/convert/ToGrammarRightRG.h"
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( rg2rgTest, "grammar" );
CPPUNIT_TEST_SUITE_REGISTRATION( rg2rgTest );
diff --git a/alib2algo/test-src/playTest.cpp b/alib2algo/test-src/playTest.cpp
index a8cf3c2a8c..0b2395adec 100644
--- a/alib2algo/test-src/playTest.cpp
+++ b/alib2algo/test-src/playTest.cpp
@@ -11,8 +11,6 @@
#include "automaton/simplify/Trim.h"
#include "automaton/simplify/EpsilonRemoverIncoming.h"
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
#define TEST_ITERATIONS 100
#define TEST_AUTOMATON_STATES_MAX 18
#define TEST_AUTOMATON_DENSITY_MAX 2.5
diff --git a/alib2algo/test-src/regexp/RegExpTest.cpp b/alib2algo/test-src/regexp/RegExpTest.cpp
index 33ba87d8e1..079de0f953 100644
--- a/alib2algo/test-src/regexp/RegExpTest.cpp
+++ b/alib2algo/test-src/regexp/RegExpTest.cpp
@@ -15,9 +15,6 @@
#include <factory/StringDataFactory.hpp>
-#define CPPUNIT_IMPLY( x, y ) CPPUNIT_ASSERT ( !( x ) || ( y ) )
-#define CPPUNIT_EXCLUSIVE_OR( x, y ) CPPUNIT_ASSERT ( ( !( x ) && ( y ) ) || ( ( x ) && !( y ) ) )
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( RegExpTest, "regexp" );
CPPUNIT_TEST_SUITE_REGISTRATION ( RegExpTest );
diff --git a/alib2algo/test-src/regexp/simplify/RegExpOptimizeTest.cpp b/alib2algo/test-src/regexp/simplify/RegExpOptimizeTest.cpp
index 8f4133f53e..6dbcb6d433 100644
--- a/alib2algo/test-src/regexp/simplify/RegExpOptimizeTest.cpp
+++ b/alib2algo/test-src/regexp/simplify/RegExpOptimizeTest.cpp
@@ -9,9 +9,6 @@
#include <primitive/Character.h>
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-#define CPPUNIT_EXCLUSIVE_OR(x, y) CPPUNIT_ASSERT((!(x) && (y)) || ((x) && !(y)))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( RegExpOptimizeTest, "regexp" );
CPPUNIT_TEST_SUITE_REGISTRATION( RegExpOptimizeTest );
diff --git a/alib2algo/test-src/regexp/transform/RegExpDerivationTest.cpp b/alib2algo/test-src/regexp/transform/RegExpDerivationTest.cpp
index e45ed7a803..196c14f412 100644
--- a/alib2algo/test-src/regexp/transform/RegExpDerivationTest.cpp
+++ b/alib2algo/test-src/regexp/transform/RegExpDerivationTest.cpp
@@ -6,8 +6,6 @@
#include <factory/StringDataFactory.hpp>
#include "factory/XmlDataFactory.hpp"
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( RegExpDerivationTest, "regexp" );
CPPUNIT_TEST_SUITE_REGISTRATION( RegExpDerivationTest );
diff --git a/alib2algo/test-src/regexp/transform/RegExpIntegralTest.cpp b/alib2algo/test-src/regexp/transform/RegExpIntegralTest.cpp
index 1973f5fdca..2ad4d37089 100644
--- a/alib2algo/test-src/regexp/transform/RegExpIntegralTest.cpp
+++ b/alib2algo/test-src/regexp/transform/RegExpIntegralTest.cpp
@@ -5,8 +5,6 @@
#include <factory/StringDataFactory.hpp>
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( RegExpIntegralTest, "regexp" );
CPPUNIT_TEST_SUITE_REGISTRATION( RegExpIntegralTest );
diff --git a/alib2algo/test-src/string/compare/compareTest.cpp b/alib2algo/test-src/string/compare/compareTest.cpp
index 6c0b8cbe32..3e533ceb0b 100644
--- a/alib2algo/test-src/string/compare/compareTest.cpp
+++ b/alib2algo/test-src/string/compare/compareTest.cpp
@@ -8,8 +8,6 @@
#include "string/CyclicString.h"
#include "string/Epsilon.h"
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( compareTest, "string" );
CPPUNIT_TEST_SUITE_REGISTRATION( compareTest );
diff --git a/alib2algo/test-src/string/properties/borderArrayTest.cpp b/alib2algo/test-src/string/properties/borderArrayTest.cpp
index 0381b37fbe..7b5cd679e4 100644
--- a/alib2algo/test-src/string/properties/borderArrayTest.cpp
+++ b/alib2algo/test-src/string/properties/borderArrayTest.cpp
@@ -3,8 +3,6 @@
#include <string/String.h>
#include <string/properties/BorderArray.h>
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( borderArrayTest, "stringology" );
CPPUNIT_TEST_SUITE_REGISTRATION( borderArrayTest );
diff --git a/alib2algo/test-src/stringology/exact/stringMatchTest.cpp b/alib2algo/test-src/stringology/exact/stringMatchTest.cpp
index 06fd7d387c..73d281b2df 100644
--- a/alib2algo/test-src/stringology/exact/stringMatchTest.cpp
+++ b/alib2algo/test-src/stringology/exact/stringMatchTest.cpp
@@ -4,8 +4,6 @@
#include <string/LinearString.h>
#include <stringology/exact/ExactFactorMatch.h>
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( stringMatchTest, "string" );
CPPUNIT_TEST_SUITE_REGISTRATION( stringMatchTest );
diff --git a/alib2algo_experimental/test-src/graph/sort/TopologicalSortTest.cpp b/alib2algo_experimental/test-src/graph/sort/TopologicalSortTest.cpp
index c015081bc7..59092bd960 100644
--- a/alib2algo_experimental/test-src/graph/sort/TopologicalSortTest.cpp
+++ b/alib2algo_experimental/test-src/graph/sort/TopologicalSortTest.cpp
@@ -2,8 +2,6 @@
#include "graph/sort/TopologicalSort.h"
-#define CPPUNIT_ASSERT_EQUAL_INT(a, b) CPPUNIT_ASSERT_EQUAL(a, (int)b)
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GraphTopologicalSortTest, "graph" );
CPPUNIT_TEST_SUITE_REGISTRATION( GraphTopologicalSortTest );
@@ -33,7 +31,7 @@ void GraphTopologicalSortTest::testSort1()
graph::sort::TopologicalSort::Result res;
res = graph::sort::TopologicalSort::topologicalsort(dg);
- CPPUNIT_ASSERT_EQUAL_INT(6, res.size());
+ CPPUNIT_ASSERT_EQUAL(6, (int) res.size());
CPPUNIT_ASSERT_EQUAL(n1, *res.begin());
res.erase(res.begin());
diff --git a/alib2algo_experimental/test-src/stringology/exact/BackwardNondeterministicDAWGMatchingTest.cpp b/alib2algo_experimental/test-src/stringology/exact/BackwardNondeterministicDAWGMatchingTest.cpp
index 244abd6e60..e7fe488512 100644
--- a/alib2algo_experimental/test-src/stringology/exact/BackwardNondeterministicDAWGMatchingTest.cpp
+++ b/alib2algo_experimental/test-src/stringology/exact/BackwardNondeterministicDAWGMatchingTest.cpp
@@ -7,8 +7,6 @@
#include "string/generate/RandomStringFactory.h"
#include "string/generate/RandomSubstringFactory.h"
-#define CPPUNIT_IMPLY( x, y ) CPPUNIT_ASSERT ( !( x ) || ( y ) )
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( BackwardNondeterministicDAWGMatchingTest, "stringology" );
CPPUNIT_TEST_SUITE_REGISTRATION ( BackwardNondeterministicDAWGMatchingTest );
diff --git a/alib2algo_experimental/test-src/stringology/exact/FactorOracleAutomatonTest.cpp b/alib2algo_experimental/test-src/stringology/exact/FactorOracleAutomatonTest.cpp
index eee6b41344..e71878e082 100644
--- a/alib2algo_experimental/test-src/stringology/exact/FactorOracleAutomatonTest.cpp
+++ b/alib2algo_experimental/test-src/stringology/exact/FactorOracleAutomatonTest.cpp
@@ -8,8 +8,6 @@
#include "string/generate/RandomStringFactory.h"
#include "string/generate/RandomSubstringFactory.h"
-#define CPPUNIT_IMPLY( x, y ) CPPUNIT_ASSERT ( !( x ) || ( y ) )
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( FactorOracleAutomatonTest, "stringology" );
CPPUNIT_TEST_SUITE_REGISTRATION ( FactorOracleAutomatonTest );
diff --git a/alib2algo_experimental/test-src/stringology/exact/SuffixAutomatonTest.cpp b/alib2algo_experimental/test-src/stringology/exact/SuffixAutomatonTest.cpp
index bea6adf057..10c9a6c536 100644
--- a/alib2algo_experimental/test-src/stringology/exact/SuffixAutomatonTest.cpp
+++ b/alib2algo_experimental/test-src/stringology/exact/SuffixAutomatonTest.cpp
@@ -8,8 +8,6 @@
#include "string/generate/RandomStringFactory.h"
#include "string/generate/RandomSubstringFactory.h"
-#define CPPUNIT_IMPLY( x, y ) CPPUNIT_ASSERT ( !( x ) || ( y ) )
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( SuffixAutomatonTest, "stringology" );
CPPUNIT_TEST_SUITE_REGISTRATION ( SuffixAutomatonTest );
diff --git a/alib2common/test-src/common/CreateUniqueTest.cpp b/alib2common/test-src/common/CreateUniqueTest.cpp
index d99c4c2e71..f834f1e724 100644
--- a/alib2common/test-src/common/CreateUniqueTest.cpp
+++ b/alib2common/test-src/common/CreateUniqueTest.cpp
@@ -2,9 +2,6 @@
#include <common/createUnique.hpp>
-#define CPPUNIT_IMPLY( x, y ) CPPUNIT_ASSERT ( !( x ) || ( y ) )
-#define CPPUNIT_EXCLUSIVE_OR( x, y ) CPPUNIT_ASSERT ( ( !( x ) && ( y ) ) || ( ( x ) && !( y ) ) )
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( CreateUniqueTest, "common" );
CPPUNIT_TEST_SUITE_REGISTRATION ( CreateUniqueTest );
diff --git a/alib2common/test-src/container/ContainerTest.cpp b/alib2common/test-src/container/ContainerTest.cpp
index deccbb04ec..bc4d5a142d 100644
--- a/alib2common/test-src/container/ContainerTest.cpp
+++ b/alib2common/test-src/container/ContainerTest.cpp
@@ -17,9 +17,6 @@
#include <type_traits>
-#define CPPUNIT_IMPLY( x, y ) CPPUNIT_ASSERT ( !( x ) || ( y ) )
-#define CPPUNIT_EXCLUSIVE_OR( x, y ) CPPUNIT_ASSERT ( ( !( x ) && ( y ) ) || ( ( x ) && !( y ) ) )
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( ContainerTest, "container" );
CPPUNIT_TEST_SUITE_REGISTRATION ( ContainerTest );
diff --git a/alib2common/test-src/object/AnyObjectTest.cpp b/alib2common/test-src/object/AnyObjectTest.cpp
index a7af28e6cf..df2fd7e34b 100644
--- a/alib2common/test-src/object/AnyObjectTest.cpp
+++ b/alib2common/test-src/object/AnyObjectTest.cpp
@@ -10,9 +10,6 @@
#include "factory/XmlDataFactory.hpp"
-#define CPPUNIT_IMPLY( x, y ) CPPUNIT_ASSERT ( !( x ) || ( y ) )
-#define CPPUNIT_EXCLUSIVE_OR( x, y ) CPPUNIT_ASSERT ( ( !( x ) && ( y ) ) || ( ( x ) && !( y ) ) )
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( AnyObjectTest, "object" );
CPPUNIT_TEST_SUITE_REGISTRATION ( AnyObjectTest );
diff --git a/alib2common/test-src/object/ObjectTest.cpp b/alib2common/test-src/object/ObjectTest.cpp
index 4f08f9e2db..d3883de7d1 100644
--- a/alib2common/test-src/object/ObjectTest.cpp
+++ b/alib2common/test-src/object/ObjectTest.cpp
@@ -12,9 +12,6 @@
#include <type_traits>
-#define CPPUNIT_IMPLY( x, y ) CPPUNIT_ASSERT ( !( x ) || ( y ) )
-#define CPPUNIT_EXCLUSIVE_OR( x, y ) CPPUNIT_ASSERT ( ( !( x ) && ( y ) ) || ( ( x ) && !( y ) ) )
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( ObjectTest, "object" );
CPPUNIT_TEST_SUITE_REGISTRATION ( ObjectTest );
diff --git a/alib2common/test-src/primitive/PrimitiveTest.cpp b/alib2common/test-src/primitive/PrimitiveTest.cpp
index 6b771feee1..ab9a79279c 100644
--- a/alib2common/test-src/primitive/PrimitiveTest.cpp
+++ b/alib2common/test-src/primitive/PrimitiveTest.cpp
@@ -9,8 +9,6 @@
#include "factory/XmlDataFactory.hpp"
#include <algorithm>
-#define CPPUNIT_EXCLUSIVE_OR(x, y) CPPUNIT_ASSERT((!(x) && (y)) || ((x) && !(y)))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( PrimitiveTest, "primitive" );
CPPUNIT_TEST_SUITE_REGISTRATION( PrimitiveTest );
diff --git a/alib2common/test-src/sax/SaxTest.cpp b/alib2common/test-src/sax/SaxTest.cpp
index d5d5ffcf83..04a274a264 100644
--- a/alib2common/test-src/sax/SaxTest.cpp
+++ b/alib2common/test-src/sax/SaxTest.cpp
@@ -5,8 +5,6 @@
#include "sax/SaxParseInterface.h"
#include "sax/SaxComposeInterface.h"
-#define CPPUNIT_EXCLUSIVE_OR( x, y ) CPPUNIT_ASSERT ( ( !( x ) && ( y ) ) || ( ( x ) && !( y ) ) )
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( SaxTest, "sax" );
CPPUNIT_TEST_SUITE_REGISTRATION ( SaxTest );
diff --git a/alib2data/test-src/alphabet/SymbolTest.cpp b/alib2data/test-src/alphabet/SymbolTest.cpp
index 50b6209efe..636cdbc0f5 100644
--- a/alib2data/test-src/alphabet/SymbolTest.cpp
+++ b/alib2data/test-src/alphabet/SymbolTest.cpp
@@ -16,9 +16,6 @@
#include "factory/XmlDataFactory.hpp"
-#define CPPUNIT_IMPLY( x, y ) CPPUNIT_ASSERT ( !( x ) || ( y ) )
-#define CPPUNIT_EXCLUSIVE_OR( x, y ) CPPUNIT_ASSERT ( ( !( x ) && ( y ) ) || ( ( x ) && !( y ) ) )
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( SymbolTest, "alphabet" );
CPPUNIT_TEST_SUITE_REGISTRATION ( SymbolTest );
diff --git a/alib2data/test-src/automaton/AutomatonTemplatesTest.cpp b/alib2data/test-src/automaton/AutomatonTemplatesTest.cpp
index dd9abf6f26..22e884acf6 100644
--- a/alib2data/test-src/automaton/AutomatonTemplatesTest.cpp
+++ b/alib2data/test-src/automaton/AutomatonTemplatesTest.cpp
@@ -14,8 +14,6 @@
#include <object/Object.h>
-#define CPPUNIT_IMPLY( x, y ) CPPUNIT_ASSERT ( !( x ) || ( y ) )
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( AutomatonTemplatesTest, "automaton" );
CPPUNIT_TEST_SUITE_REGISTRATION ( AutomatonTemplatesTest );
diff --git a/alib2data/test-src/automaton/AutomatonTest.cpp b/alib2data/test-src/automaton/AutomatonTest.cpp
index a09e9e7213..49e6f17d10 100644
--- a/alib2data/test-src/automaton/AutomatonTest.cpp
+++ b/alib2data/test-src/automaton/AutomatonTest.cpp
@@ -22,8 +22,6 @@
#include "regexp/unbounded/UnboundedRegExp.h"
#include "regexp/unbounded/UnboundedRegExpElements.h"
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( AutomatonTest, "automaton" );
CPPUNIT_TEST_SUITE_REGISTRATION( AutomatonTest );
diff --git a/alib2data/test-src/common/SparseBoolVectorTest.cpp b/alib2data/test-src/common/SparseBoolVectorTest.cpp
index a0e7fad72a..1b2412ba71 100644
--- a/alib2data/test-src/common/SparseBoolVectorTest.cpp
+++ b/alib2data/test-src/common/SparseBoolVectorTest.cpp
@@ -4,9 +4,6 @@
#include <factory/XmlDataFactory.hpp>
-#define CPPUNIT_IMPLY( x, y ) CPPUNIT_ASSERT ( !( x ) || ( y ) )
-#define CPPUNIT_EXCLUSIVE_OR( x, y ) CPPUNIT_ASSERT ( ( !( x ) && ( y ) ) || ( ( x ) && !( y ) ) )
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( SparseBoolVectorTest, "common" );
CPPUNIT_TEST_SUITE_REGISTRATION ( SparseBoolVectorTest );
diff --git a/alib2data/test-src/grammar/GrammarTest.cpp b/alib2data/test-src/grammar/GrammarTest.cpp
index 1b5c3b6413..ad415b66c2 100644
--- a/alib2data/test-src/grammar/GrammarTest.cpp
+++ b/alib2data/test-src/grammar/GrammarTest.cpp
@@ -23,8 +23,6 @@
#include "alphabet/LabeledSymbol.h"
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GrammarTest, "grammar" );
CPPUNIT_TEST_SUITE_REGISTRATION( GrammarTest );
diff --git a/alib2data/test-src/label/LabelTest.cpp b/alib2data/test-src/label/LabelTest.cpp
index c3bbc603fa..4c2dee78d0 100644
--- a/alib2data/test-src/label/LabelTest.cpp
+++ b/alib2data/test-src/label/LabelTest.cpp
@@ -15,8 +15,6 @@
#include <algorithm>
#include <type_traits>
-#define CPPUNIT_EXCLUSIVE_OR(x, y) CPPUNIT_ASSERT((!(x) && (y)) || ((x) && !(y)))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( LabelTest, "label" );
CPPUNIT_TEST_SUITE_REGISTRATION( LabelTest );
diff --git a/alib2data/test-src/regexp/RegExpTest.cpp b/alib2data/test-src/regexp/RegExpTest.cpp
index bc0812774c..353f696580 100644
--- a/alib2data/test-src/regexp/RegExpTest.cpp
+++ b/alib2data/test-src/regexp/RegExpTest.cpp
@@ -13,9 +13,6 @@
#include "factory/XmlDataFactory.hpp"
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-#define CPPUNIT_EXCLUSIVE_OR(x, y) CPPUNIT_ASSERT((!(x) && (y)) || ((x) && !(y)))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( RegExpTest, "regexp" );
CPPUNIT_TEST_SUITE_REGISTRATION( RegExpTest );
diff --git a/alib2data/test-src/rte/RTETest.cpp b/alib2data/test-src/rte/RTETest.cpp
index 432f777b95..1c6aeb22ef 100644
--- a/alib2data/test-src/rte/RTETest.cpp
+++ b/alib2data/test-src/rte/RTETest.cpp
@@ -13,9 +13,6 @@
#include "factory/XmlDataFactory.hpp"
-#define CPPUNIT_IMPLY( x, y ) CPPUNIT_ASSERT ( !( x ) || ( y ) )
-#define CPPUNIT_EXCLUSIVE_OR( x, y ) CPPUNIT_ASSERT ( ( !( x ) && ( y ) ) || ( ( x ) && !( y ) ) )
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( RTETest, "rte" );
CPPUNIT_TEST_SUITE_REGISTRATION ( RTETest );
diff --git a/alib2data/test-src/string/StringTest.cpp b/alib2data/test-src/string/StringTest.cpp
index c0438b962b..eb9fa29f6d 100644
--- a/alib2data/test-src/string/StringTest.cpp
+++ b/alib2data/test-src/string/StringTest.cpp
@@ -16,8 +16,6 @@
#include "alphabet/LabeledSymbol.h"
#include "alphabet/BlankSymbol.h"
-#define CPPUNIT_IMPLY( x, y ) CPPUNIT_ASSERT ( !( x ) || ( y ) )
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( StringTest, "string" );
CPPUNIT_TEST_SUITE_REGISTRATION ( StringTest );
diff --git a/alib2data/test-src/tree/PatternTest.cpp b/alib2data/test-src/tree/PatternTest.cpp
index 3b17c0c283..bea2a26e55 100644
--- a/alib2data/test-src/tree/PatternTest.cpp
+++ b/alib2data/test-src/tree/PatternTest.cpp
@@ -17,8 +17,6 @@
#include "alphabet/BarSymbol.h"
#include "alphabet/VariablesBarSymbol.h"
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( PatternTest, "tree" );
CPPUNIT_TEST_SUITE_REGISTRATION( PatternTest );
diff --git a/alib2data/test-src/tree/TreeTest.cpp b/alib2data/test-src/tree/TreeTest.cpp
index 0b79688112..75d177a643 100644
--- a/alib2data/test-src/tree/TreeTest.cpp
+++ b/alib2data/test-src/tree/TreeTest.cpp
@@ -17,8 +17,6 @@
#include "alphabet/SubtreeWildcardSymbol.h"
#include "alphabet/BarSymbol.h"
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TreeTest, "tree" );
CPPUNIT_TEST_SUITE_REGISTRATION( TreeTest );
diff --git a/alib2elgo/test-src/automaton/simplify/efficient/trimTest.cpp b/alib2elgo/test-src/automaton/simplify/efficient/trimTest.cpp
index 316d2878b8..45de5928ae 100644
--- a/alib2elgo/test-src/automaton/simplify/efficient/trimTest.cpp
+++ b/alib2elgo/test-src/automaton/simplify/efficient/trimTest.cpp
@@ -5,8 +5,6 @@
#include "automaton/FSM/DFA.h"
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( trimTest, "automaton" );
CPPUNIT_TEST_SUITE_REGISTRATION( trimTest );
diff --git a/alib2measurepp/test-src/provisioner/provisionerTest.cpp b/alib2measurepp/test-src/provisioner/provisionerTest.cpp
index 3ceabc3d0f..59bbc7e44f 100644
--- a/alib2measurepp/test-src/provisioner/provisionerTest.cpp
+++ b/alib2measurepp/test-src/provisioner/provisionerTest.cpp
@@ -5,8 +5,6 @@
#include <sys/stat.h>
#include <sys/fcntl.h>
-#define CPPUNIT_IMPLY( x, y ) CPPUNIT_ASSERT ( !( x ) || ( y ) )
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( provisionerTest, "provisioner" );
CPPUNIT_TEST_SUITE_REGISTRATION ( provisionerTest );
diff --git a/alib2std/src/cppunit/extensions/HelperMacros.h b/alib2std/src/cppunit/extensions/HelperMacros.h
new file mode 100644
index 0000000000..6132b51190
--- /dev/null
+++ b/alib2std/src/cppunit/extensions/HelperMacros.h
@@ -0,0 +1,10 @@
+#ifndef __CPPUNIT_HELPER_MACROS_WRAPPER_
+#define __CPPUNIT_HELPER_MACROS_WRAPPER_
+
+#include <cppunit/ui/../extensions/HelperMacros.h>
+
+#define CPPUNIT_IMPLY(x,y) CPPUNIT_ASSERT ( ! ( x ) || ( y ) )
+#define CPPUNIT_EXCLUSIVE_OR(x,y) CPPUNIT_ASSERT ( ( !( x ) && ( y ) ) || ( ( x ) && !( y ) ) )
+
+#endif /* __CPPUNIT_HELPER_MACROS_WRAPPER_ */
+
diff --git a/alib2std/test-src/extensions/TypeInfoTest.cpp b/alib2std/test-src/extensions/TypeInfoTest.cpp
index 068160f889..1441af3269 100644
--- a/alib2std/test-src/extensions/TypeInfoTest.cpp
+++ b/alib2std/test-src/extensions/TypeInfoTest.cpp
@@ -2,8 +2,6 @@
#include <string>
#include <iostream>
-#define CPPUNIT_EXCLUSIVE_OR(x, y) CPPUNIT_ASSERT((!(x) && (y)) || ((x) && !(y)))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TypeInfoTest, "bits" );
CPPUNIT_TEST_SUITE_REGISTRATION( TypeInfoTest );
diff --git a/alib2str/test-src/automaton/AutomatonTest.cpp b/alib2str/test-src/automaton/AutomatonTest.cpp
index 31f4ec9385..6e7585d0e1 100644
--- a/alib2str/test-src/automaton/AutomatonTest.cpp
+++ b/alib2str/test-src/automaton/AutomatonTest.cpp
@@ -24,8 +24,6 @@
#include "regexp/unbounded/UnboundedRegExp.h"
#include "regexp/unbounded/UnboundedRegExpElements.h"
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( AutomatonTest, "automaton" );
CPPUNIT_TEST_SUITE_REGISTRATION( AutomatonTest );
diff --git a/alib2str/test-src/grammar/GrammarTest.cpp b/alib2str/test-src/grammar/GrammarTest.cpp
index 9924a5d3ec..27c90c89f3 100644
--- a/alib2str/test-src/grammar/GrammarTest.cpp
+++ b/alib2str/test-src/grammar/GrammarTest.cpp
@@ -26,8 +26,6 @@
#include "alphabet/LabeledSymbol.h"
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GrammarTest, "grammar" );
CPPUNIT_TEST_SUITE_REGISTRATION( GrammarTest );
diff --git a/alib2str/test-src/object/LabelTest.cpp b/alib2str/test-src/object/LabelTest.cpp
index 539efa1d4b..fb218fa961 100644
--- a/alib2str/test-src/object/LabelTest.cpp
+++ b/alib2str/test-src/object/LabelTest.cpp
@@ -4,8 +4,6 @@
#include "factory/StringDataFactory.hpp"
-#define CPPUNIT_EXCLUSIVE_OR(x, y) CPPUNIT_ASSERT((!(x) && (y)) || ((x) && !(y)))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( LabelTest, "label" );
CPPUNIT_TEST_SUITE_REGISTRATION( LabelTest );
diff --git a/alib2str/test-src/object/ObjectTest.cpp b/alib2str/test-src/object/ObjectTest.cpp
index 14e95db41b..a2147d5441 100644
--- a/alib2str/test-src/object/ObjectTest.cpp
+++ b/alib2str/test-src/object/ObjectTest.cpp
@@ -6,8 +6,6 @@
#include <sstream>
-#define CPPUNIT_EXCLUSIVE_OR(x, y) CPPUNIT_ASSERT((!(x) && (y)) || ((x) && !(y)))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ObjectTest, "label" );
CPPUNIT_TEST_SUITE_REGISTRATION( ObjectTest );
diff --git a/alib2str/test-src/object/SymbolTest.cpp b/alib2str/test-src/object/SymbolTest.cpp
index a461d7ed7b..5b743901b0 100644
--- a/alib2str/test-src/object/SymbolTest.cpp
+++ b/alib2str/test-src/object/SymbolTest.cpp
@@ -4,9 +4,6 @@
#include "factory/StringDataFactory.hpp"
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-#define CPPUNIT_EXCLUSIVE_OR(x, y) CPPUNIT_ASSERT((!(x) && (y)) || ((x) && !(y)))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( SymbolTest, "alphabet" );
CPPUNIT_TEST_SUITE_REGISTRATION( SymbolTest );
diff --git a/alib2str/test-src/regexp/RegExpTest.cpp b/alib2str/test-src/regexp/RegExpTest.cpp
index a337ac4942..97d308135f 100644
--- a/alib2str/test-src/regexp/RegExpTest.cpp
+++ b/alib2str/test-src/regexp/RegExpTest.cpp
@@ -13,9 +13,6 @@
#include "factory/XmlDataFactory.hpp"
#include "factory/StringDataFactory.hpp"
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-#define CPPUNIT_EXCLUSIVE_OR(x, y) CPPUNIT_ASSERT((!(x) && (y)) || ((x) && !(y)))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( RegExpTest, "regexp" );
CPPUNIT_TEST_SUITE_REGISTRATION( RegExpTest );
diff --git a/alib2str/test-src/string/StringTest.cpp b/alib2str/test-src/string/StringTest.cpp
index a2a7cf2bf0..e0ca33655d 100644
--- a/alib2str/test-src/string/StringTest.cpp
+++ b/alib2str/test-src/string/StringTest.cpp
@@ -16,8 +16,6 @@
#include "alphabet/LabeledSymbol.h"
#include "alphabet/BlankSymbol.h"
-#define CPPUNIT_IMPLY(x, y) CPPUNIT_ASSERT(!(x) || (y))
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( StringTest, "string" );
CPPUNIT_TEST_SUITE_REGISTRATION( StringTest );
diff --git a/alib2str/test-src/tree/TreeTest.cpp b/alib2str/test-src/tree/TreeTest.cpp
index cc0ac48464..c5a6b240ab 100644
--- a/alib2str/test-src/tree/TreeTest.cpp
+++ b/alib2str/test-src/tree/TreeTest.cpp
@@ -12,8 +12,6 @@
#include "alphabet/LabeledSymbol.h"
#include "alphabet/BlankSymbol.h"
-#define CPPUNIT_IMPLY( x, y ) CPPUNIT_ASSERT ( !( x ) || ( y ) )
-
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION ( TreeTest, "tree" );
CPPUNIT_TEST_SUITE_REGISTRATION ( TreeTest );
diff --git a/alib2str_experimental/test-src/graph/GraphTest.cpp b/alib2str_experimental/test-src/graph/GraphTest.cpp
index 82acd27259..f04b7074c8 100644
--- a/alib2str_experimental/test-src/graph/GraphTest.cpp
+++ b/alib2str_experimental/test-src/graph/GraphTest.cpp
@@ -18,8 +18,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( GraphTest, "graph" );
CPPUNIT_TEST_SUITE_REGISTRATION( GraphTest );
-#define CPPUNIT_ASSERT_EQUAL_INT(a, b) CPPUNIT_ASSERT_EQUAL(a, (int)b)
-
template< typename UndirectedGraphImpl, typename DirectedGraphImpl >
void testStringParser_impl()
{
--
GitLab