Re #9556 Enabling some unit tests

mantidproject · Jan 30, 2015 · f4d713c · f4d713c
1 parent 2383727
commit f4d713c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Code/Mantid/Framework/CurveFitting/CMakeLists.txt b/Code/Mantid/Framework/CurveFitting/CMakeLists.txt
@@ -239,6 +239,7 @@ set ( TEST_FILES
 	DeltaFunctionTest.h
 	DiffRotDiscreteCircleTest.h
 	DiffSphereTest.h
+	DynamicKuboToyabeTest.h
 	EndErfcTest.h
 	ExpDecayMuonTest.h
 	ExpDecayOscTest.h

diff --git a/Code/Mantid/Framework/CurveFitting/test/DynamicKuboToyabeTest.h b/Code/Mantid/Framework/CurveFitting/test/DynamicKuboToyabeTest.h
@@ -43,8 +43,8 @@ class DynamicKuboToyabeTest : public CxxTest::TestSuite
     Mantid::API::FunctionValues y1(x);
     Mantid::API::FunctionValues y2(x);
 
-    dkt.function(x,y1);
-    skt.function(x,y2);
+    TS_ASSERT_THROWS_NOTHING(dkt.function(x,y1));
+    TS_ASSERT_THROWS_NOTHING(skt.function(x,y2));
 
     for(size_t i = 0; i < x.size(); ++i)
     {
@@ -71,7 +71,7 @@ class DynamicKuboToyabeTest : public CxxTest::TestSuite
     Mantid::API::FunctionDomain1DVector x(0,5,5);
     Mantid::API::FunctionValues y(x);
 
-    dkt.function(x,y);
+    TS_ASSERT_THROWS_NOTHING(dkt.function(x,y));
 
     TS_ASSERT_DELTA( y[0], 1.000000, 0.000001);
     TS_ASSERT_DELTA( y[1], 0.849898, 0.000001);
@@ -80,7 +80,7 @@ class DynamicKuboToyabeTest : public CxxTest::TestSuite
     TS_ASSERT_DELTA( y[4], 0.317374, 0.000001);
   }
 
-  void testDKTFunction()
+  void xtestDKTFunction()
   {
     // Test Dynamic Kubo Toyabe (DKT) (non-zero Field, non-zero Nu)
     const double asym = 1.0;
@@ -99,7 +99,7 @@ class DynamicKuboToyabeTest : public CxxTest::TestSuite
     Mantid::API::FunctionDomain1DVector x(0,5,5);
     Mantid::API::FunctionValues y(x);
 
-    dkt.function(x,y);
+    TS_ASSERT_THROWS_NOTHING(dkt.function(x,y));
 
     TS_ASSERT_DELTA( y[0], 1.000000, 0.000001);
     TS_ASSERT_DELTA( y[1], 0.816422, 0.000001);