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

[luis at geodynamics.org]

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

Modified:
   cs/cigma/trunk/tests/libcigma/FE_Test.cpp
   cs/cigma/trunk/tests/libcigma/FieldTest.cpp
   cs/cigma/trunk/tests/libcigma/FunctionTest.cpp
   cs/cigma/trunk/tests/libcigma/MeshPartTest.cpp
   cs/cigma/trunk/tests/libcigma/QuadratureTest.cpp
Log:
Changed unit tests to use the appropriate factory methods

Modified: cs/cigma/trunk/tests/libcigma/FE_Test.cpp
===================================================================
--- cs/cigma/trunk/tests/libcigma/FE_Test.cpp	2008-12-10 02:13:54 UTC (rev 13545)
+++ cs/cigma/trunk/tests/libcigma/FE_Test.cpp	2008-12-10 02:13:56 UTC (rev 13546)
@@ -18,7 +18,8 @@
     FE_Info fe_info;
     fe_info.q_info.p_quadrature = DataPath("tests/data/qr/hex8_qr3.dat");
     fe_info.q_info.cell_type_name = "hex8";
-    shared_ptr<FE> fe = ReadFE(fe_info);
+    //shared_ptr<FE> fe = ReadFE(fe_info);
+    shared_ptr<FE> fe = FE::New(fe_info);
 
     CPPUNIT_ASSERT(fe);
     CPPUNIT_ASSERT(fe->quadrature);

Modified: cs/cigma/trunk/tests/libcigma/FieldTest.cpp
===================================================================
--- cs/cigma/trunk/tests/libcigma/FieldTest.cpp	2008-12-10 02:13:54 UTC (rev 13545)
+++ cs/cigma/trunk/tests/libcigma/FieldTest.cpp	2008-12-10 02:13:56 UTC (rev 13546)
@@ -22,9 +22,10 @@
     field_info.fe_info.q_info.cell_type_name = "hex8";
     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.use_locator = false;
     field_info.mesh_info.cell_type_name = "hex8";
-    field_info.mesh_info.use_locator = false;
-    shared_ptr<Field> field = ReadField(field_info);
+    //shared_ptr<Field> field = ReadField(field_info);
+    shared_ptr<Field> field = Field::NewField(field_info);
     
     /*
     try {

Modified: cs/cigma/trunk/tests/libcigma/FunctionTest.cpp
===================================================================
--- cs/cigma/trunk/tests/libcigma/FunctionTest.cpp	2008-12-10 02:13:54 UTC (rev 13545)
+++ cs/cigma/trunk/tests/libcigma/FunctionTest.cpp	2008-12-10 02:13:56 UTC (rev 13546)
@@ -1,11 +1,18 @@
 #include "FunctionTest.h"
 using namespace libcigma;
 
+#include "Exception.h"
 #include "Function.h"
 #include "fn_zero.h"
+#include "fn_one.h"
 using namespace cigma;
+
+#include <boost/shared_ptr.hpp>
 using boost::shared_ptr;
 
+#include <iostream>
+using namespace std;
+
 const double delta = 1e-8;
 
 void FunctionTest::test_factory()
@@ -23,6 +30,18 @@
 
     shared_ptr<Function> asdf = Function::New("asdf");
     CPPUNIT_ASSERT(!asdf);
+
+    /*
+    try
+    {
+        shared_ptr<Function> asdf = Function::New("asdf");
+        CPPUNIT_ASSERT(!asdf);
+    }
+    catch (cigma::Exception& e)
+    {
+        cout << e.getName() << ": " << e.getMessage() << endl;
+    }
+    // */
 }
 
 void FunctionTest::test_zero()

Modified: cs/cigma/trunk/tests/libcigma/MeshPartTest.cpp
===================================================================
--- cs/cigma/trunk/tests/libcigma/MeshPartTest.cpp	2008-12-10 02:13:54 UTC (rev 13545)
+++ cs/cigma/trunk/tests/libcigma/MeshPartTest.cpp	2008-12-10 02:13:56 UTC (rev 13546)
@@ -89,7 +89,8 @@
     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);
+    //shared_ptr<MeshPart> mesh = ReadMeshPart(mesh_info);
+    shared_ptr<MeshPart> mesh = MeshPart::New(mesh_info);
 
     CPPUNIT_ASSERT(mesh);
     CPPUNIT_ASSERT(mesh->coords);

Modified: cs/cigma/trunk/tests/libcigma/QuadratureTest.cpp
===================================================================
--- cs/cigma/trunk/tests/libcigma/QuadratureTest.cpp	2008-12-10 02:13:54 UTC (rev 13545)
+++ cs/cigma/trunk/tests/libcigma/QuadratureTest.cpp	2008-12-10 02:13:56 UTC (rev 13546)
@@ -2,7 +2,7 @@
 using namespace libcigma;
 
 #include "Quadrature.h"
-#include "core_readers.h"
+//#include "core_readers.h"
 using namespace cigma;
 
 #include <boost/shared_ptr.hpp>
@@ -59,7 +59,8 @@
     QuadratureInfo q_info;
     q_info.p_quadrature = DataPath("tests/data/qr/hex8_qr3.dat");
     q_info.cell_type_name = "hex8";
-    shared_ptr<Quadrature> Q = ReadQuadrature(q_info);
+    //shared_ptr<Quadrature> Q = ReadQuadrature(q_info);
+    shared_ptr<Quadrature> Q = Quadrature::New(q_info);
 
     CPPUNIT_ASSERT(Q);
     CPPUNIT_ASSERT_EQUAL(8, Q->n_points());