From 1895db9495b383228cf753ce772d483842db410d Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Thu, 31 Oct 2019 10:09:27 +0100
Subject: [PATCH] Test fixes

---
 tests/src/core/testqgsdxfexport.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/src/core/testqgsdxfexport.cpp b/tests/src/core/testqgsdxfexport.cpp
index 9372759cb06..d9eff7e4f93 100644
--- a/tests/src/core/testqgsdxfexport.cpp
+++ b/tests/src/core/testqgsdxfexport.cpp
@@ -153,7 +153,7 @@ void TestQgsDxfExport::testPoints()
 
   QString file = getTempFileName( "point_dxf" );
   QFile dxfFile( file );
-  QCOMPARE( d.writeToFile( &dxfFile, QStringLiteral( "CP1252" ) ), QgsDxfExport::Success );
+  QCOMPARE( d.writeToFile( &dxfFile, QStringLiteral( "CP1252" ) ), QgsDxfExport::ExportResult::Success );
   dxfFile.close();
 
   // reload and compare
@@ -181,7 +181,7 @@ void TestQgsDxfExport::testLines()
 
   QString file = getTempFileName( "line_dxf" );
   QFile dxfFile( file );
-  QCOMPARE( d.writeToFile( &dxfFile, QStringLiteral( "CP1252" ) ), QgsDxfExport::Success );
+  QCOMPARE( d.writeToFile( &dxfFile, QStringLiteral( "CP1252" ) ), QgsDxfExport::ExportResult::Success );
   dxfFile.close();
 
   // reload and compare
@@ -209,7 +209,7 @@ void TestQgsDxfExport::testPolygons()
 
   QString file = getTempFileName( "polygon_dxf" );
   QFile dxfFile( file );
-  QCOMPARE( d.writeToFile( &dxfFile, QStringLiteral( "CP1252" ) ), QgsDxfExport::Success );
+  QCOMPARE( d.writeToFile( &dxfFile, QStringLiteral( "CP1252" ) ), QgsDxfExport::ExportResult::Success );
   dxfFile.close();
 
   // reload and compare
@@ -242,7 +242,7 @@ void TestQgsDxfExport::testMultiSurface()
 
   QString file = getTempFileName( "multisurface_dxf" );
   QFile dxfFile( file );
-  QCOMPARE( d.writeToFile( &dxfFile, QStringLiteral( "CP1252" ) ), QgsDxfExport::Success );
+  QCOMPARE( d.writeToFile( &dxfFile, QStringLiteral( "CP1252" ) ), QgsDxfExport::ExportResult::Success );
   dxfFile.close();
 
   // reload and compare
@@ -295,7 +295,7 @@ void TestQgsDxfExport::testMTextEscapeSpaces()
 
   QString file = getTempFileName( "mtext_escape_spaces" );
   QFile dxfFile( file );
-  QCOMPARE( d.writeToFile( &dxfFile, QStringLiteral( "CP1252" ) ), QgsDxfExport::Success );
+  QCOMPARE( d.writeToFile( &dxfFile, QStringLiteral( "CP1252" ) ), QgsDxfExport::ExportResult::Success );
   dxfFile.close();
   QVERIFY( fileContainsText( file, "\\fQGIS Vera Sans|i0|b1;\\H3.81136;A\\~text\\~with\\~spaces" ) );
 }
@@ -331,7 +331,7 @@ void TestQgsDxfExport::testText()
 
   QString file = getTempFileName( "text_dxf" );
   QFile dxfFile( file );
-  QCOMPARE( d.writeToFile( &dxfFile, QStringLiteral( "CP1252" ) ), QgsDxfExport::Success );
+  QCOMPARE( d.writeToFile( &dxfFile, QStringLiteral( "CP1252" ) ), QgsDxfExport::ExportResult::Success );
   dxfFile.close();
 
 
@@ -397,7 +397,7 @@ bool TestQgsDxfExport::testMtext( QgsVectorLayer *vlayer, const QString &tempFil
 
   QString file = getTempFileName( tempFileName );
   QFile dxfFile( file );
-  if ( d.writeToFile( &dxfFile, QStringLiteral( "CP1252" ) ) != 0 )
+  if ( d.writeToFile( &dxfFile, QStringLiteral( "CP1252" ) ) != QgsDxfExport::ExportResult::Success )
   {
     return false;
   }
@@ -451,7 +451,7 @@ void TestQgsDxfExport::testGeometryGeneratorExport()
 
   QString file = getTempFileName( "geometry_generator_dxf" );
   QFile dxfFile( file );
-  QCOMPARE( d.writeToFile( &dxfFile, QStringLiteral( "CP1252" ) ), QgsDxfExport::Success );
+  QCOMPARE( d.writeToFile( &dxfFile, QStringLiteral( "CP1252" ) ), QgsDxfExport::ExportResult::Success );
   dxfFile.close();
 
   QVERIFY( fileContainsText( file, "HATCH" ) );
@@ -484,7 +484,7 @@ void TestQgsDxfExport::testCurveExport()
 
   QString file = getTempFileName( wktType );
   QFile dxfFile( file );
-  QCOMPARE( d.writeToFile( &dxfFile, QStringLiteral( "CP1252" ) ), QgsDxfExport::Success );
+  QCOMPARE( d.writeToFile( &dxfFile, QStringLiteral( "CP1252" ) ), QgsDxfExport::ExportResult::Success );
   dxfFile.close();
 
   QVERIFY( fileContainsText( file, dxfText ) );