re #4289 sorted out unit test of the categories

mantidproject · Dec 9, 2011 · 2f6f0e6 · 2f6f0e6
1 parent a6e6e6d
commit 2f6f0e6
Show file tree

Hide file tree

Showing 51 changed files with 1 addition and 190 deletions.
diff --git a/Code/Mantid/Framework/Algorithms/test/AnyShapeAbsorptionTest.h b/Code/Mantid/Framework/Algorithms/test/AnyShapeAbsorptionTest.h
@@ -24,11 +24,6 @@ class AnyShapeAbsorptionTest : public CxxTest::TestSuite
     TS_ASSERT_EQUALS( atten.version(), 1 );
   }
 
-  void testCategory()
-  {
-    TS_ASSERT_EQUALS( atten.category(), "Absorption Corrections" );
-  }
-
   void testInit()
   {
     TS_ASSERT_THROWS_NOTHING( atten.initialize() );

diff --git a/Code/Mantid/Framework/Algorithms/test/ApplyTransmissionCorrectionTest.h b/Code/Mantid/Framework/Algorithms/test/ApplyTransmissionCorrectionTest.h
@@ -22,7 +22,6 @@ class ApplyTransmissionCorrectionTest : public CxxTest::TestSuite
 
     TS_ASSERT_EQUALS( correction.name(), "ApplyTransmissionCorrection" );
     TS_ASSERT_EQUALS( correction.version(), 1 );
-    TS_ASSERT_EQUALS( correction.category(), "SANS" );
     TS_ASSERT_THROWS_NOTHING( correction.initialize() );
     TS_ASSERT( correction.isInitialized() );
   }

diff --git a/Code/Mantid/Framework/Algorithms/test/CalculateEfficiencyTest.h b/Code/Mantid/Framework/Algorithms/test/CalculateEfficiencyTest.h
@@ -60,11 +60,6 @@ class CalculateEfficiencyTest : public CxxTest::TestSuite
     TS_ASSERT_EQUALS( correction.version(), 1 )
   }
 
-  void testCategory()
-  {
-    TS_ASSERT_EQUALS( correction.category(), "SANS" )
-  }
-
   void testInit()
   {
     TS_ASSERT_THROWS_NOTHING( correction.initialize() )

diff --git a/Code/Mantid/Framework/Algorithms/test/CalculateTransmissionBeamSpreaderTest.h b/Code/Mantid/Framework/Algorithms/test/CalculateTransmissionBeamSpreaderTest.h
@@ -27,11 +27,6 @@ class CalculateTransmissionBeamSpreaderTest : public CxxTest::TestSuite
     TS_ASSERT_EQUALS( trans.version(), 1 )
   }
 
-  void testCategory()
-  {
-    TS_ASSERT_EQUALS( trans.category(), "SANS" )
-  }
-
   void testInit()
   {
     TS_ASSERT_THROWS_NOTHING( trans.initialize() )

diff --git a/Code/Mantid/Framework/Algorithms/test/CalculateTransmissionTest.h b/Code/Mantid/Framework/Algorithms/test/CalculateTransmissionTest.h
@@ -32,7 +32,6 @@ class CalculateTransmissionTest : public CxxTest::TestSuite
 
     TS_ASSERT_EQUALS( trans.name(), "CalculateTransmission" );
     TS_ASSERT_EQUALS( trans.version(), 1 );
-    TS_ASSERT_EQUALS( trans.category(), "SANS" );
   }
 
   void testFittedUnfitted()

diff --git a/Code/Mantid/Framework/Algorithms/test/CheckWorkspacesMatchTest.h b/Code/Mantid/Framework/Algorithms/test/CheckWorkspacesMatchTest.h
@@ -38,11 +38,6 @@ class CheckWorkspacesMatchTest : public CxxTest::TestSuite
     TS_ASSERT_EQUALS( checker.version(), 1 );
   }
 
-  void testCategory()
-  {
-    TS_ASSERT_EQUALS( checker.category(), "General" );
-  }
-
   void testInit()
   {
     TS_ASSERT_THROWS_NOTHING( checker.initialize() );

diff --git a/Code/Mantid/Framework/Algorithms/test/ChopDataTest.h b/Code/Mantid/Framework/Algorithms/test/ChopDataTest.h
@@ -18,7 +18,6 @@ class ChopDataTest : public CxxTest::TestSuite
     alg = new ChopData();
     TS_ASSERT_EQUALS(alg->name(), "ChopData");
     TS_ASSERT_EQUALS(alg->version(), 1);
-    TS_ASSERT_EQUALS(alg->category(), "General");
     delete alg;
   }
 

