rename test images

qgis · Aug 10, 2016 · b08a9e7 · b08a9e7
1 parent 3f22a7a
commit b08a9e7
Show file tree

Hide file tree

Showing 58 changed files with 18 additions and 18 deletions.
diff --git a/src/app/qgsprojectproperties.cpp b/src/app/qgsprojectproperties.cpp
@@ -1659,7 +1659,7 @@ void QgsProjectProperties::on_pbnExportScales_clicked()
 
 void QgsProjectProperties::populateStyles()
 {
-  // Styles - taken from qgsstylev2managerdialog
+  // Styles - taken from qgsstylemanagerdialog
 
   // use QComboBox and QString lists for shorter code
   QStringList prefList;

diff --git a/src/core/symbology-ng/qgssymbologyconversion.cpp b/src/core/symbology-ng/qgssymbologyconversion.cpp
@@ -227,16 +227,16 @@ static QgsFeatureRenderer* readOldGraduatedSymbolRenderer( const QDomNode& rnode
   QDomNode symbolnode = rnode.namedItem( "symbol" );
   while ( !symbolnode.isNull() )
   {
-    QgsSymbol* symbolv2 = readOldSymbol( symbolnode, geomType );
-    if ( symbolv2 )
+    QgsSymbol* symbol = readOldSymbol( symbolnode, geomType );
+    if ( symbol )
     {
       QgsOldSymbolMeta meta = readSymbolMeta( symbolnode );
       double lowerValue = meta.lowerValue.toDouble();
       double upperValue = meta.upperValue.toDouble();
       QString label = meta.label;
       if ( label.isEmpty() )
         label = QString( "%1 - %2" ).arg( lowerValue, -1, 'f', 3 ).arg( upperValue, -1, 'f', 3 );
-      ranges.append( QgsRendererRange( lowerValue, upperValue, symbolv2, label ) );
+      ranges.append( QgsRendererRange( lowerValue, upperValue, symbol, label ) );
     }
 
     symbolnode = symbolnode.nextSibling();
@@ -260,15 +260,15 @@ static QgsFeatureRenderer* readOldUniqueValueRenderer( const QDomNode& rnode, Qg
   QDomNode symbolnode = rnode.namedItem( "symbol" );
   while ( !symbolnode.isNull() )
   {
-    QgsSymbol* symbolv2 = readOldSymbol( symbolnode, geomType );
-    if ( symbolv2 )
+    QgsSymbol* symbol = readOldSymbol( symbolnode, geomType );
+    if ( symbol )
     {
       QgsOldSymbolMeta meta = readSymbolMeta( symbolnode );
       QVariant value = QVariant( meta.lowerValue );
       QString label = meta.label;
       if ( label.isEmpty() )
         label = value.toString();
-      cats.append( QgsRendererCategory( value, symbolv2, label, true ) );
+      cats.append( QgsRendererCategory( value, symbol, label, true ) );
     }
 
     symbolnode = symbolnode.nextSibling();

diff --git a/src/gui/symbology-ng/qgsstyleexportimportdialog.cpp b/src/gui/symbology-ng/qgsstyleexportimportdialog.cpp
@@ -15,7 +15,7 @@
  ***************************************************************************/
 
 #include "qgsstyleexportimportdialog.h"
-#include "ui_qgsstylev2exportimportdialogbase.h"
+#include "ui_qgsstyleexportimportdialogbase.h"
 
 #include "qgsstyle.h"
 #include "qgssymbol.h"

diff --git a/src/gui/symbology-ng/qgsstyleexportimportdialog.h b/src/gui/symbology-ng/qgsstyleexportimportdialog.h
@@ -25,7 +25,7 @@
 #include <QNetworkReply>
 #include <QStandardItem>
 
-#include "ui_qgsstylev2exportimportdialogbase.h"
+#include "ui_qgsstyleexportimportdialogbase.h"
 
 class QgsStyle;
 class QgsStyleGroupSelectionDialog;

diff --git a/src/gui/symbology-ng/qgsstylegroupselectiondialog.h b/src/gui/symbology-ng/qgsstylegroupselectiondialog.h
@@ -19,7 +19,7 @@
 
 #include <QDialog>
 #include <QStandardItem>
-#include "ui_qgsstylev2groupselectiondialogbase.h"
+#include "ui_qgsstylegroupselectiondialogbase.h"
 
 
 class QgsStyle;

diff --git a/src/gui/symbology-ng/qgsstylemanagerdialog.h b/src/gui/symbology-ng/qgsstylemanagerdialog.h
@@ -21,7 +21,7 @@
 #include <QAction>
 #include <QMenu>
 
-#include "ui_qgsstylev2managerdialogbase.h"
+#include "ui_qgsstylemanagerdialogbase.h"
 #include "qgscontexthelp.h"
 
 class QgsStyle;

diff --git a/src/ui/qgsstylev2exportimportdialogbase.ui → src/ui/qgsstyleexportimportdialogbase.ui b/src/ui/qgsstylev2exportimportdialogbase.ui → src/ui/qgsstyleexportimportdialogbase.ui
diff --git a/src/ui/qgsstylev2groupselectiondialogbase.ui → src/ui/qgsstylegroupselectiondialogbase.ui b/src/ui/qgsstylev2groupselectiondialogbase.ui → src/ui/qgsstylegroupselectiondialogbase.ui
diff --git a/src/ui/qgsstylev2managerdialogbase.ui → src/ui/qgsstylemanagerdialogbase.ui b/src/ui/qgsstylev2managerdialogbase.ui → src/ui/qgsstylemanagerdialogbase.ui
diff --git a/tests/src/core/CMakeLists.txt b/tests/src/core/CMakeLists.txt
@@ -183,9 +183,9 @@ ADD_QGIS_TEST(snappingutilstest testqgssnappingutils.cpp )
 ADD_QGIS_TEST(spatialindextest testqgsspatialindex.cpp)
 ADD_QGIS_TEST(statisticalsummarytest testqgsstatisticalsummary.cpp)
 ADD_QGIS_TEST(stringutilstest testqgsstringutils.cpp)
-ADD_QGIS_TEST(stylev2test testqgsstyle.cpp)
+ADD_QGIS_TEST(styletest testqgsstyle.cpp)
 ADD_QGIS_TEST(svgmarkertest testqgssvgmarker.cpp)
-ADD_QGIS_TEST(symbolv2test testqgssymbol.cpp)
+ADD_QGIS_TEST(symboltest testqgssymbol.cpp)
 ADD_QGIS_TEST(tracertest testqgstracer.cpp)
 #for some obscure reason calling this test "fontutils" kills the build on Ubuntu 15.10
 ADD_QGIS_TEST(typographicstylingutils testqgsfontutils.cpp)

diff --git a/tests/src/core/testqgssymbol.cpp b/tests/src/core/testqgssymbol.cpp
@@ -189,11 +189,11 @@ void TestQgsSymbol::testCanvasClip()
   bool result;
 
   lineSymbol->setClipFeaturesToExtent( true );
-  result = imageCheck( ms, "stylev2_linecanvasclip" );
+  result = imageCheck( ms, "style_linecanvasclip" );
   QVERIFY( result );
 
   lineSymbol->setClipFeaturesToExtent( false );
-  result = imageCheck( ms, "stylev2_linecanvasclip_off" );
+  result = imageCheck( ms, "style_linecanvasclip_off" );
   QVERIFY( result );
 
   //poly
@@ -210,11 +210,11 @@ void TestQgsSymbol::testCanvasClip()
   ms.setExtent( extent );
 
   fillSymbol->setClipFeaturesToExtent( true );
-  result = imageCheck( ms, "stylev2_polycanvasclip" );
+  result = imageCheck( ms, "style_polycanvasclip" );
   QVERIFY( result );
 
   fillSymbol->setClipFeaturesToExtent( false );
-  result = imageCheck( ms, "stylev2_polycanvasclip_off" );
+  result = imageCheck( ms, "style_polycanvasclip_off" );
   QVERIFY( result );
 }
 

diff --git a/tests/src/python/test_qgssymbol.py b/tests/src/python/test_qgssymbol.py
@@ -178,7 +178,7 @@ def imageCheck(self, name, reference_image, image):
         file_name = temp_dir + 'symbol_' + name + ".png"
         image.save(file_name, "PNG")
         checker = QgsRenderChecker()
-        checker.setControlPathPrefix("symbolv2")
+        checker.setControlPathPrefix("symbol")
         checker.setControlName("expected_" + reference_image)
         checker.setRenderedImage(file_name)
         checker.setColorTolerance(2)

diff --git a/...sclip/expected_stylev2_linecanvasclip.png → ...vasclip/expected_style_linecanvasclip.png b/...sclip/expected_stylev2_linecanvasclip.png → ...vasclip/expected_style_linecanvasclip.png
diff --git a/.../expected_stylev2_linecanvasclip_mask.png → ...ip/expected_style_linecanvasclip_mask.png b/.../expected_stylev2_linecanvasclip_mask.png → ...ip/expected_style_linecanvasclip_mask.png
diff --git a/...f/expected_stylev2_linecanvasclip_off.png → ...off/expected_style_linecanvasclip_off.png b/...f/expected_stylev2_linecanvasclip_off.png → ...off/expected_style_linecanvasclip_off.png
diff --git a/...ected_stylev2_linecanvasclip_off_mask.png → ...xpected_style_linecanvasclip_off_mask.png b/...ected_stylev2_linecanvasclip_off_mask.png → ...xpected_style_linecanvasclip_off_mask.png
diff --git a/...sclip/expected_stylev2_polycanvasclip.png → ...vasclip/expected_style_polycanvasclip.png b/...sclip/expected_stylev2_polycanvasclip.png → ...vasclip/expected_style_polycanvasclip.png
diff --git a/.../expected_stylev2_polycanvasclip_mask.png → ...ip/expected_style_polycanvasclip_mask.png b/.../expected_stylev2_polycanvasclip_mask.png → ...ip/expected_style_polycanvasclip_mask.png
diff --git a/...f/expected_stylev2_polycanvasclip_off.png → ...off/expected_style_polycanvasclip_off.png b/...f/expected_stylev2_polycanvasclip_off.png → ...off/expected_style_polycanvasclip_off.png
diff --git a/...ected_stylev2_polycanvasclip_off_mask.png → ...xpected_style_polycanvasclip_off_mask.png b/...ected_stylev2_polycanvasclip_off_mask.png → ...xpected_style_polycanvasclip_off_mask.png
diff --git a/...er_layer1/expected_label_order_layer1.png → ...er_layer1/expected_label_order_layer1.png b/...er_layer1/expected_label_order_layer1.png → ...er_layer1/expected_label_order_layer1.png
diff --git a/...yer1/expected_label_order_layer1_mask.png → ...yer1/expected_label_order_layer1_mask.png b/...yer1/expected_label_order_layer1_mask.png → ...yer1/expected_label_order_layer1_mask.png
diff --git a/...er_layer2/expected_label_order_layer2.png → ...er_layer2/expected_label_order_layer2.png b/...er_layer2/expected_label_order_layer2.png → ...er_layer2/expected_label_order_layer2.png
diff --git a/...yer2/expected_label_order_layer2_mask.png → ...yer2/expected_label_order_layer2_mask.png b/...yer2/expected_label_order_layer2_mask.png → ...yer2/expected_label_order_layer2_mask.png
diff --git a/...rder_mixed/expected_label_order_mixed.png → ...rder_mixed/expected_label_order_mixed.png b/...rder_mixed/expected_label_order_mixed.png → ...rder_mixed/expected_label_order_mixed.png
diff --git a/...mixed/expected_label_order_mixed_mask.png → ...mixed/expected_label_order_mixed_mask.png b/...mixed/expected_label_order_mixed_mask.png → ...mixed/expected_label_order_mixed_mask.png
diff --git a/..._order_size/expected_label_order_size.png → ..._order_size/expected_label_order_size.png b/..._order_size/expected_label_order_size.png → ..._order_size/expected_label_order_size.png
diff --git a/...r_size/expected_label_order_size_mask.png → ...r_size/expected_label_order_size_mask.png b/...r_size/expected_label_order_size_mask.png → ...r_size/expected_label_order_size_mask.png
diff --git a/...er_zindex/expected_label_order_zindex.png → ...er_zindex/expected_label_order_zindex.png b/...er_zindex/expected_label_order_zindex.png → ...er_zindex/expected_label_order_zindex.png
diff --git a/...ndex/expected_label_order_zindex_mask.png → ...ndex/expected_label_order_zindex_mask.png b/...ndex/expected_label_order_zindex_mask.png → ...ndex/expected_label_order_zindex_mask.png
diff --git a/...abeling_basic/expected_labeling_basic.png → ...abeling_basic/expected_labeling_basic.png b/...abeling_basic/expected_labeling_basic.png → ...abeling_basic/expected_labeling_basic.png
diff --git a/...ng_basic/expected_labeling_basic_mask.png → ...ng_basic/expected_labeling_basic_mask.png b/...ng_basic/expected_labeling_basic_mask.png → ...ng_basic/expected_labeling_basic_mask.png
diff --git a/...rams/expected_labeling_point_diagrams.png → ...rams/expected_labeling_point_diagrams.png b/...rams/expected_labeling_point_diagrams.png → ...rams/expected_labeling_point_diagrams.png
diff --git a/...expected_labeling_point_diagrams_mask.png → ...expected_labeling_point_diagrams_mask.png b/...expected_labeling_point_diagrams_mask.png → ...expected_labeling_point_diagrams_mask.png
diff --git a/...rulebased/expected_labeling_rulebased.png → ...rulebased/expected_labeling_rulebased.png b/...rulebased/expected_labeling_rulebased.png → ...rulebased/expected_labeling_rulebased.png
diff --git a/...ased/expected_labeling_rulebased_mask.png → ...ased/expected_labeling_rulebased_mask.png b/...ased/expected_labeling_rulebased_mask.png → ...ased/expected_labeling_rulebased_mask.png
diff --git a/...cular_string/expected_circular_string.png → ...cular_string/expected_circular_string.png b/...cular_string/expected_circular_string.png → ...cular_string/expected_circular_string.png
diff --git a/..._string/expected_circular_string_mask.png → ..._string/expected_circular_string_mask.png b/..._string/expected_circular_string_mask.png → ..._string/expected_circular_string_mask.png
diff --git a/...ompound_curve/expected_compound_curve.png → ...ompound_curve/expected_compound_curve.png b/...ompound_curve/expected_compound_curve.png → ...ompound_curve/expected_compound_curve.png
diff --git a/...nd_curve/expected_compound_curve_mask.png → ...nd_curve/expected_compound_curve_mask.png b/...nd_curve/expected_compound_curve_mask.png → ...nd_curve/expected_compound_curve_mask.png
diff --git a/..._curve_polygon/expected_curve_polygon.png → ..._curve_polygon/expected_curve_polygon.png b/..._curve_polygon/expected_curve_polygon.png → ..._curve_polygon/expected_curve_polygon.png
diff --git a/...e_polygon/expected_curve_polygon_mask.png → ...e_polygon/expected_curve_polygon_mask.png b/...e_polygon/expected_curve_polygon_mask.png → ...e_polygon/expected_curve_polygon_mask.png
diff --git a/..._no_arc/expected_curve_polygon_no_arc.png → ..._no_arc/expected_curve_polygon_no_arc.png b/..._no_arc/expected_curve_polygon_no_arc.png → ..._no_arc/expected_curve_polygon_no_arc.png
diff --git a/...rc/expected_curve_polygon_no_arc_mask.png → ...rc/expected_curve_polygon_no_arc_mask.png b/...rc/expected_curve_polygon_no_arc_mask.png → ...rc/expected_curve_polygon_no_arc_mask.png
diff --git a/...pected_linestring/expected_linestring.png → ...pected_linestring/expected_linestring.png b/...pected_linestring/expected_linestring.png → ...pected_linestring/expected_linestring.png
diff --git a/...d_linestring/expected_linestring_mask.png → ...d_linestring/expected_linestring_mask.png b/...d_linestring/expected_linestring_mask.png → ...d_linestring/expected_linestring_mask.png
diff --git a/...pected_multicurve/expected_multicurve.png → ...pected_multicurve/expected_multicurve.png b/...pected_multicurve/expected_multicurve.png → ...pected_multicurve/expected_multicurve.png
diff --git a/...d_multicurve/expected_multicurve_mask.png → ...d_multicurve/expected_multicurve_mask.png b/...d_multicurve/expected_multicurve_mask.png → ...d_multicurve/expected_multicurve_mask.png
diff --git a/...tilinestring/expected_multilinestring.png → ...tilinestring/expected_multilinestring.png b/...tilinestring/expected_multilinestring.png → ...tilinestring/expected_multilinestring.png
diff --git a/...estring/expected_multilinestring_mask.png → ...estring/expected_multilinestring_mask.png b/...estring/expected_multilinestring_mask.png → ...estring/expected_multilinestring_mask.png
diff --git a/...pected_multipoint/expected_multipoint.png → ...pected_multipoint/expected_multipoint.png b/...pected_multipoint/expected_multipoint.png → ...pected_multipoint/expected_multipoint.png
diff --git a/...d_multipoint/expected_multipoint_mask.png → ...d_multipoint/expected_multipoint_mask.png b/...d_multipoint/expected_multipoint_mask.png → ...d_multipoint/expected_multipoint_mask.png
diff --git a/...ed_multipolygon/expected_multipolygon.png → ...ed_multipolygon/expected_multipolygon.png b/...ed_multipolygon/expected_multipolygon.png → ...ed_multipolygon/expected_multipolygon.png
diff --git a/...ltipolygon/expected_multipolygon_mask.png → ...ltipolygon/expected_multipolygon_mask.png b/...ltipolygon/expected_multipolygon_mask.png → ...ltipolygon/expected_multipolygon_mask.png
diff --git a/...ymbolv2/expected_point/expected_point.png → .../symbol/expected_point/expected_point.png b/...ymbolv2/expected_point/expected_point.png → .../symbol/expected_point/expected_point.png
diff --git a/...v2/expected_point/expected_point_mask.png → ...ol/expected_point/expected_point_mask.png b/...v2/expected_point/expected_point_mask.png → ...ol/expected_point/expected_point_mask.png
diff --git a/...lv2/expected_polygon/expected_polygon.png → ...bol/expected_polygon/expected_polygon.png b/...lv2/expected_polygon/expected_polygon.png → ...bol/expected_polygon/expected_polygon.png
diff --git a/...xpected_polygon/expected_polygon_mask.png → ...xpected_polygon/expected_polygon_mask.png b/...xpected_polygon/expected_polygon_mask.png → ...xpected_polygon/expected_polygon_mask.png