format changes

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4152 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2010-03-10 06:04:38 +00:00
parent 5a2616d604
commit f0564e1198

View File

@ -930,8 +930,8 @@ void TestInterface::TestCase2()
CPPUNIT_ASSERT_EQUAL( FALSE, punch.in); CPPUNIT_ASSERT_EQUAL( FALSE, punch.in);
CPPUNIT_ASSERT_EQUAL( TRUE, pr.punch); CPPUNIT_ASSERT_EQUAL( TRUE, pr.punch);
CPPUNIT_ASSERT_EQUAL( VR_OK, SOLUTION(1.0, 1.0, 1.0) ); 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, ::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( 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( 0, ::Run(0, 0, 0, 1) );
CPPUNIT_ASSERT_EQUAL( false, ::FileExists("selected.out") ); CPPUNIT_ASSERT_EQUAL( false, ::FileExists("selected.out") );
@ -952,8 +952,8 @@ void TestInterface::TestCase2()
CPPUNIT_ASSERT_EQUAL( false, ::FileExists("selected.out") ); CPPUNIT_ASSERT_EQUAL( false, ::FileExists("selected.out") );
CPPUNIT_ASSERT_EQUAL( false, ::FileExists("case2.punch") ); CPPUNIT_ASSERT_EQUAL( false, ::FileExists("case2.punch") );
CPPUNIT_ASSERT_EQUAL( VR_OK, SOLUTION(1.0, 1.0, 1.0) ); 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, ::USER_PUNCH("Ca", 10) );
CPPUNIT_ASSERT_EQUAL( 0, ::Run(0, 0, 0, 1) ); CPPUNIT_ASSERT_EQUAL( 0, ::Run(0, 0, 0, 1) );
CPPUNIT_ASSERT_EQUAL( false, ::FileExists("selected.out") ); CPPUNIT_ASSERT_EQUAL( false, ::FileExists("selected.out") );
CPPUNIT_ASSERT_EQUAL( true, ::FileExists("case2.punch") ); CPPUNIT_ASSERT_EQUAL( true, ::FileExists("case2.punch") );