diff --git a/Code/Mantid/Framework/Algorithms/test/ConjoinWorkspacesTest.h b/Code/Mantid/Framework/Algorithms/test/ConjoinWorkspacesTest.h
@@ -73,7 +73,6 @@ class ConjoinWorkspacesTest : public CxxTest::TestSuite
     conj = new ConjoinWorkspaces();
     TS_ASSERT_EQUALS( conj->name(), "ConjoinWorkspaces" );
     TS_ASSERT_EQUALS( conj->version(), 1 );
-    TS_ASSERT_EQUALS( conj->category(), "General" );
     delete conj;
   }
 

diff --git a/Code/Mantid/Framework/Algorithms/test/ConvertFromDistributionTest.h b/Code/Mantid/Framework/Algorithms/test/ConvertFromDistributionTest.h
@@ -33,11 +33,6 @@ class ConvertFromDistributionTest : public CxxTest::TestSuite
     TS_ASSERT_EQUALS( conv.version(), 1 )
 	}
 
-	void testCategory()
-	{
-    TS_ASSERT_EQUALS( conv.category(), "General" )
-	}
-
   void testInit()
   {
     TS_ASSERT_THROWS_NOTHING( conv.initialize() )

diff --git a/Code/Mantid/Framework/Algorithms/test/ConvertSpectrumAxisTest.h b/Code/Mantid/Framework/Algorithms/test/ConvertSpectrumAxisTest.h
@@ -22,11 +22,6 @@ class ConvertSpectrumAxisTest : public CxxTest::TestSuite
     TS_ASSERT_EQUALS( conv.version(), 1 );
 	}
 
-	void testCategory()
-	{
-    TS_ASSERT_EQUALS( conv.category(), "Units" );
-	}
-
   void testInit()
   {
     TS_ASSERT_THROWS_NOTHING( conv.initialize() );

diff --git a/Code/Mantid/Framework/Algorithms/test/ConvertToMatrixWorkspaceTest.h b/Code/Mantid/Framework/Algorithms/test/ConvertToMatrixWorkspaceTest.h
@@ -30,11 +30,6 @@ class ConvertToMatrixWorkspaceTest : public CxxTest::TestSuite
     TS_ASSERT_EQUALS( cloner.version(), 1 )
   }
 
-  void testCategory()
-  {
-    TS_ASSERT_EQUALS( cloner.category(), "General" )
-  }
-
   void testInit()
   {
     TS_ASSERT_THROWS_NOTHING( cloner.initialize() )

diff --git a/Code/Mantid/Framework/Algorithms/test/CropWorkspaceTest.h b/Code/Mantid/Framework/Algorithms/test/CropWorkspaceTest.h
@@ -66,11 +66,6 @@ class CropWorkspaceTest : public CxxTest::TestSuite
     TS_ASSERT_EQUALS( crop.version(), 1 );
   }
 
-  void testCategory()
-  {
-    TS_ASSERT_EQUALS( crop.category(), "General" );
-  }
-
   void testInit()
   {
     TS_ASSERT_THROWS_NOTHING( crop.initialize() );

diff --git a/Code/Mantid/Framework/Algorithms/test/CuboidGaugeVolumeAbsorptionTest.h b/Code/Mantid/Framework/Algorithms/test/CuboidGaugeVolumeAbsorptionTest.h
@@ -19,7 +19,6 @@ class CuboidGaugeVolumeAbsorptionTest : public CxxTest::TestSuite
   {
     TS_ASSERT_EQUALS( atten.name(), "CuboidGaugeVolumeAbsorption" );
     TS_ASSERT_EQUALS( atten.version(), 1 );
-    TS_ASSERT_EQUALS( atten.category(), "Absorption Corrections" );
   }
 
   void testInit()

diff --git a/Code/Mantid/Framework/Algorithms/test/CylinderAbsorptionTest.h b/Code/Mantid/Framework/Algorithms/test/CylinderAbsorptionTest.h
@@ -22,11 +22,6 @@ class CylinderAbsorptionTest : public CxxTest::TestSuite
     TS_ASSERT_EQUALS( atten.version(), 1 );
   }
 
