also remove transparency tests

This commit is contained in:
Juergen E. Fischer 2013-04-08 22:46:16 +02:00
parent 6b2af9a209
commit c9c3aa03ac

10
tests/src/core/testziplayer.cpp Normal file → Executable file
View File

@ -51,8 +51,8 @@ class TestZipLayer: public QObject
// test item(s) in zip item (supply name or test all) // test item(s) in zip item (supply name or test all)
bool testZipItem( QString myFileName, QString myChildName = "", QString myDriverName = "" ); bool testZipItem( QString myFileName, QString myChildName = "", QString myDriverName = "" );
// get layer transparency to test for .qml loading // get layer transparency to test for .qml loading
int getLayerTransparency( QString myFileName, QString myProviderKey, QString myScanZipSetting = "basic" ); // int getLayerTransparency( QString myFileName, QString myProviderKey, QString myScanZipSetting = "basic" );
bool testZipItemTransparency( QString myFileName, QString myProviderKey, int myTarget ); // bool testZipItemTransparency( QString myFileName, QString myProviderKey, int myTarget );
private slots: private slots:
@ -77,6 +77,7 @@ class TestZipLayer: public QObject
void testTarItemVector(); void testTarItemVector();
void testZipItemAll(); void testZipItemAll();
void testTarItemAll(); void testTarItemAll();
#if 0
// test that styles are loaded from .qml files outside zip files // test that styles are loaded from .qml files outside zip files
void testZipItemVectorTransparency(); void testZipItemVectorTransparency();
void testTarItemVectorTransparency(); void testTarItemVectorTransparency();
@ -84,6 +85,7 @@ class TestZipLayer: public QObject
void testZipItemRasterTransparency(); void testZipItemRasterTransparency();
void testTarItemRasterTransparency(); void testTarItemRasterTransparency();
void testGzipItemRasterTransparency(); void testGzipItemRasterTransparency();
#endif
//make sure items inside subfolders can be read //make sure items inside subfolders can be read
void testZipItemSubfolder(); void testZipItemSubfolder();
void testTarItemSubfolder(); void testTarItemSubfolder();
@ -211,6 +213,7 @@ bool TestZipLayer::testZipItem( QString myFileName, QString myChildName, QString
return ok; return ok;
} }
#if 0
int TestZipLayer::getLayerTransparency( QString myFileName, QString myProviderKey, QString myScanZipSetting ) int TestZipLayer::getLayerTransparency( QString myFileName, QString myProviderKey, QString myScanZipSetting )
{ {
int myTransparency = -1; int myTransparency = -1;
@ -247,6 +250,7 @@ bool TestZipLayer::testZipItemTransparency( QString myFileName, QString myProvid
} }
return true; return true;
} }
#endif
// slots // slots
@ -438,6 +442,7 @@ void TestZipLayer::testTarItemAll()
QVERIFY( testZipItem( mDataDir + "testtar.tgz", "" ) ); QVERIFY( testZipItem( mDataDir + "testtar.tgz", "" ) );
} }
#if 0
void TestZipLayer::testZipItemVectorTransparency() void TestZipLayer::testZipItemVectorTransparency()
{ {
#if GDAL_VERSION_NUM < 1800 #if GDAL_VERSION_NUM < 1800
@ -479,6 +484,7 @@ void TestZipLayer::testGzipItemRasterTransparency()
{ {
QVERIFY( testZipItemTransparency( mDataDir + "landsat_b1.tif.gz", "gdal", 250 ) ); QVERIFY( testZipItemTransparency( mDataDir + "landsat_b1.tif.gz", "gdal", 250 ) );
} }
#endif
void TestZipLayer::testZipItemSubfolder() void TestZipLayer::testZipItemSubfolder()
{ {