[cig-commits] r13530 - cs/cigma/trunk/tests/libcigma

[luis at geodynamics.org]

Author: luis
Date: 2008-12-09 18:13:26 -0800 (Tue, 09 Dec 2008)
New Revision: 13530

Modified:
   cs/cigma/trunk/tests/libcigma/DofHandlerTest.cpp
   cs/cigma/trunk/tests/libcigma/ElementBlockTest.cpp
   cs/cigma/trunk/tests/libcigma/FieldTest.cpp
   cs/cigma/trunk/tests/libcigma/LocatorTest.cpp
   cs/cigma/trunk/tests/libcigma/MeshPartTest.cpp
   cs/cigma/trunk/tests/libcigma/NodeCoordinatesTest.cpp
   cs/cigma/trunk/tests/libcigma/ReaderTest.cpp
   cs/cigma/trunk/tests/libcigma/ResidualsTest.cpp
Log:
Updated unit tests (data file locations changed)

Modified: cs/cigma/trunk/tests/libcigma/DofHandlerTest.cpp
===================================================================
--- cs/cigma/trunk/tests/libcigma/DofHandlerTest.cpp	2008-12-10 02:13:25 UTC (rev 13529)
+++ cs/cigma/trunk/tests/libcigma/DofHandlerTest.cpp	2008-12-10 02:13:26 UTC (rev 13530)
@@ -92,7 +92,7 @@
 
 void DofHandlerTest::test_text_reader()
 {
-    DataPath dofs_path("tests/data/brick1/brick1_coords.dat"); // load coords as dofs
+    DataPath dofs_path("tests/data/brick1/coords.dat"); // load coords as dofs
     shared_ptr<DofHandler> dofs = ReadDofHandler(dofs_path);
 
     CPPUNIT_ASSERT(dofs);

Modified: cs/cigma/trunk/tests/libcigma/ElementBlockTest.cpp
===================================================================
--- cs/cigma/trunk/tests/libcigma/ElementBlockTest.cpp	2008-12-10 02:13:25 UTC (rev 13529)
+++ cs/cigma/trunk/tests/libcigma/ElementBlockTest.cpp	2008-12-10 02:13:26 UTC (rev 13530)
@@ -43,7 +43,7 @@
 
 void ElementBlockTest::test_text_reader()
 {
-    DataPath eb_path("tests/data/brick1/brick1_connect.dat");
+    DataPath eb_path("tests/data/brick1/connect.dat");
     shared_ptr<ElementBlock> eb = ReadElementBlock(eb_path);
 
     CPPUNIT_ASSERT(eb);

Modified: cs/cigma/trunk/tests/libcigma/FieldTest.cpp
===================================================================
--- cs/cigma/trunk/tests/libcigma/FieldTest.cpp	2008-12-10 02:13:25 UTC (rev 13529)
+++ cs/cigma/trunk/tests/libcigma/FieldTest.cpp	2008-12-10 02:13:26 UTC (rev 13530)
@@ -18,10 +18,10 @@
 void FieldTest::test_text_reader()
 {
     FieldInfo field_info;
-    field_info.p_field = DataPath("tests/data/brick1/brick1_coords.dat");
+    field_info.p_field = DataPath("tests/data/brick1/coords.dat");
     field_info.fe_info.q_info.cell_type_name = "hex8";
-    field_info.mesh_info.p_nc = DataPath("tests/data/brick1/brick1_coords.dat");
-    field_info.mesh_info.p_eb = DataPath("tests/data/brick1/brick1_connect.dat");
+    field_info.mesh_info.p_nc = DataPath("tests/data/brick1/coords.dat");
+    field_info.mesh_info.p_eb = DataPath("tests/data/brick1/connect.dat");
     field_info.mesh_info.cell_type_name = "hex8";
     field_info.mesh_info.use_locator = false;
     shared_ptr<Field> field = ReadField(field_info);

Modified: cs/cigma/trunk/tests/libcigma/LocatorTest.cpp
===================================================================
--- cs/cigma/trunk/tests/libcigma/LocatorTest.cpp	2008-12-10 02:13:25 UTC (rev 13529)
+++ cs/cigma/trunk/tests/libcigma/LocatorTest.cpp	2008-12-10 02:13:26 UTC (rev 13530)
@@ -20,8 +20,8 @@
 void LocatorTest::test_something()
 {
     string prefix = "tests/data/brick1/";
-    string coordfile = prefix + "brick1_coords.dat";
-    string connfile = prefix + "brick1_connect.dat";
+    string coordfile = prefix + "coords.dat";
+    string connfile = prefix + "connect.dat";
 
     //
     // Load node and element data

Modified: cs/cigma/trunk/tests/libcigma/MeshPartTest.cpp
===================================================================
--- cs/cigma/trunk/tests/libcigma/MeshPartTest.cpp	2008-12-10 02:13:25 UTC (rev 13529)
+++ cs/cigma/trunk/tests/libcigma/MeshPartTest.cpp	2008-12-10 02:13:26 UTC (rev 13530)
@@ -85,8 +85,8 @@
 void MeshPartTest::test_text_reader()
 {
     MeshInfo mesh_info;
-    mesh_info.p_nc = DataPath("tests/data/brick1/brick1_coords.dat");
-    mesh_info.p_eb = DataPath("tests/data/brick1/brick1_connect.dat");
+    mesh_info.p_nc = DataPath("tests/data/brick1/coords.dat");
+    mesh_info.p_eb = DataPath("tests/data/brick1/connect.dat");
     mesh_info.use_locator = false;
     mesh_info.cell_type_name = "hex8";
     shared_ptr<MeshPart> mesh = ReadMeshPart(mesh_info);

Modified: cs/cigma/trunk/tests/libcigma/NodeCoordinatesTest.cpp
===================================================================
--- cs/cigma/trunk/tests/libcigma/NodeCoordinatesTest.cpp	2008-12-10 02:13:25 UTC (rev 13529)
+++ cs/cigma/trunk/tests/libcigma/NodeCoordinatesTest.cpp	2008-12-10 02:13:26 UTC (rev 13530)
@@ -69,7 +69,7 @@
 
 void NodeCoordinatesTest::test_text_reader()
 {
-    DataPath nc_path("tests/data/brick1/brick1_coords.dat");
+    DataPath nc_path("tests/data/brick1/coords.dat");
     shared_ptr<NodeCoordinates> nc = ReadNodeCoordinates(nc_path);
 
     CPPUNIT_ASSERT(nc);

Modified: cs/cigma/trunk/tests/libcigma/ReaderTest.cpp
===================================================================
--- cs/cigma/trunk/tests/libcigma/ReaderTest.cpp	2008-12-10 02:13:25 UTC (rev 13529)
+++ cs/cigma/trunk/tests/libcigma/ReaderTest.cpp	2008-12-10 02:13:26 UTC (rev 13530)
@@ -15,7 +15,7 @@
 {
     shared_ptr<FileReader> reader;
 
-    reader = FileReader::New("tests/data/brick1/brick1_connect.dat", "r");
+    reader = FileReader::New("tests/data/brick1/connect.dat", "r");
     CPPUNIT_ASSERT_EQUAL(FileReader::TEXT_FILE_READER, reader->getReaderType());
 
     //reader = FileReader::New("tests/data/brick1/brick1.h5", "r");
@@ -38,7 +38,7 @@
     TextReader reader;
     CPPUNIT_ASSERT_EQUAL(FileReader::TEXT_FILE_READER, reader.getReaderType());
 
-    status = reader.open("tests/data/brick1/brick1_connect.dat");
+    status = reader.open("tests/data/brick1/connect.dat");
     CPPUNIT_ASSERT_EQUAL(0, status);
 
     int nel,ndofs;

Modified: cs/cigma/trunk/tests/libcigma/ResidualsTest.cpp
===================================================================
--- cs/cigma/trunk/tests/libcigma/ResidualsTest.cpp	2008-12-10 02:13:25 UTC (rev 13529)
+++ cs/cigma/trunk/tests/libcigma/ResidualsTest.cpp	2008-12-10 02:13:26 UTC (rev 13530)
@@ -23,10 +23,10 @@
     shared_ptr<eb_array> eb(new eb_array);
     shared_ptr<MeshPart> mesh(new MeshPart);
 
-    nc_reader = FileReader::New("tests/data/brick1/brick1_coords.dat", "r");
+    nc_reader = FileReader::New("tests/data/brick1/coords.dat", "r");
     nc_reader->getCoordinates("", &(nc->coords), &(nc->nno), &(nc->nsd));
 
-    eb_reader = FileReader::New("tests/data/brick1/brick1_connect.dat", "r");
+    eb_reader = FileReader::New("tests/data/brick1/connect.dat", "r");
     eb_reader->getConnectivity("", &(eb->connect), &(eb->nel), &(eb->ndofs));
 
     mesh->setCellType(Cell::HEX8);