You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by mu...@apache.org on 2015/10/07 19:59:58 UTC
phoenix git commit: PHOENIX-2309 Fix unit test hang for Pherf on Mac
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-1.0 5f1468a90 -> 340911841
PHOENIX-2309 Fix unit test hang for Pherf on Mac
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/34091184
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/34091184
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/34091184
Branch: refs/heads/4.x-HBase-1.0
Commit: 340911841c829a1ecc8440861c452be0fd90e259
Parents: 5f1468a
Author: Mujtaba <mu...@apache.org>
Authored: Wed Oct 7 10:59:55 2015 -0700
Committer: Mujtaba <mu...@apache.org>
Committed: Wed Oct 7 10:59:55 2015 -0700
----------------------------------------------------------------------
.../test/java/org/apache/phoenix/pherf/ResultTest.java | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/34091184/phoenix-pherf/src/test/java/org/apache/phoenix/pherf/ResultTest.java
----------------------------------------------------------------------
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 81d5fd0..e543137 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
@@ -26,14 +26,12 @@ import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import org.apache.phoenix.pherf.jmx.MonitorManager;
-
import org.apache.phoenix.pherf.result.file.Extension;
import org.apache.phoenix.pherf.result.file.ResultFileDetails;
import org.apache.phoenix.pherf.result.impl.CSVFileResultHandler;
import org.apache.phoenix.pherf.result.impl.XMLResultHandler;
import org.apache.phoenix.pherf.result.*;
import org.junit.Test;
-
import org.apache.phoenix.pherf.configuration.Query;
public class ResultTest extends ResultBaseTest {
@@ -110,8 +108,11 @@ public class ResultTest extends ResultBaseTest {
@Test
public void testResult() throws Exception {
String filename = "testresult";
- ResultHandler xmlResultHandler = null;
- ResultManager resultManager = new ResultManager(filename);
+ ResultHandler xmlResultHandler = new XMLResultHandler();
+ xmlResultHandler.setResultFileDetails(ResultFileDetails.XML);
+ xmlResultHandler.setResultFileName(filename);
+
+ ResultManager resultManager = new ResultManager(filename, Arrays.asList(xmlResultHandler));
assertTrue("Default Handlers were not initialized.", resultManager.getResultHandlers().size() > 0);
// write result to file
@@ -125,10 +126,6 @@ public class ResultTest extends ResultBaseTest {
resultManager.write(modelResults);
// read result from file
- xmlResultHandler = new XMLResultHandler();
- xmlResultHandler.setResultFileDetails(ResultFileDetails.XML);
- xmlResultHandler.setResultFileName(filename);
-
List<Result> resultList = xmlResultHandler.read();
ResultValue<DataModelResult> resultValue = resultList.get(0).getResultValues().get(0);
DataModelResult dataModelResultFromFile = resultValue.getResultValue();