Browse Source

Code simplification in plugin tests.

Somehow slipped through ages ago.
pull/193/head
Vladimír Vondruš 9 years ago
parent
commit
ee3afc1bbc
  1. 11
      src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp
  2. 7
      src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp
  3. 105
      src/MagnumPlugins/ObjImporter/Test/Test.cpp
  4. 13
      src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp
  5. 25
      src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp
  6. 75
      src/MagnumPlugins/WavAudioImporter/Test/WavImporterTest.cpp

11
src/MagnumPlugins/MagnumFont/Test/MagnumFontGLTest.cpp

@ -33,13 +33,12 @@
namespace Magnum { namespace Text { namespace Test { namespace Magnum { namespace Text { namespace Test {
class MagnumFontGLTest: public OpenGLTester { struct MagnumFontGLTest: OpenGLTester {
public: explicit MagnumFontGLTest();
explicit MagnumFontGLTest();
void properties(); void properties();
void layout(); void layout();
void createGlyphCache(); void createGlyphCache();
}; };
MagnumFontGLTest::MagnumFontGLTest() { MagnumFontGLTest::MagnumFontGLTest() {

7
src/MagnumPlugins/MagnumFontConverter/Test/MagnumFontConverterGLTest.cpp

@ -42,11 +42,10 @@
namespace Magnum { namespace Text { namespace Test { namespace Magnum { namespace Text { namespace Test {
class MagnumFontConverterGLTest: public OpenGLTester { struct MagnumFontConverterGLTest: OpenGLTester {
public: explicit MagnumFontConverterGLTest();
explicit MagnumFontConverterGLTest();
void exportFont(); void exportFont();
}; };
MagnumFontConverterGLTest::MagnumFontConverterGLTest() { MagnumFontConverterGLTest::MagnumFontConverterGLTest() {

105
src/MagnumPlugins/ObjImporter/Test/Test.cpp

@ -36,59 +36,58 @@
namespace Magnum { namespace Trade { namespace Test { namespace Magnum { namespace Trade { namespace Test {
class ObjImporterTest: public TestSuite::Tester { struct ObjImporterTest: TestSuite::Tester {
public: explicit ObjImporterTest();
explicit ObjImporterTest();
void pointMesh();
void pointMesh(); void lineMesh();
void lineMesh(); void triangleMesh();
void triangleMesh(); void mixedPrimitives();
void mixedPrimitives();
void positionsOnly();
void positionsOnly(); void textureCoordinates();
void textureCoordinates(); void normals();
void normals(); void textureCoordinatesNormals();
void textureCoordinatesNormals();
void emptyFile();
void emptyFile(); void unnamedMesh();
void unnamedMesh(); void namedMesh();
void namedMesh(); void moreMeshes();
void moreMeshes(); void unnamedFirstMesh();
void unnamedFirstMesh();
void wrongFloat();
void wrongFloat(); void wrongInteger();
void wrongInteger(); void unmergedIndexOutOfRange();
void unmergedIndexOutOfRange(); void mergedIndexOutOfRange();
void mergedIndexOutOfRange(); void zeroIndex();
void zeroIndex();
void explicitOptionalPositionCoordinate();
void explicitOptionalPositionCoordinate(); void explicitOptionalTextureCoordinate();
void explicitOptionalTextureCoordinate(); void unsupportedOptionalPositionCoordinate();
void unsupportedOptionalPositionCoordinate(); void unsupportedOptionalTextureCoordinate();
void unsupportedOptionalTextureCoordinate();
void shortFloatData();
void shortFloatData(); void longFloatData();
void longFloatData(); void longOptionalFloatData();
void longOptionalFloatData();
void longIndexData();
void longIndexData(); void wrongPointIndexData();
void wrongPointIndexData(); void wrongLineIndexData();
void wrongLineIndexData(); void wrongTriangleIndexData();
void wrongTriangleIndexData(); void polygonIndexData();
void polygonIndexData();
void missingPositionData();
void missingPositionData(); void missingNormalData();
void missingNormalData(); void missingTextureCoordinateData();
void missingTextureCoordinateData(); void missingPositionIndices();
void missingPositionIndices(); void missingNormalIndices();
void missingNormalIndices(); void missingTextureCoordinateIndices();
void missingTextureCoordinateIndices();
void wrongTextureCoordinateIndexCount();
void wrongTextureCoordinateIndexCount(); void wrongNormalIndexCount();
void wrongNormalIndexCount();
void unsupportedKeyword();
void unsupportedKeyword(); void unknownKeyword();
void unknownKeyword();
}; };
ObjImporterTest::ObjImporterTest() { ObjImporterTest::ObjImporterTest() {

13
src/MagnumPlugins/TgaImageConverter/Test/TgaImageConverterTest.cpp

@ -38,15 +38,14 @@
namespace Magnum { namespace Trade { namespace Test { namespace Magnum { namespace Trade { namespace Test {
class TgaImageConverterTest: public TestSuite::Tester { struct TgaImageConverterTest: TestSuite::Tester {
public: explicit TgaImageConverterTest();
explicit TgaImageConverterTest();
void wrongFormat(); void wrongFormat();
void wrongType(); void wrongType();
void rgb(); void rgb();
void rgba(); void rgba();
}; };
namespace { namespace {

25
src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp

@ -37,23 +37,22 @@
namespace Magnum { namespace Trade { namespace Test { namespace Magnum { namespace Trade { namespace Test {
class TgaImporterTest: public TestSuite::Tester { struct TgaImporterTest: TestSuite::Tester {
public: explicit TgaImporterTest();
TgaImporterTest();
void openNonexistent(); void openNonexistent();
void openShort(); void openShort();
void paletted(); void paletted();
void compressed(); void compressed();
void colorBits16(); void colorBits16();
void colorBits24(); void colorBits24();
void colorBits32(); void colorBits32();
void grayscaleBits8(); void grayscaleBits8();
void grayscaleBits16(); void grayscaleBits16();
void useTwice(); void useTwice();
}; };
TgaImporterTest::TgaImporterTest() { TgaImporterTest::TgaImporterTest() {

75
src/MagnumPlugins/WavAudioImporter/Test/WavImporterTest.cpp

@ -37,44 +37,43 @@
namespace Magnum { namespace Audio { namespace Test { namespace Magnum { namespace Audio { namespace Test {
class WavImporterTest: public TestSuite::Tester { struct WavImporterTest: TestSuite::Tester {
public: explicit WavImporterTest();
explicit WavImporterTest();
void wrongSize();
void wrongSize(); void wrongSignature();
void wrongSignature(); void unsupportedFormat();
void unsupportedFormat(); void unsupportedChannelCount();
void unsupportedChannelCount();
void invalidPadding();
void invalidPadding(); void invalidLength();
void invalidLength(); void invalidDataChunk();
void invalidDataChunk(); void invalidFactChunk();
void invalidFactChunk();
void mono4();
void mono4(); void mono8();
void mono8(); void mono8junk();
void mono8junk(); void mono8ALaw();
void mono8ALaw(); void mono8MuLaw();
void mono8MuLaw(); void mono16();
void mono16();
void stereo4();
void stereo4(); void stereo8();
void stereo8(); void stereo8ALaw();
void stereo8ALaw(); void stereo8MuLaw();
void stereo8MuLaw(); void stereo12();
void stereo12(); void stereo16();
void stereo16(); void stereo24();
void stereo24(); void stereo32();
void stereo32();
void mono32f();
void mono32f(); void stereo32f();
void stereo32f(); void stereo64f();
void stereo64f();
void surround51Channel16();
void surround51Channel16(); void surround71Channel24();
void surround71Channel24();
void debugAudioFormat();
void debugAudioFormat();
}; };
WavImporterTest::WavImporterTest() { WavImporterTest::WavImporterTest() {

Loading…
Cancel
Save