Skip to content

Commit 8d947e2

Browse files
committedOct 19, 2013
fix scalecombobox test
1 parent 82e6451 commit 8d947e2

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed
 

‎tests/src/gui/testqgsscalecombobox.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,21 +65,21 @@ void TestQgsScaleComboBox::basic()
6565
l->setText( "" );
6666
QTest::keyClicks( l, "1:2345" );
6767
QTest::keyClick( l, Qt::Key_Return );
68-
QCOMPARE( s->scaleString(), QString( "1:2345" ) );
68+
QCOMPARE( s->scaleString(), QString( "1:%1" ).arg( QLocale::system().toString( 2345 ) ) );
6969
QCOMPARE( s->scale(), (( double ) 1.0 / ( double ) 2345.0 ) );
7070

7171
// Testing conversion from number to "1:x"
7272
l->setText( "" );
7373
QTest::keyClicks( l, QLocale::system().toString( 0.02 ) );
7474
QTest::keyClick( l, Qt::Key_Return );
75-
QCOMPARE( s->scaleString(), QString( "1:50" ) );
75+
QCOMPARE( s->scaleString(), QString( "1:%1" ).arg( QLocale::system().toString( 50 ) ) );
7676
QCOMPARE( s->scale(), ( double ) 0.02 );
7777

7878
// Testing conversion from number to "1:x"
7979
l->setText( "" );
8080
QTest::keyClicks( l, QLocale::system().toString( 42 ) );
8181
QTest::keyClick( l, Qt::Key_Return );
82-
QCOMPARE( s->scaleString(), QString( "1:42" ) );
82+
QCOMPARE( s->scaleString(), QString( "1:%1" ).arg( QLocale::system().toString( 42 ) ) );
8383
QCOMPARE( s->scale(), ( double ) 1.0 / ( double ) 42.0 );
8484

8585
// Testing rounding and conversion from illegal
@@ -91,22 +91,22 @@ void TestQgsScaleComboBox::basic()
9191
l->setText( "" );
9292
QTest::keyClicks( l, "1:x:2" );
9393
QTest::keyClick( l, Qt::Key_Return );
94-
QCOMPARE( s->scaleString(), QString( "1:4" ) );
94+
QCOMPARE( s->scaleString(), QString( "1:%1" ).arg( QLocale::system().toString( 4 ) ) );
9595
QCOMPARE( s->scale(), ( double ) 0.25 );
9696

9797
// Test setting programatically
9898
s->setScale(( double ) 0.19 );
99-
QCOMPARE( s->scaleString(), QString( "1:5" ) );
99+
QCOMPARE( s->scaleString(), QString( "1:%1" ).arg( QLocale::system().toString( 5 ) ) );
100100
QCOMPARE( s->scale(), ( double ) 0.2 );
101101

102102
// Test setting programatically
103103
s->setScaleString( QString( "1:240" ) );
104-
QCOMPARE( s->scaleString(), QString( "1:240" ) );
104+
QCOMPARE( s->scaleString(), QString( "1:%1" ).arg( QLocale::system().toString( 240 ) ) );
105105
QCOMPARE( s->scale(), ( double ) 1.0 / ( double ) 240.0 );
106106

107107
// Test setting programatically illegal string
108108
s->setScaleString( QString( "1:2.4" ) );
109-
QCOMPARE( s->scaleString(), QString( "1:240" ) );
109+
QCOMPARE( s->scaleString(), QString( "1:%1" ).arg( QLocale::system().toString( 240 ) ) );
110110
QCOMPARE( s->scale(), ( double ) 1.0 / ( double ) 240.0 );
111111

112112
};

0 commit comments

Comments
 (0)
Please sign in to comment.