Repository: incubator-blur Updated Branches: refs/heads/master f4dbfedfc -> 0b065b161
Formatting. Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/a2981114 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/a2981114 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/a2981114 Branch: refs/heads/master Commit: a298111485a872c3b4dd35363b2fbd50533a9b0f Parents: f4dbfed Author: Aaron McCurry <[email protected]> Authored: Thu Jan 15 16:25:24 2015 -0500 Committer: Aaron McCurry <[email protected]> Committed: Thu Jan 15 16:25:24 2015 -0500 ---------------------------------------------------------------------- .../org/apache/blur/thrift/BaseClusterTest.java | 69 ++++++++++---------- 1 file changed, 35 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a2981114/blur-core/src/test/java/org/apache/blur/thrift/BaseClusterTest.java ---------------------------------------------------------------------- diff --git a/blur-core/src/test/java/org/apache/blur/thrift/BaseClusterTest.java b/blur-core/src/test/java/org/apache/blur/thrift/BaseClusterTest.java index 5b5dd63..21287a3 100644 --- a/blur-core/src/test/java/org/apache/blur/thrift/BaseClusterTest.java +++ b/blur-core/src/test/java/org/apache/blur/thrift/BaseClusterTest.java @@ -1,4 +1,5 @@ package org.apache.blur.thrift; + /** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -23,41 +24,41 @@ import org.junit.AfterClass; import org.junit.BeforeClass; public class BaseClusterTest { - protected static String TABLE_PATH = new File("./target/tmp/test-data/test-tables").getAbsolutePath(); - private static boolean _managing; + protected static String TABLE_PATH = new File("./target/tmp/test-data/test-tables").getAbsolutePath(); + private static boolean _managing; + + @BeforeClass + public static void startup() throws IOException { + if (!SuiteCluster.isClusterSetup()) { + SuiteCluster.setupMiniCluster(); + _managing = true; + } + File file = new File("test-data"); + if (file.exists()) { + rmr(file); + } + } - @BeforeClass - public static void startup() throws IOException { - if (!SuiteCluster.isClusterSetup()) { - SuiteCluster.setupMiniCluster(); - _managing = true; - } - File file = new File("test-data"); - if (file.exists()) { - rmr(file); - } - } + private static void rmr(File file) { + if (!file.exists()) { + return; + } + if (file.isDirectory()) { + for (File f : file.listFiles()) { + rmr(f); + } + } + file.delete(); + } - private static void rmr(File file) { - if (!file.exists()) { - return; - } - if (file.isDirectory()) { - for (File f : file.listFiles()) { - rmr(f); - } - } - file.delete(); - } + @AfterClass + public static void shutdown() throws IOException { + if (_managing) { + SuiteCluster.shutdownMiniCluster(); + } + } - @AfterClass - public static void shutdown() throws IOException { - if (_managing) { - SuiteCluster.shutdownMiniCluster(); - } - } - - public Iface getClient() throws IOException { - return SuiteCluster.getClient(); - } + public Iface getClient() throws IOException { + return SuiteCluster.getClient(); + } }
