max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-15 16:18:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

changed .c extensions to .cpp extensions for the following files:

Browse Source 
fwrap.c
fwrap2.c
fwrap3.c
module_files.c
module_output.c
pp_sys.c

updated unit test for GetComponent


git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/class@4180 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2010-03-19 23:39:37 +00:00
parent 9ce16bc323
commit 49ae95b333
8 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
IPhreeqc.vcproj
View File

@ -248,7 +248,7 @@
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
>
<File
RelativePath="src\fwrap.c"
RelativePath=".\src\fwrap.cpp"
>
<FileConfiguration
Name="Release|Win32"
@ -282,7 +282,7 @@
</FileConfiguration>
</File>
<File
RelativePath=".\src\fwrap2.c"
RelativePath=".\src\fwrap2.cpp"
>
<FileConfiguration
Name="Release|Win32"
@ -310,7 +310,7 @@
</FileConfiguration>
</File>
<File
RelativePath=".\src\fwrap3.c"
RelativePath=".\src\fwrap3.cpp"
>
</File>
<File
@ -318,7 +318,7 @@
>
</File>
<File
RelativePath=".\src\module_files.c"
RelativePath=".\src\module_files.cpp"
>
<FileConfiguration
Name="Release|Win32"
@ -346,7 +346,7 @@
</FileConfiguration>
</File>
<File
RelativePath="src\module_output.c"
RelativePath=".\src\module_output.cpp"
>
<FileConfiguration
Name="Release|Win32"
@ -379,6 +379,34 @@
/>
</FileConfiguration>
</File>
<File
RelativePath=".\src\pp_sys.cpp"
>
<FileConfiguration
Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="MemDebug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\src\SelectedOutput.cpp"
>

0
src/fwrap.c → src/fwrap.cpp
View File

0
src/fwrap2.c → src/fwrap2.cpp
View File

0
src/fwrap3.c → src/fwrap3.cpp
View File

0
src/module_files.c → src/module_files.cpp
View File

0
src/module_output.c → src/module_output.cpp
View File

0
src/pp_sys.c → src/pp_sys.cpp
View File

10
unit/TestInterface.cpp
View File

@ -1711,7 +1711,7 @@ TestInterface::TestGetComponentCount(void)
CPPUNIT_ASSERT_EQUAL( 0, ::Run() );
CPPUNIT_ASSERT_EQUAL( 4, ::GetComponentCount() );
CPPUNIT_ASSERT_EQUAL( 3, ::GetComponentCount() );
}
void
@ -1732,16 +1732,16 @@ TestInterface::TestGetComponent(void)
CPPUNIT_ASSERT_EQUAL( 0, ::Run() );
CPPUNIT_ASSERT_EQUAL( 4, ::GetComponentCount() );
CPPUNIT_ASSERT_EQUAL( 3, ::GetComponentCount() );
CPPUNIT_ASSERT_EQUAL( std::string(""), std::string(::GetComponent(-2)) );
CPPUNIT_ASSERT_EQUAL( std::string(""), std::string(::GetComponent(-1)) );
CPPUNIT_ASSERT_EQUAL( std::string("Ca"), std::string(::GetComponent(0)) );
CPPUNIT_ASSERT_EQUAL( std::string("H"), std::string(::GetComponent(1)) );
CPPUNIT_ASSERT_EQUAL( std::string("C"), std::string(::GetComponent(0)) );
CPPUNIT_ASSERT_EQUAL( std::string("Ca"), std::string(::GetComponent(1)) );
CPPUNIT_ASSERT_EQUAL( std::string("Na"), std::string(::GetComponent(2)) );
CPPUNIT_ASSERT_EQUAL( std::string("O"), std::string(::GetComponent(3)) );
CPPUNIT_ASSERT_EQUAL( std::string(""), std::string(::GetComponent(3)) );
CPPUNIT_ASSERT_EQUAL( std::string(""), std::string(::GetComponent(4)) );
CPPUNIT_ASSERT_EQUAL( std::string(""), std::string(::GetComponent(5)) );
}