Rename some test methods

nyalldawson · nyalldawson · commit e3daac407bdc · 2018-01-05T13:19:26.000+10:00
diff --git a/tests/src/core/testqgslayoutlabel.cpp b/tests/src/core/testqgslayoutlabel.cpp
@@ -46,10 +46,10 @@ class TestQgsLayoutLabel : public QObject
     // test simple expression evaluation
     void evaluation();
     // test expression evaluation when a feature is set
-    void feature_evaluation();
-    void feature_evaluation2();
+    void featureEvaluationUsingAtlas();
+    void featureEvaluationUsingContext();
     // test page expressions
-    void page_evaluation();
+    void pageEvaluation();
     void marginMethods(); //tests getting/setting margins
     void render();
     void renderAsHtml();
@@ -145,7 +145,7 @@ void TestQgsLayoutLabel::evaluation()
   }
 }
 
-void TestQgsLayoutLabel::feature_evaluation()
+void TestQgsLayoutLabel::featureEvaluationUsingAtlas()
 {
   QgsPrintLayout l( QgsProject::instance() );
   l.initializeDefaults();
@@ -175,7 +175,7 @@ void TestQgsLayoutLabel::feature_evaluation()
   }
 }
 
-void TestQgsLayoutLabel::feature_evaluation2()
+void TestQgsLayoutLabel::featureEvaluationUsingContext()
 {
   // just using context, no atlas
   QgsLayout l( QgsProject::instance() );
@@ -209,7 +209,7 @@ void TestQgsLayoutLabel::feature_evaluation2()
   }
 }
 
-void TestQgsLayoutLabel::page_evaluation()
+void TestQgsLayoutLabel::pageEvaluation()
 {
   QgsLayout l( QgsProject::instance() );
   l.initializeDefaults();

Original file line number	Diff line number	Diff line change
`@@ -46,10 +46,10 @@ class TestQgsLayoutLabel : public QObject`
`46`	`46`	`// test simple expression evaluation`
`47`	`47`	`void evaluation();`
`48`	`48`	`// test expression evaluation when a feature is set`
`49`		`- void feature_evaluation();`
`50`		`- void feature_evaluation2();`
	`49`	`+ void featureEvaluationUsingAtlas();`
	`50`	`+ void featureEvaluationUsingContext();`
`51`	`51`	`// test page expressions`
`52`		`- void page_evaluation();`
	`52`	`+ void pageEvaluation();`
`53`	`53`	`void marginMethods(); //tests getting/setting margins`
`54`	`54`	`void render();`
`55`	`55`	`void renderAsHtml();`
`@@ -145,7 +145,7 @@ void TestQgsLayoutLabel::evaluation()`
`145`	`145`	`}`
`146`	`146`	`}`
`147`	`147`
`148`		`-void TestQgsLayoutLabel::feature_evaluation()`
	`148`	`+void TestQgsLayoutLabel::featureEvaluationUsingAtlas()`
`149`	`149`	`{`
`150`	`150`	`QgsPrintLayout l( QgsProject::instance() );`
`151`	`151`	`l.initializeDefaults();`
`@@ -175,7 +175,7 @@ void TestQgsLayoutLabel::feature_evaluation()`
`175`	`175`	`}`
`176`	`176`	`}`
`177`	`177`
`178`		`-void TestQgsLayoutLabel::feature_evaluation2()`
	`178`	`+void TestQgsLayoutLabel::featureEvaluationUsingContext()`
`179`	`179`	`{`
`180`	`180`	`// just using context, no atlas`
`181`	`181`	`QgsLayout l( QgsProject::instance() );`
`@@ -209,7 +209,7 @@ void TestQgsLayoutLabel::feature_evaluation2()`
`209`	`209`	`}`
`210`	`210`	`}`
`211`	`211`
`212`		`-void TestQgsLayoutLabel::page_evaluation()`
	`212`	`+void TestQgsLayoutLabel::pageEvaluation()`
`213`	`213`	`{`
`214`	`214`	`QgsLayout l( QgsProject::instance() );`
`215`	`215`	`l.initializeDefaults();`