try to unflake DocLevelCollectTest

crate · Mar 3, 2015 · 0704bd1 · 0704bd1
1 parent 79c9760
commit 0704bd1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/sql/src/main/java/io/crate/executor/Task.java b/sql/src/main/java/io/crate/executor/Task.java
@@ -24,7 +24,6 @@
 import com.google.common.util.concurrent.ListenableFuture;
 
 import java.util.List;
-import java.util.UUID;
 
 /**
  * A task gets executed as part of or in the context of a

diff --git a/sql/src/test/java/io/crate/operation/collect/DocLevelCollectTest.java b/sql/src/test/java/io/crate/operation/collect/DocLevelCollectTest.java
@@ -42,6 +42,7 @@
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.cluster.routing.ShardRouting;
 import org.hamcrest.core.IsNull;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -113,6 +114,13 @@ public void prepare() {
         refresh();
     }
 
+    @After
+    public void cleanUp() {
+        operation = null;
+        functions = null;
+        docSchemaInfo = null;
+    }
+
     private Routing routing(String table) {
         Map<String, Map<String, Set<Integer>>> locations = new HashMap<>();
 

diff --git a/sql/src/test/java/io/crate/operation/reference/doc/FloatColumnReferenceTest.java b/sql/src/test/java/io/crate/operation/reference/doc/FloatColumnReferenceTest.java
@@ -35,7 +35,6 @@
 import org.elasticsearch.index.mapper.FieldMapper;
 import org.junit.Test;
 
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 
 public class FloatColumnReferenceTest extends DocLevelExpressionsTest {

diff --git a/testing/src/main/java/io/crate/test/integration/CrateSingleNodeTest.java b/testing/src/main/java/io/crate/test/integration/CrateSingleNodeTest.java
@@ -31,7 +31,6 @@
 
 public class CrateSingleNodeTest extends ElasticsearchSingleNodeTest {
 
-
     @Override
     @After
     public void tearDown() throws Exception {