diff --git a/tests/src/core/testqgsrastersublayer.cpp b/tests/src/core/testqgsrastersublayer.cpp
index 49c48cf9b842..a09b8faead22 100644
--- a/tests/src/core/testqgsrastersublayer.cpp
+++ b/tests/src/core/testqgsrastersublayer.cpp
@@ -87,9 +87,9 @@ void TestQgsRasterSubLayer::initTestCase()
mReport += "
Raster Sub Layer Tests
\n";
//mReport += "" + mySettings + "
";
-
- if ( mHasNetCDF )
- {
+
+ if ( mHasNetCDF )
+ {
QFileInfo myRasterFileInfo( mFileName );
mpRasterLayer = new QgsRasterLayer( myRasterFileInfo.filePath(),
myRasterFileInfo.completeBaseName() );
@@ -125,12 +125,19 @@ void TestQgsRasterSubLayer::subLayersList()
// Layer with sublayers is not valid
//QVERIFY( mpRasterLayer->isValid() );
QStringList expected;
- expected << "NETCDF:\"" + mFileName + "\":Band1";
- expected << "NETCDF:\"" + mFileName + "\":Band2";
-
- QStringList sublayers = mpRasterLayer->subLayers();
- mReport += QString( "sublayers:
%1
\n" ).arg( sublayers.join("
") );
- mReport += QString( "expected:
%1
\n" ).arg( expected.join("
") );
+ // Sublayer format: NETCDF:"/path/to/landsat2.nc":Band1
+ // File path is delicate on Windows -> compare only sublayers
+ expected << "Band1";
+ expected << "Band2";
+
+ QStringList sublayers;
+ foreach ( QString s, mpRasterLayer->subLayers() )
+ {
+ sublayers << s.split( ':' ).value( 2 );
+ }
+ qDebug() << "sublayers: " << sublayers.join( "," );
+ mReport += QString( "sublayers:
%1
\n" ).arg( sublayers.join( "
" ) );
+ mReport += QString( "expected:
%1
\n" ).arg( expected.join( "
" ) );
QVERIFY( sublayers == expected );
mReport += "Passed
";
}
@@ -141,7 +148,7 @@ void TestQgsRasterSubLayer::checkStats()
if ( mHasNetCDF )
{
mReport += "Check Stats
\n";
- QString sublayerUri = mpRasterLayer->subLayers().value(0);
+ QString sublayerUri = mpRasterLayer->subLayers().value( 0 );
mReport += "sublayer: " + sublayerUri + "
\n";
QgsRasterLayer *sublayer = new QgsRasterLayer( sublayerUri, "Sublayer 1" );
@@ -159,8 +166,8 @@ void TestQgsRasterSubLayer::checkStats()
QVERIFY( sublayer->width() == width );
QVERIFY( sublayer->height() == height );
- QVERIFY( doubleNear ( myStatistics.minimumValue, min ) );
- QVERIFY( doubleNear ( myStatistics.maximumValue, max ) );
+ QVERIFY( doubleNear( myStatistics.minimumValue, min ) );
+ QVERIFY( doubleNear( myStatistics.maximumValue, max ) );
mReport += "Passed
";
delete sublayer;
}