AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

Updated new volumes test.

Browse Source
This commit is contained in:
David Williams 2012-12-02 14:02:50 +01:00
parent 597b28d271
commit c37997bfe2
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/CMakeLists.txt
View File

@ -73,10 +73,6 @@ ADD_TEST(CubicSurfaceExtractorExecuteTest ${LATEST_TEST} testExecute)
CREATE_TEST(TestLowPassFilter.h TestLowPassFilter.cpp TestLowPassFilter) CREATE_TEST(TestLowPassFilter.h TestLowPassFilter.cpp TestLowPassFilter)
ADD_TEST(LowPassFilterExecuteTest ${LATEST_TEST} testExecute) ADD_TEST(LowPassFilterExecuteTest ${LATEST_TEST} testExecute)
# LargeVolume tests
CREATE_TEST(testvolume.h testvolume.cpp testvolume)
ADD_TEST(VolumeSizeTest ${LATEST_TEST} testSize)
# Material tests # Material tests
CREATE_TEST(testmaterial.h testmaterial.cpp testmaterial) CREATE_TEST(testmaterial.h testmaterial.cpp testmaterial)
ADD_TEST(MaterialTestCompile ${LATEST_TEST} testCompile) ADD_TEST(MaterialTestCompile ${LATEST_TEST} testCompile)
@ -98,6 +94,12 @@ ADD_TEST(VectorLengthTest ${LATEST_TEST} testLength)
ADD_TEST(VectorDotProductTest ${LATEST_TEST} testDotProduct) ADD_TEST(VectorDotProductTest ${LATEST_TEST} testDotProduct)
ADD_TEST(VectorEqualityTest ${LATEST_TEST} testEquality) ADD_TEST(VectorEqualityTest ${LATEST_TEST} testEquality)
# Volume tests
CREATE_TEST(testvolume.h testvolume.cpp testvolume)
ADD_TEST(LargeVolumeTest ${LATEST_TEST} testLargeVolume)
ADD_TEST(RawVolumeTest ${LATEST_TEST} testRawVolume)
ADD_TEST(SimpleVolumeTest ${LATEST_TEST} testSimpleVolume)
# Volume subclass tests # Volume subclass tests
CREATE_TEST(TestVolumeSubclass.h TestVolumeSubclass.cpp TestVolumeSubclass) CREATE_TEST(TestVolumeSubclass.h TestVolumeSubclass.cpp TestVolumeSubclass)
ADD_TEST(VolumeSubclassExtractSurfaceTest ${LATEST_TEST} testExtractSurface) ADD_TEST(VolumeSubclassExtractSurfaceTest ${LATEST_TEST} testExtractSurface)

6
tests/testvolume.cpp
View File

@ -50,19 +50,19 @@ int32_t complexVolumeTest(void)
return testVolume.getVoxelAt(10,20,30); return testVolume.getVoxelAt(10,20,30);
} }
void TestVolume::testLarge() void TestVolume::testLargeVolume()
{ {
int32_t result = complexVolumeTest< LargeVolume<int32_t> >(); int32_t result = complexVolumeTest< LargeVolume<int32_t> >();
QCOMPARE(result, static_cast<int32_t>(60)); QCOMPARE(result, static_cast<int32_t>(60));
} }
void TestVolume::testRaw() void TestVolume::testRawVolume()
{ {
int32_t result = complexVolumeTest< RawVolume<int32_t> >(); int32_t result = complexVolumeTest< RawVolume<int32_t> >();
QCOMPARE(result, static_cast<int32_t>(60)); QCOMPARE(result, static_cast<int32_t>(60));
} }
void TestVolume::testSimple() void TestVolume::testSimpleVolume()
{ {
int32_t result = complexVolumeTest< SimpleVolume<int32_t> >(); int32_t result = complexVolumeTest< SimpleVolume<int32_t> >();
QCOMPARE(result, static_cast<int32_t>(60)); QCOMPARE(result, static_cast<int32_t>(60));

6
tests/testvolume.h
View File

@ -31,9 +31,9 @@ class TestVolume: public QObject
Q_OBJECT Q_OBJECT
private slots: private slots:
void testLarge(); void testLargeVolume();
void testRaw(); void testRawVolume();
void testSimple(); void testSimpleVolume();
}; };
#endif #endif