From b62d3ec3d4275c481b1a6f733cd3c45db3523075 Mon Sep 17 00:00:00 2001 From: Scott Charlton Date: Fri, 24 Jul 2020 13:11:03 -0600 Subject: [PATCH] changed failing tests to use phreeqc.dat.old --- unit/TestIPhreeqc.cpp | 6 +++--- unit/TestIPhreeqcLib.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/unit/TestIPhreeqc.cpp b/unit/TestIPhreeqc.cpp index de6e2bbd..127e6daf 100644 --- a/unit/TestIPhreeqc.cpp +++ b/unit/TestIPhreeqc.cpp @@ -2093,7 +2093,7 @@ void TestIPhreeqc::TestSetOutputFileName(void) IPhreeqc obj; - CPPUNIT_ASSERT_EQUAL( 0, obj.LoadDatabase("phreeqc.dat")); + CPPUNIT_ASSERT_EQUAL( 0, obj.LoadDatabase("phreeqc.dat.old")); // add solution block CPPUNIT_ASSERT_EQUAL( VR_OK, ::SOLUTION(obj, 1.0, 1.0, 1.0) ); @@ -2305,7 +2305,7 @@ void TestIPhreeqc::TestGetOutputStringLineCount(void) IPhreeqc obj; CPPUNIT_ASSERT_EQUAL( 0, obj.GetOutputStringLineCount() ); - CPPUNIT_ASSERT_EQUAL( 0, obj.LoadDatabase("phreeqc.dat")); + CPPUNIT_ASSERT_EQUAL( 0, obj.LoadDatabase("phreeqc.dat.old")); CPPUNIT_ASSERT_EQUAL( 0, obj.GetOutputStringLineCount() ); @@ -2356,7 +2356,7 @@ void TestIPhreeqc::TestGetOutputStringLine(void) IPhreeqc obj; CPPUNIT_ASSERT_EQUAL( 0, obj.GetOutputStringLineCount() ); - CPPUNIT_ASSERT_EQUAL( 0, obj.LoadDatabase("phreeqc.dat")); + CPPUNIT_ASSERT_EQUAL( 0, obj.LoadDatabase("phreeqc.dat.old")); CPPUNIT_ASSERT_EQUAL( 0, obj.GetOutputStringLineCount() ); diff --git a/unit/TestIPhreeqcLib.cpp b/unit/TestIPhreeqcLib.cpp index 62575f01..52cd9a4e 100644 --- a/unit/TestIPhreeqcLib.cpp +++ b/unit/TestIPhreeqcLib.cpp @@ -2394,7 +2394,7 @@ void TestIPhreeqcLib::TestSetOutputFileName(void) int n = ::CreateIPhreeqc(); CPPUNIT_ASSERT(n >= 0); - CPPUNIT_ASSERT_EQUAL( 0, ::LoadDatabase(n, "phreeqc.dat")); + CPPUNIT_ASSERT_EQUAL( 0, ::LoadDatabase(n, "phreeqc.dat.old")); // add solution block CPPUNIT_ASSERT_EQUAL( IPQ_OK, ::SOLUTION(n, 1.0, 1.0, 1.0) ); @@ -2627,7 +2627,7 @@ void TestIPhreeqcLib::TestGetOutputStringLineCount(void) CPPUNIT_ASSERT(n >= 0); CPPUNIT_ASSERT_EQUAL( 0, ::GetOutputStringLineCount(n) ); - CPPUNIT_ASSERT_EQUAL( 0, ::LoadDatabase(n, "phreeqc.dat")); + CPPUNIT_ASSERT_EQUAL( 0, ::LoadDatabase(n, "phreeqc.dat.old")); CPPUNIT_ASSERT_EQUAL( 0, ::GetOutputStringLineCount(n) ); // add solution block @@ -2683,7 +2683,7 @@ void TestIPhreeqcLib::TestGetOutputStringLine(void) CPPUNIT_ASSERT(n >= 0); CPPUNIT_ASSERT_EQUAL( 0, ::GetOutputStringLineCount(n) ); - CPPUNIT_ASSERT_EQUAL( 0, ::LoadDatabase(n, "phreeqc.dat")); + CPPUNIT_ASSERT_EQUAL( 0, ::LoadDatabase(n, "phreeqc.dat.old")); CPPUNIT_ASSERT_EQUAL( 0, ::GetOutputStringLineCount(n) ); // add solution block