-  void testCategory()
-  {
-    TS_ASSERT_EQUALS( atten.category(), "Absorption Corrections" );
-  }
-
   void testInit()
   {
     TS_ASSERT_THROWS_NOTHING( atten.initialize() );

diff --git a/Code/Mantid/Framework/Algorithms/test/DetectorEfficiencyCorTest.h b/Code/Mantid/Framework/Algorithms/test/DetectorEfficiencyCorTest.h
@@ -55,7 +55,6 @@ class DetectorEfficiencyCorTest : public CxxTest::TestSuite
     DetectorEfficiencyCor grouper;
     TS_ASSERT_EQUALS( grouper.name(), "DetectorEfficiencyCor" );
     TS_ASSERT_EQUALS( grouper.version(), 1 );
-    TS_ASSERT_EQUALS( grouper.category(), "CorrectionFunctions" );
     TS_ASSERT_THROWS_NOTHING( grouper.initialize() );
     TS_ASSERT( grouper.isInitialized() );
   }

diff --git a/Code/Mantid/Framework/Algorithms/test/ExtractFFTSpectrumTest.h b/Code/Mantid/Framework/Algorithms/test/ExtractFFTSpectrumTest.h
@@ -22,7 +22,6 @@ class ExtractFFTSpectrumTest : public CxxTest::TestSuite
     ExtractFFTSpectrum alg;
     TS_ASSERT_EQUALS(alg.name(), "ExtractFFTSpectrum");
     TS_ASSERT_EQUALS(alg.version(), 1);
-    TS_ASSERT_EQUALS(alg.category(), "General");
   }
 
   void testInit()

diff --git a/Code/Mantid/Framework/Algorithms/test/ExtractSingleSpectrumTest.h b/Code/Mantid/Framework/Algorithms/test/ExtractSingleSpectrumTest.h
@@ -22,12 +22,6 @@ class ExtractSingleSpectrumTest : public CxxTest::TestSuite
     TS_ASSERT_EQUALS( versionTester->version(), 1 );
   }
 
-  void testCategory()
-  {
-    IAlgorithm *catTester = createExtractSingleSpectrum();
-    TS_ASSERT_EQUALS( catTester->category(), "General" );
-  }
-
   void testInit()
   {
     IAlgorithm *initTester = createExtractSingleSpectrum();

diff --git a/Code/Mantid/Framework/Algorithms/test/FFTSmooth2Test.h b/Code/Mantid/Framework/Algorithms/test/FFTSmooth2Test.h
@@ -26,11 +26,6 @@ class FFTSmooth2Test : public CxxTest::TestSuite
     TS_ASSERT_EQUALS( fftsmooth2.version(), 2 )
   }
 
-  void testCategory()
-  {
-    TS_ASSERT_EQUALS( fftsmooth2.category(), "General" )
-  }
-
   void testInit()
   {
     Mantid::Algorithms::FFTSmooth2   fftsmooth2_b;

diff --git a/Code/Mantid/Framework/Algorithms/test/FindPeaksTest.h b/Code/Mantid/Framework/Algorithms/test/FindPeaksTest.h
@@ -19,7 +19,6 @@ class FindPeaksTest : public CxxTest::TestSuite
     FindPeaks finder;
     TS_ASSERT_EQUALS( finder.name(), "FindPeaks" );
     TS_ASSERT_EQUALS( finder.version(), 1 );
-    TS_ASSERT_EQUALS( finder.category(), "General" );
   }
 
   void testInit()

diff --git a/Code/Mantid/Framework/Algorithms/test/FlatBackgroundTest.h b/Code/Mantid/Framework/Algorithms/test/FlatBackgroundTest.h
@@ -65,7 +65,6 @@ class FlatBackgroundTest : public CxxTest::TestSuite
     Mantid::Algorithms::FlatBackground flatBG;
     TS_ASSERT_EQUALS( flatBG.name(), "FlatBackground" )
     TS_ASSERT_EQUALS( flatBG.version(), 1 )
-    TS_ASSERT_EQUALS( flatBG.category(), "SANS" )
   }
 
   void testExec()

diff --git a/Code/Mantid/Framework/Algorithms/test/FlatPlateAbsorptionTest.h b/Code/Mantid/Framework/Algorithms/test/FlatPlateAbsorptionTest.h
@@ -21,12 +21,7 @@ class FlatPlateAbsorptionTest : public CxxTest::TestSuite
   {
     TS_ASSERT_EQUALS( atten.version(), 1 );
   }
