Skip to content

Commit c9c3aa0

Browse files
committedApr 8, 2013
also remove transparency tests
1 parent 6b2af9a commit c9c3aa0

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed
 

‎tests/src/core/testziplayer.cpp

100644100755
Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ class TestZipLayer: public QObject
5151
// test item(s) in zip item (supply name or test all)
5252
bool testZipItem( QString myFileName, QString myChildName = "", QString myDriverName = "" );
5353
// get layer transparency to test for .qml loading
54-
int getLayerTransparency( QString myFileName, QString myProviderKey, QString myScanZipSetting = "basic" );
55-
bool testZipItemTransparency( QString myFileName, QString myProviderKey, int myTarget );
54+
// int getLayerTransparency( QString myFileName, QString myProviderKey, QString myScanZipSetting = "basic" );
55+
// bool testZipItemTransparency( QString myFileName, QString myProviderKey, int myTarget );
5656

5757
private slots:
5858

@@ -77,13 +77,15 @@ class TestZipLayer: public QObject
7777
void testTarItemVector();
7878
void testZipItemAll();
7979
void testTarItemAll();
80+
#if 0
8081
// test that styles are loaded from .qml files outside zip files
8182
void testZipItemVectorTransparency();
8283
void testTarItemVectorTransparency();
8384
void testGzipItemVectorTransparency();
8485
void testZipItemRasterTransparency();
8586
void testTarItemRasterTransparency();
8687
void testGzipItemRasterTransparency();
88+
#endif
8789
//make sure items inside subfolders can be read
8890
void testZipItemSubfolder();
8991
void testTarItemSubfolder();
@@ -211,6 +213,7 @@ bool TestZipLayer::testZipItem( QString myFileName, QString myChildName, QString
211213
return ok;
212214
}
213215

216+
#if 0
214217
int TestZipLayer::getLayerTransparency( QString myFileName, QString myProviderKey, QString myScanZipSetting )
215218
{
216219
int myTransparency = -1;
@@ -247,6 +250,7 @@ bool TestZipLayer::testZipItemTransparency( QString myFileName, QString myProvid
247250
}
248251
return true;
249252
}
253+
#endif
250254

251255

252256
// slots
@@ -438,6 +442,7 @@ void TestZipLayer::testTarItemAll()
438442
QVERIFY( testZipItem( mDataDir + "testtar.tgz", "" ) );
439443
}
440444

445+
#if 0
441446
void TestZipLayer::testZipItemVectorTransparency()
442447
{
443448
#if GDAL_VERSION_NUM < 1800
@@ -479,6 +484,7 @@ void TestZipLayer::testGzipItemRasterTransparency()
479484
{
480485
QVERIFY( testZipItemTransparency( mDataDir + "landsat_b1.tif.gz", "gdal", 250 ) );
481486
}
487+
#endif
482488

483489
void TestZipLayer::testZipItemSubfolder()
484490
{

3 commit comments

Comments
 (3)

etiennesky commented on Apr 26, 2013

@etiennesky
Contributor

Jurgen - is there a way to test transparency with latest api?

jef-n commented on Apr 26, 2013

@jef-n
MemberAuthor

No idea - otherwise I probably would have fixed the test ;)

etiennesky commented on Apr 26, 2013

@etiennesky
Contributor

ok thanks, I'll wait until api freeze and check it out

Please sign in to comment.