Return-Path: X-Original-To: apmail-phoenix-commits-archive@minotaur.apache.org Delivered-To: apmail-phoenix-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1533618174 for ; Thu, 21 Jan 2016 05:13:19 +0000 (UTC) Received: (qmail 41671 invoked by uid 500); 21 Jan 2016 05:13:19 -0000 Delivered-To: apmail-phoenix-commits-archive@phoenix.apache.org Received: (qmail 41574 invoked by uid 500); 21 Jan 2016 05:13:19 -0000 Mailing-List: contact commits-help@phoenix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@phoenix.apache.org Delivered-To: mailing list commits@phoenix.apache.org Received: (qmail 41563 invoked by uid 99); 21 Jan 2016 05:13:18 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Jan 2016 05:13:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CD88EE00DC; Thu, 21 Jan 2016 05:13:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jamestaylor@apache.org To: commits@phoenix.apache.org Date: Thu, 21 Jan 2016 05:13:19 -0000 Message-Id: <752f6f75efbb4686beb61f93c2191ebe@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] phoenix git commit: PHOENIX-2612 RuleGeneartorTest updated with right pattern (Karan Singhal) PHOENIX-2612 RuleGeneartorTest updated with right pattern (Karan Singhal) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/2a8d9e7b Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/2a8d9e7b Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/2a8d9e7b Branch: refs/heads/4.x-HBase-0.98 Commit: 2a8d9e7b1a7c669dcf8e40ef728eb17b9777c261 Parents: 29c6632 Author: James Taylor Authored: Wed Jan 20 21:06:32 2016 -0800 Committer: James Taylor Committed: Wed Jan 20 21:11:38 2016 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/phoenix/pherf/PherfConstants.java | 1 + .../src/test/java/org/apache/phoenix/pherf/ResourceTest.java | 2 +- .../test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java | 7 +++---- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/2a8d9e7b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/PherfConstants.java ---------------------------------------------------------------------- diff --git a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/PherfConstants.java b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/PherfConstants.java index 42b5d21..bbae6ea 100644 --- a/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/PherfConstants.java +++ b/phoenix-pherf/src/main/java/org/apache/phoenix/pherf/PherfConstants.java @@ -47,6 +47,7 @@ public class PherfConstants { SCENARIO_ROOT_PATTERN = ".*" + PherfConstants.RESOURCE_SCENARIO.substring(1) + ".*" + PherfConstants.RESOURCE_SCENARIO.substring(1) + ".*"; public static final String SCHEMA_ROOT_PATTERN = ".*"; + public static final String TEST_SCENARIO_ROOT_PATTERN = ".*" + "test" + "_" + PherfConstants.RESOURCE_SCENARIO.substring(1); public static final String PHERF_PROPERTIES = "pherf.properties"; public static final String EXPORT_DIR = "CSV_EXPORT"; http://git-wip-us.apache.org/repos/asf/phoenix/blob/2a8d9e7b/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ResourceTest.java ---------------------------------------------------------------------- diff --git a/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ResourceTest.java b/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ResourceTest.java index cd567cb..d8cad48 100644 --- a/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ResourceTest.java +++ b/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ResourceTest.java @@ -43,7 +43,7 @@ public class ResourceTest { @Test public void testScenarioResourceList() throws Exception { String extension = ".xml"; - assertResources(PherfConstants.SCENARIO_ROOT_PATTERN + extension, PherfConstants.RESOURCE_SCENARIO, extension); + assertResources(PherfConstants.TEST_SCENARIO_ROOT_PATTERN + extension, PherfConstants.RESOURCE_SCENARIO, extension); } @Test http://git-wip-us.apache.org/repos/asf/phoenix/blob/2a8d9e7b/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java ---------------------------------------------------------------------- diff --git a/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java b/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java index 71b785b..b26b2f7 100644 --- a/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java +++ b/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/RuleGeneratorTest.java @@ -47,9 +47,8 @@ import org.junit.Ignore; import org.junit.Test; public class RuleGeneratorTest { - private static final String matcherScenario = PherfConstants.SCENARIO_ROOT_PATTERN + ".xml"; + private static final String matcherScenario = PherfConstants.TEST_SCENARIO_ROOT_PATTERN + ".xml"; - @Ignore("Flapping - see PHOENIX-2592") @Test public void testDateGenerator() throws Exception { XMLConfigParser parser = new XMLConfigParser(matcherScenario); @@ -252,7 +251,7 @@ public class RuleGeneratorTest { expectedValues.add("bBByYhnNbBs9kWu"); expectedValues.add("cCCyYhnNbBs9kWr"); - XMLConfigParser parser = new XMLConfigParser(".*test_scenario.xml"); + XMLConfigParser parser = new XMLConfigParser(matcherScenario); WriteWorkload loader = new WriteWorkload(parser); RulesApplier rulesApplier = loader.getRulesApplier(); Scenario scenario = parser.getScenarios().get(0); @@ -270,7 +269,7 @@ public class RuleGeneratorTest { @Test public void testRuleOverrides() throws Exception { - XMLConfigParser parser = new XMLConfigParser(".*test_scenario.xml"); + XMLConfigParser parser = new XMLConfigParser(matcherScenario); WriteWorkload loader = new WriteWorkload(parser); RulesApplier rulesApplier = loader.getRulesApplier(); Scenario scenario = parser.getScenarios().get(0);