-
-  void testCategory()
-  {
-    TS_ASSERT_EQUALS( atten.category(), "Absorption Corrections" );
-  }
-
+
   void testInit()
   {
     TS_ASSERT_THROWS_NOTHING( atten.initialize() );

diff --git a/Code/Mantid/Framework/Algorithms/test/GroupWorkspacesTest.h b/Code/Mantid/Framework/Algorithms/test/GroupWorkspacesTest.h
@@ -29,12 +29,6 @@ class GroupWorkspacesTest : public CxxTest::TestSuite
 		TS_ASSERT_EQUALS( grpwsalg.version(), 1 );
 	}
 
-	void testCategory()
-	{
-		GroupWorkspaces grpwsalg;
-		TS_ASSERT_EQUALS( grpwsalg.category(), "DataHandling" );
-	}
-
 	void testInit()
 	{
 		Mantid::Algorithms::GroupWorkspaces alg2;

diff --git a/Code/Mantid/Framework/Algorithms/test/MaskBinsTest.h b/Code/Mantid/Framework/Algorithms/test/MaskBinsTest.h
@@ -26,11 +26,6 @@ class MaskBinsTest : public CxxTest::TestSuite
   {
     TS_ASSERT_EQUALS( masker.version(), 1 );
   }
-
-  void testCategory()
-  {
-    TS_ASSERT_EQUALS( masker.category(), "General" );
-  }
 
   void testInit()
   {

diff --git a/Code/Mantid/Framework/Algorithms/test/MultipleScatteringCylinderAbsorptionTest.h b/Code/Mantid/Framework/Algorithms/test/MultipleScatteringCylinderAbsorptionTest.h
@@ -29,11 +29,6 @@ class MultipleScatteringCylinderAbsorptionTest : public CxxTest::TestSuite
     TS_ASSERT_EQUALS( algorithm.version(), 1 );
   }
 
-  void testCategory()
-  {
-    TS_ASSERT_EQUALS( algorithm.category(), "Absorption Corrections" );
-  }
-
   void testInit()
   {
     Mantid::Algorithms::MultipleScatteringCylinderAbsorption   algorithm_b;

diff --git a/Code/Mantid/Framework/Algorithms/test/NormaliseByCurrentTest.h b/Code/Mantid/Framework/Algorithms/test/NormaliseByCurrentTest.h
@@ -28,11 +28,6 @@ class NormaliseByCurrentTest : public CxxTest::TestSuite
     TS_ASSERT_EQUALS( norm.version(), 1 );
   }
 
-  void testCategory()
-  {
-    TS_ASSERT_EQUALS( norm.category(), "General" );
-  }
-
   void testInit()
   {
     TS_ASSERT_THROWS_NOTHING( norm.initialize() );

diff --git a/Code/Mantid/Framework/Algorithms/test/NormaliseToMonitorTest.h b/Code/Mantid/Framework/Algorithms/test/NormaliseToMonitorTest.h
@@ -80,11 +80,6 @@ class NormaliseToMonitorTest : public CxxTest::TestSuite
     TS_ASSERT_EQUALS( norm.version(), 1 )
   }
 
-  void testCategory()
-  {
-    TS_ASSERT_EQUALS( norm.category(), "General" )
-  }
-
   void testInit()
   {
     TS_ASSERT_THROWS_NOTHING( norm.initialize() )

diff --git a/Code/Mantid/Framework/Algorithms/test/PointByPointVCorrectionTest.h b/Code/Mantid/Framework/Algorithms/test/PointByPointVCorrectionTest.h
@@ -18,11 +18,6 @@ class PointByPointVCorrectionTest : public CxxTest::TestSuite
   {
     TS_ASSERT_EQUALS( pbpv.version(), 1 );
   }
-
-  void testCategory()
-  {
-    TS_ASSERT_EQUALS( pbpv.category(), "Diffraction" );
-  }
 
   void testInit()
   {

diff --git a/Code/Mantid/Framework/Algorithms/test/RemoveBinsTest.h b/Code/Mantid/Framework/Algorithms/test/RemoveBinsTest.h
@@ -27,11 +27,6 @@ class RemoveBinsTest : public CxxTest::TestSuite
 		TS_ASSERT_EQUALS( alg.name(), "RemoveBins" )
 	}
 
-	void testCategory()
-	{
-	TS_ASSERT_EQUALS( alg.category(), "General" )
-	}
-
 	void testInit()
 	{
 		alg.initialize();

diff --git a/Code/Mantid/Framework/Algorithms/test/RenameWorkspaceTest.h b/Code/Mantid/Framework/Algorithms/test/RenameWorkspaceTest.h
@@ -23,11 +23,6 @@ class RenameWorkspaceTest : public CxxTest::TestSuite
 		TS_ASSERT_EQUALS( alg.version(), 1 );
 	}
 
-	void testCategory()
-	{
-		TS_ASSERT_EQUALS( alg.category(), "DataHandling" );
-	}
-
 	void testInit()
 	{
 		Mantid::Algorithms::RenameWorkspace alg2;

diff --git a/Code/Mantid/Framework/Algorithms/test/ReplaceSpecialValuesTest.h b/Code/Mantid/Framework/Algorithms/test/ReplaceSpecialValuesTest.h
@@ -26,11 +26,6 @@ class ReplaceSpecialValuesTest : public CxxTest::TestSuite
     TS_ASSERT_EQUALS( alg.version(), 1 );
   }
 
-  void testCategory()
-  {
-    TS_ASSERT_EQUALS( alg.category(), "General" );
-  }
-
   void testInit()
   {
     Mantid::Algorithms::ReplaceSpecialValues alg2;

diff --git a/Code/Mantid/Framework/Algorithms/test/ScaleTest.h b/Code/Mantid/Framework/Algorithms/test/ScaleTest.h
@@ -20,11 +20,6 @@ class ScaleTest : public CxxTest::TestSuite
     TS_ASSERT_EQUALS( scale.version(), 1 )
   }
 
-  void testCategory()
-  {
-    TS_ASSERT_EQUALS( scale.category(), "Arithmetic" )
-  }
-
   void testInit()
   {
     TS_ASSERT_THROWS_NOTHING( scale.initialize() )

diff --git a/Code/Mantid/Framework/Algorithms/test/ScaleXTest.h b/Code/Mantid/Framework/Algorithms/test/ScaleXTest.h
@@ -20,11 +20,6 @@ class ScaleXTest : public CxxTest::TestSuite
     TS_ASSERT_EQUALS( scale.version(), 1 )
   }
 
-  void testCategory()
-  {
-    TS_ASSERT_EQUALS( scale.category(), "Arithmetic" )
-  }
-
   void testInit()
   {
     TS_ASSERT_THROWS_NOTHING( scale.initialize() )

diff --git a/Code/Mantid/Framework/Algorithms/test/SmoothDataTest.h b/Code/Mantid/Framework/Algorithms/test/SmoothDataTest.h
@@ -38,11 +38,6 @@ class SmoothDataTest : public CxxTest::TestSuite
     TS_ASSERT_EQUALS( smooth.version(), 1 );
   }
 
-  void testCategory()
-  {
-    TS_ASSERT_EQUALS( smooth.category(), "General" );
-  }
-
   void testInit()
   {
     TS_ASSERT_THROWS_NOTHING( smooth.initialize() );

diff --git a/Code/Mantid/Framework/Algorithms/test/SpatialGroupingTest.h b/Code/Mantid/Framework/Algorithms/test/SpatialGroupingTest.h
@@ -23,7 +23,6 @@ class SpatialGroupingTest : public CxxTest::TestSuite
     alg = new Mantid::Algorithms::SpatialGrouping();
     TS_ASSERT_EQUALS(alg->name(), "SpatialGrouping");
     TS_ASSERT_EQUALS(alg->version(), 1);
-    TS_ASSERT_EQUALS(alg->category(), "General");
     delete alg;
   }
 

diff --git a/Code/Mantid/Framework/Algorithms/test/SphericalAbsorptionTest.h b/Code/Mantid/Framework/Algorithms/test/SphericalAbsorptionTest.h
@@ -28,12 +28,6 @@ class SphericalAbsorptionTest : public CxxTest::TestSuite
     TS_ASSERT_EQUALS( atten->version(), 1 );
   }
 
-  void testCategory()
-  {
-    IAlgorithm* atten = Mantid::API::FrameworkManager::Instance().createAlgorithm("SphericalAbsorption");
-    TS_ASSERT_EQUALS( atten->category(), "Absorption Corrections" );
-  }
-
   void testInit()
   {
     IAlgorithm* atten = Mantid::API::FrameworkManager::Instance().createAlgorithm("SphericalAbsorption");

diff --git a/Code/Mantid/Framework/Algorithms/test/StripPeaksTest.h b/Code/Mantid/Framework/Algorithms/test/StripPeaksTest.h
@@ -46,7 +46,6 @@ class StripPeaksTest : public CxxTest::TestSuite
   {
     TS_ASSERT_EQUALS( strip.name(), "StripPeaks" );
     TS_ASSERT_EQUALS( strip.version(), 1 );
-    TS_ASSERT_EQUALS( strip.category(), "General" );
   }
 
   void testInit()