From 874c1fd5e4364755a7bb0306637f696d9db2071b Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Thu, 15 Aug 2019 00:13:26 +0200 Subject: [PATCH] Switch QCOMPARE to the proper order --- autotests/formattest.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/autotests/formattest.cpp b/autotests/formattest.cpp index 4875d23d7..a15bc4a2e 100644 --- a/autotests/formattest.cpp +++ b/autotests/formattest.cpp @@ -71,73 +71,73 @@ void FormatTest::testTimeFormat() fft->setText( QStringLiteral( "1:20" ) ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); - QCOMPARE( QStringLiteral( "01:20" ), m_formattedText ); + QCOMPARE( m_formattedText, QStringLiteral( "01:20" ) ); fft->setText( QStringLiteral( "1:20 pm" ) ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); - QCOMPARE( QStringLiteral( "13:20" ), m_formattedText ); + QCOMPARE( m_formattedText, QStringLiteral( "13:20" ) ); fft->setText( QStringLiteral( "1" ) ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); - QCOMPARE( QStringLiteral( "" ), m_formattedText ); + QCOMPARE( m_formattedText, QStringLiteral( "" ) ); fft->setText( QStringLiteral( "25:12" ) ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); - QCOMPARE( QStringLiteral( "" ), m_formattedText ); + QCOMPARE( m_formattedText, QStringLiteral( "" ) ); fft->setText( QStringLiteral( "abcd" ) ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); - QCOMPARE( QStringLiteral( "" ), m_formattedText ); + QCOMPARE( m_formattedText, QStringLiteral( "" ) ); fft = reinterpret_cast< Okular::FormFieldText * >( m_fields[ QStringLiteral( "time2" ) ] ); fft->setText( QStringLiteral( "1:20" ) ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); - QCOMPARE( QStringLiteral( "1:20 am" ), m_formattedText ); + QCOMPARE( m_formattedText, QStringLiteral( "1:20 am" ) ); fft->setText( QStringLiteral( "01:20 pm" ) ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); - QCOMPARE( QStringLiteral( "1:20 pm" ), m_formattedText ); + QCOMPARE( m_formattedText, QStringLiteral( "1:20 pm" ) ); fft->setText( QStringLiteral( "13:20" ) ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); - QCOMPARE( QStringLiteral( "1:20 pm" ), m_formattedText ); + QCOMPARE( m_formattedText, QStringLiteral( "1:20 pm" ) ); fft = reinterpret_cast< Okular::FormFieldText * >( m_fields[ QStringLiteral( "time3" ) ] ); fft->setText( QStringLiteral( "1:20" ) ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); - QCOMPARE( QStringLiteral( "01:20:00" ), m_formattedText ); + QCOMPARE( m_formattedText, QStringLiteral( "01:20:00" ) ); fft->setText( QStringLiteral( "1:20:00 pm" ) ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); - QCOMPARE( QStringLiteral( "13:20:00" ), m_formattedText ); + QCOMPARE( m_formattedText, QStringLiteral( "13:20:00" ) ); fft = reinterpret_cast< Okular::FormFieldText * >( m_fields[ QStringLiteral( "time4" ) ] ); fft->setText( QStringLiteral( "1:20:00" ) ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); - QCOMPARE( QStringLiteral( "1:20:00 am" ), m_formattedText ); + QCOMPARE( m_formattedText, QStringLiteral( "1:20:00 am" ) ); fft->setText( QStringLiteral( "01:20:00 pm" ) ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); - QCOMPARE( QStringLiteral( "1:20:00 pm" ), m_formattedText ); + QCOMPARE( m_formattedText, QStringLiteral( "1:20:00 pm" ) ); fft->setText( QStringLiteral( "13:20:00" ) ); m_document->processFormatAction( fft->additionalAction( Okular::FormField::FormatField ), fft ); - QCOMPARE( QStringLiteral( "1:20:00 pm" ), m_formattedText ); + QCOMPARE( m_formattedText, QStringLiteral( "1:20:00 pm" ) ); } void FormatTest::testSpecialFormat()