"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "unit-tests/DMRTest.cc" between
libdap-3.19.0.tar.gz and libdap-3.19.1.tar.gz

About: OPeNDAP is a client/server system for making local data accessible to remote locations without regard to the local or remote storage format, architecture, or environment (see also ODC = The OPeNDAP Data Connector).

DMRTest.cc  (libdap-3.19.0):DMRTest.cc  (libdap-3.19.1)
skipping to change at line 57 skipping to change at line 57
#include "DDS.h" #include "DDS.h"
#include "DMR.h" #include "DMR.h"
#include "XMLWriter.h" #include "XMLWriter.h"
#include "D4BaseTypeFactory.h" #include "D4BaseTypeFactory.h"
#include "D4ParserSax2.h" #include "D4ParserSax2.h"
#include "GNURegex.h" #include "GNURegex.h"
#include "GetOpt.h" #include "GetOpt.h"
#include "util.h" #include "util.h"
#include "debug.h" #include "debug.h"
#include "GetOpt.h"
#include "testFile.h" #include "testFile.h"
#include "test_config.h" #include "test_config.h"
static bool debug = false; static bool debug = false;
#undef DBG #undef DBG
#define DBG(x) do { if (debug) {x;} } while(false) #define DBG(x) do { if (debug) {x;} } while(false)
using namespace CppUnit; using namespace CppUnit;
skipping to change at line 161 skipping to change at line 160
CPPUNIT_ASSERT(string(xml.get_doc()) == readTestBaseline(prefix + dm r_baseline)); CPPUNIT_ASSERT(string(xml.get_doc()) == readTestBaseline(prefix + dm r_baseline));
delete dmr; delete dmr;
} }
catch (Error &e) { catch (Error &e) {
delete dmr; delete dmr;
CPPUNIT_FAIL(string("Caught Error: ") + e.get_error_message()); CPPUNIT_FAIL(string("Caught Error: ") + e.get_error_message());
} }
DBG(cerr << __func__ << "() - END" << endl); DBG(cerr << __func__ << "() - END" << endl);
} }
CPPUNIT_TEST_SUITE (DMRTest); CPPUNIT_TEST_SUITE (DMRTest);
CPPUNIT_TEST (test_dmr_from_dds_1); CPPUNIT_TEST(test_dmr_from_dds_1);
CPPUNIT_TEST (test_dmr_from_dds_2); CPPUNIT_TEST(test_dmr_from_dds_2);
CPPUNIT_TEST (test_dmr_from_dds_3); CPPUNIT_TEST(test_dmr_from_dds_3);
CPPUNIT_TEST (test_dmr_from_dds_4); CPPUNIT_TEST(test_dmr_from_dds_4);
CPPUNIT_TEST (test_dmr_from_dds_5); CPPUNIT_TEST(test_dmr_from_dds_5);
CPPUNIT_TEST (test_dmr_from_dds_6); CPPUNIT_TEST(test_dmr_from_dds_6);
CPPUNIT_TEST (test_dmr_from_dds_with_attr_1); CPPUNIT_TEST(test_dmr_from_dds_with_attr_1);
CPPUNIT_TEST (test_dmr_from_dds_with_attr_2); CPPUNIT_TEST(test_dmr_from_dds_with_attr_2);
CPPUNIT_TEST (test_copy_ctor); CPPUNIT_TEST(test_copy_ctor);
CPPUNIT_TEST (test_copy_ctor_2); CPPUNIT_TEST(test_copy_ctor_2);
CPPUNIT_TEST (test_copy_ctor_3); CPPUNIT_TEST(test_copy_ctor_3);
CPPUNIT_TEST (test_copy_ctor_4); CPPUNIT_TEST(test_copy_ctor_4);
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END()
;
// Test a DDS with simple scalar types and no attributes // Test a DDS with simple scalar types and no attributes
void test_dmr_from_dds_1() void test_dmr_from_dds_1()
{ {
DBG(cerr << endl << __func__ << "() - BEGIN" << endl); DBG(cerr << endl << __func__ << "() - BEGIN" << endl);
test_template("test.1", "test.1.dmr"); test_template("test.1", "test.1.dmr");
DBG(cerr << __func__ << "() - END" << endl); DBG(cerr << __func__ << "() - END" << endl);
} }
// What about arrays? This should build shared dimensions // What about arrays? This should build shared dimensions
skipping to change at line 344 skipping to change at line 344
delete dmr; delete dmr;
delete dmr_2; delete dmr_2;
CPPUNIT_ASSERT(dmr_src == dmr_dest); CPPUNIT_ASSERT(dmr_src == dmr_dest);
DBG(cerr << __func__ << "() - END" << endl); DBG(cerr << __func__ << "() - END" << endl);
} }
}; };
CPPUNIT_TEST_SUITE_REGISTRATION (DMRTest); CPPUNIT_TEST_SUITE_REGISTRATION(DMRTest);
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
GetOpt getopt(argc, argv, "dh"); GetOpt getopt(argc, argv, "dh");
int option_char; int option_char;
while ((option_char = getopt()) != -1) while ((option_char = getopt()) != -1)
switch (option_char) { switch (option_char) {
case 'd': case 'd':
debug = 1; // debug is a static global debug = 1; // debug is a static global
 End of changes. 5 change blocks. 
18 lines changed or deleted 18 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)