From f0564e1198518799918043382af0c1d207056cfa Mon Sep 17 00:00:00 2001 From: Scott R Charlton Date: Wed, 10 Mar 2010 06:04:38 +0000 Subject: [PATCH] format changes git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4152 1feff8c3-07ed-0310-ac33-dd36852eb9cd --- unit/TestInterface.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/unit/TestInterface.cpp b/unit/TestInterface.cpp index 16b697d9..49d02e79 100644 --- a/unit/TestInterface.cpp +++ b/unit/TestInterface.cpp @@ -922,16 +922,16 @@ void TestInterface::TestCase2() { ::DeleteFile("case2.punch"); } - CPPUNIT_ASSERT_EQUAL( false, ::FileExists("selected.out") ); - CPPUNIT_ASSERT_EQUAL( false, ::FileExists("case2.punch") ); + CPPUNIT_ASSERT_EQUAL( false, ::FileExists("selected.out") ); + CPPUNIT_ASSERT_EQUAL( false, ::FileExists("case2.punch") ); // clear all flags CPPUNIT_ASSERT_EQUAL( 0, ::LoadDatabase("phreeqc.dat") ); CPPUNIT_ASSERT_EQUAL( FALSE, punch.in); CPPUNIT_ASSERT_EQUAL( TRUE, pr.punch); - CPPUNIT_ASSERT_EQUAL( VR_OK, SOLUTION(1.0, 1.0, 1.0) ); - CPPUNIT_ASSERT_EQUAL( VR_OK, USER_PUNCH("Ca", 10) ); + CPPUNIT_ASSERT_EQUAL( VR_OK, ::SOLUTION(1.0, 1.0, 1.0) ); + CPPUNIT_ASSERT_EQUAL( VR_OK, ::USER_PUNCH("Ca", 10) ); CPPUNIT_ASSERT_EQUAL( VR_OK, ::AccumulateLine("-file case2.punch") ); // force have_punch_name to TRUE (see read_selected_ouput) CPPUNIT_ASSERT_EQUAL( 0, ::Run(0, 0, 0, 1) ); CPPUNIT_ASSERT_EQUAL( false, ::FileExists("selected.out") ); @@ -949,11 +949,11 @@ void TestInterface::TestCase2() { ::DeleteFile("case2.punch"); } - CPPUNIT_ASSERT_EQUAL( false, ::FileExists("selected.out") ); - CPPUNIT_ASSERT_EQUAL( false, ::FileExists("case2.punch") ); + CPPUNIT_ASSERT_EQUAL( false, ::FileExists("selected.out") ); + CPPUNIT_ASSERT_EQUAL( false, ::FileExists("case2.punch") ); - CPPUNIT_ASSERT_EQUAL( VR_OK, SOLUTION(1.0, 1.0, 1.0) ); - CPPUNIT_ASSERT_EQUAL( VR_OK, USER_PUNCH("Ca", 10) ); + CPPUNIT_ASSERT_EQUAL( VR_OK, ::SOLUTION(1.0, 1.0, 1.0) ); + CPPUNIT_ASSERT_EQUAL( VR_OK, ::USER_PUNCH("Ca", 10) ); CPPUNIT_ASSERT_EQUAL( 0, ::Run(0, 0, 0, 1) ); CPPUNIT_ASSERT_EQUAL( false, ::FileExists("selected.out") ); CPPUNIT_ASSERT_EQUAL( true, ::FileExists("case2.punch") ); @@ -1016,10 +1016,10 @@ void TestInterface::TestPrintSelectedOutputFalse() } // run - CPPUNIT_ASSERT_EQUAL( 0, ::Run(0, 0, 0, 1) ); + CPPUNIT_ASSERT_EQUAL( 0, ::Run(0, 0, 0, 1) ); CPPUNIT_ASSERT_EQUAL( 11, ::GetSelectedOutputColumnCount() ); - CPPUNIT_ASSERT_EQUAL( 2, ::GetSelectedOutputRowCount() ); + CPPUNIT_ASSERT_EQUAL( 2, ::GetSelectedOutputRowCount() ); } void TestInterface::TestOutputOnOff()