[phoenix] branch 4.x-HBase-1.3 updated: PHOENIX-5325 Fix some pherf tests that are failing.

[larsh]

This is an automated email from the ASF dual-hosted git repository.

larsh pushed a commit to branch 4.x-HBase-1.3
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/4.x-HBase-1.3 by this push:
     new 72cb625  PHOENIX-5325 Fix some pherf tests that are failing.
72cb625 is described below

commit 72cb6258121b74eca1d3a47ee375f1164425e873
Author: Lars Hofhansl <la...@apache.org>
AuthorDate: Sat Jun 8 16:58:09 2019 -0700

    PHOENIX-5325 Fix some pherf tests that are failing.
---
 .../test/java/org/apache/phoenix/pherf/ConfigurationParserTest.java   | 2 ++
 phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ResultTest.java  | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ConfigurationParserTest.java
 
b/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ConfigurationParserTest.java
index 5afde69..0b6c9cc 100644
--- 
a/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ConfigurationParserTest.java
+++ 
b/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ConfigurationParserTest.java
@@ -199,6 +199,7 @@ public class ConfigurationParserTest extends ResultBaseTest 
{
             data.setDataMappingColumns(columnList);
 
             Scenario scenario = new Scenario();
+            scenario.setName("scenario1");
             scenario.setTenantId("00DXXXXXX");
                List<Ddl> preScenarioDdls = new ArrayList<Ddl>();
                preScenarioDdls.add(new Ddl("CREATE INDEX IF NOT EXISTS ? ON 
FHA (NEWVAL_NUMBER) ASYNC", "FHAIDX_NEWVAL_NUMBER"));
@@ -219,6 +220,7 @@ public class ConfigurationParserTest extends ResultBaseTest 
{
             querySet.setNumberOfExecutions(20);
             query.setStatement("select * from FHA");
             Scenario scenario2 = new Scenario();
+            scenario2.setName("scenario2");
             scenario2.setPhoenixProperties(new HashMap<String, String>());
             scenario2.setDataOverride(new DataOverride());
             scenario2.setTableName("tableName2");
diff --git 
a/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ResultTest.java 
b/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ResultTest.java
index 2afdd21..28e8c62 100644
--- a/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ResultTest.java
+++ b/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ResultTest.java
@@ -163,9 +163,7 @@ public class ResultTest extends ResultBaseTest {
         dataModelResult.setZookeeper("mytestzk");
         ScenarioResult scenarioResult = new ScenarioResult();
         scenarioResult.setTableName("MY_TABLE_NAME");
-
-        // Scenario Name left blank on purpose to test that null values get 
generated correctly.
-        //scenarioResult.setName("MY_TEST_SCENARIO");
+        scenarioResult.setName("MY_TEST_SCENARIO");
 
         dataModelResult.getScenarioResult().add(scenarioResult);
         scenarioResult.setRowCount(999);