organize imports

Achim Brandt · Achim Brandt · commit 56b6f9991f12 · 2015-03-22T16:45:56.000+01:00
diff --git a/src/test/java/com/arangodb/ArangoBaseParameterTest.java b/src/test/java/com/arangodb/ArangoBaseParameterTest.java
@@ -1,7 +1,6 @@
 package com.arangodb;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.assertThat;
 
diff --git a/src/test/java/com/arangodb/ArangoConfigureTest.java b/src/test/java/com/arangodb/ArangoConfigureTest.java
@@ -25,14 +25,9 @@
 
 import java.net.SocketTimeoutException;
 
-import org.apache.http.conn.ConnectTimeoutException;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import com.arangodb.ArangoConfigure;
-import com.arangodb.ArangoDriver;
-import com.arangodb.ArangoException;
-
 /**
  * UnitTest for ArangoConfigure.
  * 
diff --git a/src/test/java/com/arangodb/ArangoDriverAdminTest.java b/src/test/java/com/arangodb/ArangoDriverAdminTest.java
@@ -26,9 +26,6 @@
 
 import org.junit.Test;
 
-import com.arangodb.ArangoConfigure;
-import com.arangodb.ArangoDriver;
-import com.arangodb.ArangoException;
 import com.arangodb.entity.AdminLogEntity;
 import com.arangodb.entity.ArangoUnixTime;
 import com.arangodb.entity.ArangoVersion;
diff --git a/src/test/java/com/arangodb/ArangoDriverAqlfunctionsTest.java b/src/test/java/com/arangodb/ArangoDriverAqlfunctionsTest.java
@@ -16,22 +16,20 @@
 
 package com.arangodb;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Iterator;
+
 import org.junit.After;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.arangodb.ArangoConfigure;
-import com.arangodb.ArangoDriver;
-import com.arangodb.ArangoException;
 import com.arangodb.entity.AqlFunctionsEntity;
 import com.arangodb.entity.DefaultEntity;
 
-import java.util.Iterator;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.*;
-
 /**
  * @author tamtam180 - kirscheless at gmail.com
  *
diff --git a/src/test/java/com/arangodb/ArangoDriverAsyncTest.java b/src/test/java/com/arangodb/ArangoDriverAsyncTest.java
@@ -16,20 +16,23 @@
 
 package com.arangodb;
 
-import com.arangodb.entity.*;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.arangodb.entity.AqlFunctionsEntity;
+import com.arangodb.entity.DefaultEntity;
+import com.arangodb.entity.DocumentEntity;
+import com.arangodb.entity.JobsEntity;
 
 /**
  * @author tamtam180 - kirscheless at gmail.com
diff --git a/src/test/java/com/arangodb/ArangoDriverAuthTest.java b/src/test/java/com/arangodb/ArangoDriverAuthTest.java
@@ -16,14 +16,13 @@
 
 package com.arangodb;
 
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
 
 import org.junit.Test;
 
-import com.arangodb.ArangoConfigure;
-import com.arangodb.ArangoDriver;
-import com.arangodb.ArangoException;
 import com.arangodb.entity.ArangoUnixTime;
 
 /**
diff --git a/src/test/java/com/arangodb/ArangoDriverBatchTest.java b/src/test/java/com/arangodb/ArangoDriverBatchTest.java
@@ -16,21 +16,19 @@
 
 package com.arangodb;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.util.List;
+
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
-import com.arangodb.ArangoConfigure;
-import com.arangodb.ArangoDriver;
-import com.arangodb.ArangoException;
-import com.arangodb.entity.*;
-
-import java.util.Iterator;
-import java.util.List;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.*;
+import com.arangodb.entity.AqlFunctionsEntity;
+import com.arangodb.entity.BaseEntity;
+import com.arangodb.entity.DefaultEntity;
+import com.arangodb.entity.DocumentEntity;
 
 /**
  * @author tamtam180 - kirscheless at gmail.com
diff --git a/src/test/java/com/arangodb/ArangoDriverCollectionTest.java b/src/test/java/com/arangodb/ArangoDriverCollectionTest.java
@@ -231,7 +231,7 @@ public void test_create_dup() throws ArangoException {
 
     {
       try {
-        CollectionEntity res = driver.createCollection(collectionName);
+        driver.createCollection(collectionName);
         fail("ここに来てはダメー！");
       } catch (ArangoException e) {
         assertThat(e.getCode(), is(409));
diff --git a/src/test/java/com/arangodb/ArangoDriverCursorResultSetTest.java b/src/test/java/com/arangodb/ArangoDriverCursorResultSetTest.java
@@ -24,10 +24,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.arangodb.ArangoConfigure;
-import com.arangodb.ArangoDriver;
-import com.arangodb.ArangoException;
-import com.arangodb.CursorResultSet;
 import com.arangodb.util.MapBuilder;
 
 /**
diff --git a/src/test/java/com/arangodb/ArangoDriverCursorTest.java b/src/test/java/com/arangodb/ArangoDriverCursorTest.java
@@ -16,17 +16,16 @@
 
 package com.arangodb;
 
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
 
 import java.util.Map;
 
 import org.junit.Ignore;
 import org.junit.Test;
 
-import com.arangodb.ArangoConfigure;
-import com.arangodb.ArangoDriver;
-import com.arangodb.ArangoException;
 import com.arangodb.entity.CursorEntity;
 import com.arangodb.entity.DefaultEntity;
 import com.arangodb.util.MapBuilder;
diff --git a/src/test/java/com/arangodb/ArangoDriverDatabaseAndUserTest.java b/src/test/java/com/arangodb/ArangoDriverDatabaseAndUserTest.java
@@ -16,21 +16,17 @@
 
 package com.arangodb;
 
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
 
 import java.util.Arrays;
-import java.util.Collections;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.arangodb.ArangoConfigure;
-import com.arangodb.ArangoDriver;
-import com.arangodb.ArangoException;
 import com.arangodb.entity.BooleanResultEntity;
-import com.arangodb.entity.DatabaseEntity;
 import com.arangodb.entity.StringsResultEntity;
 import com.arangodb.entity.UserEntity;
 import com.arangodb.util.MapBuilder;
diff --git a/src/test/java/com/arangodb/ArangoDriverDatabaseTest.java b/src/test/java/com/arangodb/ArangoDriverDatabaseTest.java
@@ -22,15 +22,11 @@
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 
-import java.util.Arrays;
 import java.util.Collections;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import com.arangodb.ArangoConfigure;
-import com.arangodb.ArangoDriver;
-import com.arangodb.ArangoException;
 import com.arangodb.entity.BooleanResultEntity;
 import com.arangodb.entity.DatabaseEntity;
 import com.arangodb.entity.StringsResultEntity;
diff --git a/src/test/java/com/arangodb/ArangoDriverDocumentKeyTest.java b/src/test/java/com/arangodb/ArangoDriverDocumentKeyTest.java
@@ -16,8 +16,11 @@
 
 package com.arangodb;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
 
 import java.util.Map;
 
@@ -26,9 +29,6 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.arangodb.ArangoConfigure;
-import com.arangodb.ArangoDriver;
-import com.arangodb.ArangoException;
 import com.arangodb.annotations.DocumentKey;
 import com.arangodb.entity.DocumentEntity;
 
diff --git a/src/test/java/com/arangodb/ArangoDriverEdgeTest.java b/src/test/java/com/arangodb/ArangoDriverEdgeTest.java
@@ -16,25 +16,15 @@
 
 package com.arangodb;
 
-import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.CoreMatchers.nullValue;
 import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
-
-import java.util.Arrays;
-import java.util.Set;
-import java.util.TreeSet;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import com.arangodb.entity.CollectionEntity;
 import com.arangodb.entity.DocumentEntity;
 import com.arangodb.entity.EdgeEntity;
 
diff --git a/src/test/java/com/arangodb/ArangoDriverEndpointTest.java b/src/test/java/com/arangodb/ArangoDriverEndpointTest.java
@@ -16,19 +16,16 @@
 
 package com.arangodb;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 import java.util.TreeMap;
 
 import org.junit.Test;
 
-import com.arangodb.ArangoConfigure;
-import com.arangodb.ArangoDriver;
-import com.arangodb.ArangoException;
 import com.arangodb.entity.BooleanResultEntity;
 import com.arangodb.entity.Endpoint;
 
diff --git a/src/test/java/com/arangodb/ArangoDriverImportTest.java b/src/test/java/com/arangodb/ArangoDriverImportTest.java
@@ -16,8 +16,9 @@
 
 package com.arangodb;
 
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -26,9 +27,6 @@
 
 import org.junit.Test;
 
-import com.arangodb.ArangoConfigure;
-import com.arangodb.ArangoDriver;
-import com.arangodb.ArangoException;
 import com.arangodb.entity.ImportResultEntity;
 import com.arangodb.util.TestUtils;
 
diff --git a/src/test/java/com/arangodb/ArangoDriverIndexTest.java b/src/test/java/com/arangodb/ArangoDriverIndexTest.java
@@ -32,10 +32,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.arangodb.ArangoConfigure;
-import com.arangodb.ArangoDriver;
-import com.arangodb.ArangoException;
-import com.arangodb.ErrorNums;
 import com.arangodb.entity.CollectionEntity;
 import com.arangodb.entity.IndexEntity;
 import com.arangodb.entity.IndexType;
diff --git a/src/test/java/com/arangodb/ArangoDriverKeyValueTest.java b/src/test/java/com/arangodb/ArangoDriverKeyValueTest.java
@@ -16,22 +16,7 @@
 
 package com.arangodb;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
-
-import java.util.Date;
-
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Ignore;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.arangodb.ArangoConfigure;
-import com.arangodb.ArangoDriver;
-import com.arangodb.ArangoException;
-import com.arangodb.util.MapBuilder;
 
 /**
  * @author tamtam180 - kirscheless at gmail.com
diff --git a/src/test/java/com/arangodb/ArangoDriverReplicationTest.java b/src/test/java/com/arangodb/ArangoDriverReplicationTest.java
@@ -30,17 +30,14 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
-import com.arangodb.ArangoConfigure;
-import com.arangodb.ArangoDriver;
-import com.arangodb.ArangoException;
 import com.arangodb.entity.ReplicationApplierConfigEntity;
 import com.arangodb.entity.ReplicationApplierStateEntity;
 import com.arangodb.entity.ReplicationDumpHeader;
 import com.arangodb.entity.ReplicationDumpRecord;
 import com.arangodb.entity.ReplicationInventoryEntity;
+import com.arangodb.entity.ReplicationInventoryEntity.Collection;
 import com.arangodb.entity.ReplicationLoggerConfigEntity;
 import com.arangodb.entity.ReplicationLoggerStateEntity;
-import com.arangodb.entity.ReplicationInventoryEntity.Collection;
 import com.arangodb.util.DumpHandler;
 import com.arangodb.util.DumpHandlerAdapter;
 import com.google.gson.Gson;
diff --git a/src/test/java/com/arangodb/ArangoDriverReplicationTestScenario1.java b/src/test/java/com/arangodb/ArangoDriverReplicationTestScenario1.java
@@ -33,9 +33,6 @@
 import org.junit.Ignore;
 import org.junit.Test;
 
-import com.arangodb.ArangoConfigure;
-import com.arangodb.ArangoDriver;
-import com.arangodb.ArangoException;
 import com.arangodb.entity.BooleanResultEntity;
 import com.arangodb.entity.CollectionEntity;
 import com.arangodb.entity.DocumentEntity;
diff --git a/src/test/java/com/arangodb/ArangoDriverSimpleGeoTest.java b/src/test/java/com/arangodb/ArangoDriverSimpleGeoTest.java
@@ -22,9 +22,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import com.arangodb.ArangoConfigure;
-import com.arangodb.ArangoDriver;
-import com.arangodb.ArangoException;
 import com.arangodb.entity.IndexType;
 import com.arangodb.util.TestUtils;
 
diff --git a/src/test/java/com/arangodb/ArangoDriverSimpleTest.java b/src/test/java/com/arangodb/ArangoDriverSimpleTest.java
diff --git a/src/test/java/com/arangodb/ArangoDriverThreadSafeTest.java b/src/test/java/com/arangodb/ArangoDriverThreadSafeTest.java
diff --git a/src/test/java/com/arangodb/ArangoDriverTransactionTest.java b/src/test/java/com/arangodb/ArangoDriverTransactionTest.java
diff --git a/src/test/java/com/arangodb/ArangoDriverUsersTest.java b/src/test/java/com/arangodb/ArangoDriverUsersTest.java
diff --git a/src/test/java/com/arangodb/BaseDocumentTest.java b/src/test/java/com/arangodb/BaseDocumentTest.java
diff --git a/src/test/java/com/arangodb/NegativeTest.java b/src/test/java/com/arangodb/NegativeTest.java
diff --git a/src/test/java/com/arangodb/PrimitiveDocumentTest.java b/src/test/java/com/arangodb/PrimitiveDocumentTest.java

Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ public void test_create_dup() throws ArangoException {`
`231`	`231`
`232`	`232`	`{`
`233`	`233`	`try {`
`234`		`- CollectionEntity res = driver.createCollection(collectionName);`
	`234`	`+ driver.createCollection(collectionName);`
`235`	`235`	`fail("ここに来てはダメー！");`
`236`	`236`	`} catch (ArangoException e) {`
`237`	`237`	`assertThat(e.getCode(), is(409));`