20.67% test coverage of query.c

diff --git a/org.glite.lb.server/test/test_query_events.cpp b/org.glite.lb.server/test/test_query_events.cpp
index 90f29f0..bf356f4 100644 (file)
--- a/org.glite.lb.server/test/test_query_events.cpp
+++ b/org.glite.lb.server/test/test_query_events.cpp
@@ -13,6 +13,8 @@
 
 using namespace std;
 
+static const char *test_dir;
+
 class QueryEventsTest: public CppUnit::TestFixture
 {
        CPPUNIT_TEST_SUITE(QueryEventsTest);
@@ -49,7 +51,9 @@ void QueryEventsTest::oneJob()
                &job[0].value.j);
        job[1].attr = EDG_WLL_QUERY_ATTR_UNDEF;
        
-       qry_file.open("../test/oneJob.qry");
+       string file(test_dir);
+       file += "/oneJob.qry";
+       qry_file.open(file.c_str());
        
        while (!qry_file.eof()) {
                string  query,line;
@@ -141,6 +145,8 @@ int main (int ac,const char *av[])
        CppUnit::Test *suite = CppUnit::TestFactoryRegistry::getRegistry().makeTest();
        CppUnit::TextUi::TestRunner runner;
 
+       test_dir = ac >= 2 ? av[1] : "../test";
+
        runner.addTest(suite);
        return runner.run() ? 0 : 1;
 }

diff --git a/org.glite.lb.server/test/test_xml.cpp.T b/org.glite.lb.server/test/test_xml.cpp.T
index c0762fe..11875fc 100644 (file)
--- a/org.glite.lb.server/test/test_xml.cpp.T
+++ b/org.glite.lb.server/test/test_xml.cpp.T
@@ -200,7 +200,7 @@ void XMLParseTest::protoStatusTest()
 
 }
 
-CPPUNIT_TEST_SUITE_REGISTRATION( XMLParseTest );
+CPPUNIT_TEST_SUITE_REGISTRATION(XMLParseTest);
 
 int main (int ac,const char *av[])
 {