TestSetup: move common define to header file

diff --git a/tests/lib/TestSetup.h b/tests/lib/TestSetup.h
index d9cb50d..1200972 100644 (file)
--- a/tests/lib/TestSetup.h
+++ b/tests/lib/TestSetup.h
@@ -29,6 +29,8 @@ using namespace zypp;
 #define BOOST_CHECK_NE( L, R ) BOOST_CHECK( (L) != (R) )
 #endif
 
+#define LABELED(V) #V << ":\t" << V
+
 enum TestSetupOptionBits
 {
   TSO_CLEANROOT = (1 <<  0)

diff --git a/tests/parser/ProductFileReader_test.cc b/tests/parser/ProductFileReader_test.cc
index b050458..5cba770 100644 (file)
--- a/tests/parser/ProductFileReader_test.cc
+++ b/tests/parser/ProductFileReader_test.cc
@@ -1,8 +1,6 @@
 #include "TestSetup.h"
 #include <zypp/parser/ProductFileReader.h>
 
-#define LABELED(V) #V << ":\t" << V
-
 //static TestSetup test( Arch_x86_64 );
 
 // Must be the first test!

diff --git a/tests/sat/LookupAttr_test.cc b/tests/sat/LookupAttr_test.cc
index 29a6dfe..46a45a2 100644 (file)
--- a/tests/sat/LookupAttr_test.cc
+++ b/tests/sat/LookupAttr_test.cc
@@ -2,8 +2,6 @@
 #include <zypp/sat/LookupAttr.h>
 #include <zypp/ResObjects.h>
 
-#define LABELED(V) #V << ":\t" << V
-
 static TestSetup test( "/tmp/x", Arch_x86_64 );
 
 // Must be the first test!

diff --git a/tests/sat/WhatObsoletes_test.cc b/tests/sat/WhatObsoletes_test.cc
index c082d99..f9dff54 100644 (file)
--- a/tests/sat/WhatObsoletes_test.cc
+++ b/tests/sat/WhatObsoletes_test.cc
@@ -1,8 +1,6 @@
 #include "TestSetup.h"
 #include <zypp/sat/WhatObsoletes.h>
 
-#define LABELED(V) #V << ":\t" << V
-
 namespace zypp
 {
   namespace sat

diff --git a/tests/sat/WhatProvides_test.cc b/tests/sat/WhatProvides_test.cc
index ccd50ab..090cfa5 100644 (file)
--- a/tests/sat/WhatProvides_test.cc
+++ b/tests/sat/WhatProvides_test.cc
@@ -1,7 +1,5 @@
 #include "TestSetup.h"
 
-#define LABELED(V) #V << ":\t" << V
-
 BOOST_AUTO_TEST_CASE(WhatProvides)
 {
   TestSetup test( Arch_x86_64 );