Moved Java test classes into src/test/java

.gitignore

@@ -34,6 +34,8 @@ package/
 tags
 
 java/out
+java/target
+java/test-libs
 java/*.log
 java/include/org_rocksdb_*.h
 

java/Makefile

@@ -36,12 +36,13 @@ NATIVE_JAVA_CLASSES = org.rocksdb.AbstractComparator\
 	org.rocksdb.StringAppendOperator\
 	org.rocksdb.WriteBatch\
 	org.rocksdb.WriteBatch.Handler\
-	org.rocksdb.test.WriteBatchInternal\
-	org.rocksdb.test.WriteBatchTest\
 	org.rocksdb.WriteOptions\
 	org.rocksdb.WriteBatchWithIndex\
 	org.rocksdb.WBWIRocksIterator
 
+NATIVE_JAVA_TEST_CLASSES = org.rocksdb.WriteBatchTest\
+    org.rocksdb.WriteBatchTestInternalHelper
+
 ROCKSDB_MAJOR = $(shell egrep "ROCKSDB_MAJOR.[0-9]" ../include/rocksdb/version.h | cut -d ' ' -f 3)
 ROCKSDB_MINOR = $(shell egrep "ROCKSDB_MINOR.[0-9]" ../include/rocksdb/version.h | cut -d ' ' -f 3)
 ROCKSDB_PATCH = $(shell egrep "ROCKSDB_PATCH.[0-9]" ../include/rocksdb/version.h | cut -d ' ' -f 3)
@@ -53,43 +54,49 @@ ifeq ($(PLATFORM), OS_MACOSX)
 ROCKSDB_JAR = rocksdbjni-$(ROCKSDB_MAJOR).$(ROCKSDB_MINOR).$(ROCKSDB_PATCH)-osx.jar
 endif
 
-JAVA_TESTS = org.rocksdb.test.BackupableDBOptionsTest\
+JAVA_TESTS = org.rocksdb.BackupableDBOptionsTest\
-        org.rocksdb.test.BackupableDBTest\
+	org.rocksdb.BackupableDBTest\
-		org.rocksdb.test.BlockBasedTableConfigTest\
+	org.rocksdb.BlockBasedTableConfigTest\
-		org.rocksdb.test.CheckPointTest\
+	org.rocksdb.CheckPointTest\
-		org.rocksdb.test.ColumnFamilyOptionsTest\
+	org.rocksdb.ColumnFamilyOptionsTest\
-		org.rocksdb.test.ColumnFamilyTest\
+	org.rocksdb.ColumnFamilyTest\
-		org.rocksdb.test.ComparatorOptionsTest\
+	org.rocksdb.ComparatorOptionsTest\
-		org.rocksdb.test.ComparatorTest\
+	org.rocksdb.ComparatorTest\
-		org.rocksdb.test.CompressionOptionsTest\
+	org.rocksdb.CompressionOptionsTest\
-		org.rocksdb.test.DBOptionsTest\
+	org.rocksdb.DBOptionsTest\
-		org.rocksdb.test.DirectComparatorTest\
+	org.rocksdb.DirectComparatorTest\
-		org.rocksdb.test.DirectSliceTest\
+	org.rocksdb.DirectSliceTest\
-		org.rocksdb.test.EnvironmentTest\
+	org.rocksdb.util.EnvironmentTest\
-		org.rocksdb.test.FilterTest\
+	org.rocksdb.FilterTest\
-		org.rocksdb.test.FlushTest\
+	org.rocksdb.FlushTest\
-		org.rocksdb.test.InfoLogLevelTest\
+	org.rocksdb.InfoLogLevelTest\
-		org.rocksdb.test.KeyMayExistTest\
+	org.rocksdb.KeyMayExistTest\
-		org.rocksdb.test.MemTableTest\
+	org.rocksdb.MemTableTest\
-		org.rocksdb.test.MergeTest\
+	org.rocksdb.MergeTest\
-		org.rocksdb.test.MixedOptionsTest\
+	org.rocksdb.MixedOptionsTest\
-		org.rocksdb.test.OptionsTest\
+	org.rocksdb.OptionsTest\
-		org.rocksdb.test.PlainTableConfigTest\
+	org.rocksdb.PlainTableConfigTest\
-		org.rocksdb.test.ReadOnlyTest\
+	org.rocksdb.ReadOnlyTest\
-		org.rocksdb.test.ReadOptionsTest\
+	org.rocksdb.ReadOptionsTest\
-		org.rocksdb.test.RocksDBTest\
+	org.rocksdb.RocksDBTest\
-		org.rocksdb.test.RocksEnvTest\
+	org.rocksdb.RocksEnvTest\
-		org.rocksdb.test.RocksIteratorTest\
+	org.rocksdb.RocksIteratorTest\
-		org.rocksdb.test.SizeUnitTest\
+	org.rocksdb.util.SizeUnitTest\
-		org.rocksdb.test.SliceTest\
+	org.rocksdb.SliceTest\
-		org.rocksdb.test.SnapshotTest\
+	org.rocksdb.SnapshotTest\
-		org.rocksdb.test.TransactionLogIteratorTest\
+	org.rocksdb.TransactionLogIteratorTest\
-		org.rocksdb.test.TtlDBTest\
+	org.rocksdb.TtlDBTest\
-		org.rocksdb.test.StatisticsCollectorTest\
+	org.rocksdb.StatisticsCollectorTest\
-		org.rocksdb.test.WriteBatchHandlerTest\
+	org.rocksdb.WriteBatchHandlerTest\
-		org.rocksdb.test.WriteBatchTest\
+	org.rocksdb.WriteBatchTest\
-		org.rocksdb.test.WriteOptionsTest\
+	org.rocksdb.WriteOptionsTest\
-		org.rocksdb.test.WriteBatchWithIndexTest
+	org.rocksdb.WriteBatchWithIndexTest
+
+TEST_SRC = src/test/java
+OUTPUT = target
+# TODO update after moving main classes
+MAIN_CLASSES = .
+TEST_CLASSES = $(OUTPUT)/test-classes
 
 JAVA_TEST_LIBDIR = ./test-libs/
 JAVA_JUNIT_JAR = $(JAVA_TEST_LIBDIR)junit-4.12-beta-2.jar
@@ -97,14 +104,14 @@ JAVA_HAMCR_JAR = $(JAVA_TEST_LIBDIR)hamcrest-core-1.3.jar
 JAVA_MOCKITO_JAR = $(JAVA_TEST_LIBDIR)mockito-all-1.9.5.jar
 JAVA_CGLIB_JAR = $(JAVA_TEST_LIBDIR)cglib-2.2.2.jar
 JAVA_ASSERTJ_JAR = $(JAVA_TEST_LIBDIR)assertj-core-1.7.0.jar
-JAVA_TESTCLASSPATH = $(ROCKSDB_JAR):$(JAVA_JUNIT_JAR):$(JAVA_HAMCR_JAR):$(JAVA_MOCKITO_JAR):$(JAVA_CGLIB_JAR):$(JAVA_ASSERTJ_JAR):.:./*
+JAVA_TESTCLASSPATH = $(JAVA_JUNIT_JAR):$(JAVA_HAMCR_JAR):$(JAVA_MOCKITO_JAR):$(JAVA_CGLIB_JAR):$(JAVA_ASSERTJ_JAR):.:./*
 
 clean:
 	-find . -name "*.class" -exec rm {} \;
 	rm -rf include/*
 	rm -rf javadoc/*
 	rm -rf test-libs/
-	rm -rf target
+	rm -rf $(OUTPUT)
 	rm -rf librocksdbjni*
 	rm -f rocksdbjni*
 
@@ -112,11 +119,10 @@ clean:
 javadocs:
 	mkdir -p javadoc; javadoc -d javadoc -sourcepath . -subpackages org -exclude org.rocksdb.test
 
-javalib: java javadocs
+javalib: java java_test javadocs
 
-java: resolve_test_deps
+java:
 	javac org/rocksdb/util/*.java org/rocksdb/*.java
-	javac -cp $(JAVA_TESTCLASSPATH) org/rocksdb/test/*.java
 	@cp ../HISTORY.md ./HISTORY-CPP.md
 	@rm -f ./HISTORY-CPP.md
 	javah -d $(NATIVE_INCLUDE) -jni $(NATIVE_JAVA_CLASSES)
@@ -143,8 +149,15 @@ resolve_test_deps:
 	test -s "$(JAVA_CGLIB_JAR)" || curl -k -L -o "$(JAVA_CGLIB_JAR)" http://search.maven.org/remotecontent?filepath=cglib/cglib/2.2.2/cglib-2.2.2.jar
 	test -s "$(JAVA_ASSERTJ_JAR)" || curl -k -L -o "$(JAVA_ASSERTJ_JAR)" http://central.maven.org/maven2/org/assertj/assertj-core/1.7.0/assertj-core-1.7.0.jar
 
-test: java resolve_test_deps
+java_test: resolve_test_deps
-	java -ea -Xcheck:jni -Djava.library.path=.:../ -cp "$(JAVA_TESTCLASSPATH)" org.rocksdb.test.RocksJunitRunner $(JAVA_TESTS)
+	mkdir -p $(TEST_CLASSES)
+	javac -cp $(MAIN_CLASSES):$(JAVA_TESTCLASSPATH) -d $(TEST_CLASSES) $(TEST_SRC)/org/rocksdb/*.java
+	javac -cp $(MAIN_CLASSES):$(JAVA_TESTCLASSPATH) -d $(TEST_CLASSES) $(TEST_SRC)/org/rocksdb/test/*.java
+	javac -cp $(MAIN_CLASSES):$(JAVA_TESTCLASSPATH) -d $(TEST_CLASSES) $(TEST_SRC)/org/rocksdb/util/*.java
+	javah -cp $(MAIN_CLASSES):$(TEST_CLASSES) -d $(NATIVE_INCLUDE) -jni $(NATIVE_JAVA_TEST_CLASSES)
+
+test: java resolve_test_deps java_test
+	java -ea -Xcheck:jni -Djava.library.path=.:../ -cp "$(MAIN_CLASSES):$(TEST_CLASSES):$(JAVA_TESTCLASSPATH)" org.rocksdb.test.RocksJunitRunner $(JAVA_TESTS)
 
 db_bench: java
 	javac org/rocksdb/benchmark/*.java

java/rocksjni/write_batch.cc

@@ -9,8 +9,6 @@
 
 #include "include/org_rocksdb_WriteBatch.h"
 #include "include/org_rocksdb_WriteBatch_Handler.h"
-#include "include/org_rocksdb_test_WriteBatchInternal.h"
-#include "include/org_rocksdb_test_WriteBatchTest.h"
 #include "rocksjni/portal.h"
 #include "rocksjni/writebatchhandlerjnicallback.h"
 #include "rocksdb/db.h"
@@ -217,48 +215,6 @@ void Java_org_rocksdb_WriteBatch_disposeInternal(
   delete reinterpret_cast<rocksdb::WriteBatch*>(handle);
 }
 
-/*
- * Class:     org_rocksdb_test_WriteBatchInternal
- * Method:    setSequence
- * Signature: (Lorg/rocksdb/WriteBatch;J)V
- */
-void Java_org_rocksdb_test_WriteBatchInternal_setSequence(
-    JNIEnv* env, jclass jclazz, jobject jobj, jlong jsn) {
-  rocksdb::WriteBatch* wb = rocksdb::WriteBatchJni::getHandle(env, jobj);
-  assert(wb != nullptr);
-
-  rocksdb::WriteBatchInternal::SetSequence(
-      wb, static_cast<rocksdb::SequenceNumber>(jsn));
-}
-
-/*
- * Class:     org_rocksdb_test_WriteBatchInternal
- * Method:    sequence
- * Signature: (Lorg/rocksdb/WriteBatch;)J
- */
-jlong Java_org_rocksdb_test_WriteBatchInternal_sequence(
-    JNIEnv* env, jclass jclazz, jobject jobj) {
-  rocksdb::WriteBatch* wb = rocksdb::WriteBatchJni::getHandle(env, jobj);
-  assert(wb != nullptr);
-
-  return static_cast<jlong>(rocksdb::WriteBatchInternal::Sequence(wb));
-}
-
-/*
- * Class:     org_rocksdb_test_WriteBatchInternal
- * Method:    append
- * Signature: (Lorg/rocksdb/WriteBatch;Lorg/rocksdb/WriteBatch;)V
- */
-void Java_org_rocksdb_test_WriteBatchInternal_append(
-    JNIEnv* env, jclass jclazz, jobject jwb1, jobject jwb2) {
-  rocksdb::WriteBatch* wb1 = rocksdb::WriteBatchJni::getHandle(env, jwb1);
-  assert(wb1 != nullptr);
-  rocksdb::WriteBatch* wb2 = rocksdb::WriteBatchJni::getHandle(env, jwb2);
-  assert(wb2 != nullptr);
-
-  rocksdb::WriteBatchInternal::Append(wb1, wb2);
-}
-
 /*
  * Class:     org_rocksdb_WriteBatch_Handler
  * Method:    createNewHandler0
@@ -280,83 +236,3 @@ void Java_org_rocksdb_WriteBatch_00024Handler_disposeInternal(
     JNIEnv* env, jobject jobj, jlong handle) {
   delete reinterpret_cast<rocksdb::WriteBatchHandlerJniCallback*>(handle);
 }
-
-/*
- * Class:     org_rocksdb_test_WriteBatchTest
- * Method:    getContents
- * Signature: (Lorg/rocksdb/WriteBatch;)[B
- */
-jbyteArray Java_org_rocksdb_test_WriteBatchTest_getContents(
-    JNIEnv* env, jclass jclazz, jobject jobj) {
-  rocksdb::WriteBatch* b = rocksdb::WriteBatchJni::getHandle(env, jobj);
-  assert(b != nullptr);
-
-  // todo: Currently the following code is directly copied from
-  // db/write_bench_test.cc.  It could be implemented in java once
-  // all the necessary components can be accessed via jni api.
-
-  rocksdb::InternalKeyComparator cmp(rocksdb::BytewiseComparator());
-  auto factory = std::make_shared<rocksdb::SkipListFactory>();
-  rocksdb::Options options;
-  rocksdb::WriteBuffer wb(options.db_write_buffer_size);
-  options.memtable_factory = factory;
-  rocksdb::MemTable* mem = new rocksdb::MemTable(
-      cmp, rocksdb::ImmutableCFOptions(options),
-      rocksdb::MutableCFOptions(options, rocksdb::ImmutableCFOptions(options)),
-      &wb);
-  mem->Ref();
-  std::string state;
-  rocksdb::ColumnFamilyMemTablesDefault cf_mems_default(mem);
-  rocksdb::Status s =
-      rocksdb::WriteBatchInternal::InsertInto(b, &cf_mems_default);
-  int count = 0;
-  rocksdb::Arena arena;
-  rocksdb::ScopedArenaIterator iter(mem->NewIterator(
-      rocksdb::ReadOptions(), &arena));
-  for (iter->SeekToFirst(); iter->Valid(); iter->Next()) {
-    rocksdb::ParsedInternalKey ikey;
-    memset(reinterpret_cast<void*>(&ikey), 0, sizeof(ikey));
-    ASSERT_TRUE(rocksdb::ParseInternalKey(iter->key(), &ikey));
-    switch (ikey.type) {
-      case rocksdb::kTypeValue:
-        state.append("Put(");
-        state.append(ikey.user_key.ToString());
-        state.append(", ");
-        state.append(iter->value().ToString());
-        state.append(")");
-        count++;
-        break;
-      case rocksdb::kTypeMerge:
-        state.append("Merge(");
-        state.append(ikey.user_key.ToString());
-        state.append(", ");
-        state.append(iter->value().ToString());
-        state.append(")");
-        count++;
-        break;
-      case rocksdb::kTypeDeletion:
-        state.append("Delete(");
-        state.append(ikey.user_key.ToString());
-        state.append(")");
-        count++;
-        break;
-      default:
-        assert(false);
-        break;
-    }
-    state.append("@");
-    state.append(rocksdb::NumberToString(ikey.sequence));
-  }
-  if (!s.ok()) {
-    state.append(s.ToString());
-  } else if (count != rocksdb::WriteBatchInternal::Count(b)) {
-    state.append("CountMismatch()");
-  }
-  delete mem->Unref();
-
-  jbyteArray jstate = env->NewByteArray(static_cast<jsize>(state.size()));
-  env->SetByteArrayRegion(jstate, 0, static_cast<jsize>(state.size()),
-                          reinterpret_cast<const jbyte*>(state.c_str()));
-
-  return jstate;
-}

java/rocksjni/write_batch_test.cc

@@ -0,0 +1,148 @@
+// Copyright (c) 2014, Facebook, Inc.  All rights reserved.
+// This source code is licensed under the BSD-style license found in the
+// LICENSE file in the root directory of this source tree. An additional grant
+// of patent rights can be found in the PATENTS file in the same directory.
+//
+// This file implements the "bridge" between Java and C++ and enables
+// calling c++ rocksdb::WriteBatch methods testing from Java side.
+#include <memory>
+
+#include "db/memtable.h"
+#include "db/write_batch_internal.h"
+#include "db/writebuffer.h"
+#include "include/org_rocksdb_WriteBatch.h"
+#include "include/org_rocksdb_WriteBatch_Handler.h"
+#include "include/org_rocksdb_WriteBatchTest.h"
+#include "include/org_rocksdb_WriteBatchTestInternalHelper.h"
+#include "rocksdb/db.h"
+#include "rocksdb/env.h"
+#include "rocksdb/immutable_options.h"
+#include "rocksdb/memtablerep.h"
+#include "rocksdb/status.h"
+#include "rocksdb/write_batch.h"
+#include "rocksjni/portal.h"
+#include "util/logging.h"
+#include "util/scoped_arena_iterator.h"
+#include "util/testharness.h"
+
+/*
+ * Class:     org_rocksdb_WriteBatchTest
+ * Method:    getContents
+ * Signature: (Lorg/rocksdb/WriteBatch;)[B
+ */
+jbyteArray Java_org_rocksdb_WriteBatchTest_getContents(
+    JNIEnv* env, jclass jclazz, jobject jobj) {
+  rocksdb::WriteBatch* b = rocksdb::WriteBatchJni::getHandle(env, jobj);
+  assert(b != nullptr);
+
+  // todo: Currently the following code is directly copied from
+  // db/write_bench_test.cc.  It could be implemented in java once
+  // all the necessary components can be accessed via jni api.
+
+  rocksdb::InternalKeyComparator cmp(rocksdb::BytewiseComparator());
+  auto factory = std::make_shared<rocksdb::SkipListFactory>();
+  rocksdb::Options options;
+  rocksdb::WriteBuffer wb(options.db_write_buffer_size);
+  options.memtable_factory = factory;
+  rocksdb::MemTable* mem = new rocksdb::MemTable(
+      cmp, rocksdb::ImmutableCFOptions(options),
+      rocksdb::MutableCFOptions(options, rocksdb::ImmutableCFOptions(options)),
+      &wb);
+  mem->Ref();
+  std::string state;
+  rocksdb::ColumnFamilyMemTablesDefault cf_mems_default(mem);
+  rocksdb::Status s =
+      rocksdb::WriteBatchInternal::InsertInto(b, &cf_mems_default);
+  int count = 0;
+  rocksdb::Arena arena;
+  rocksdb::ScopedArenaIterator iter(mem->NewIterator(
+      rocksdb::ReadOptions(), &arena));
+  for (iter->SeekToFirst(); iter->Valid(); iter->Next()) {
+    rocksdb::ParsedInternalKey ikey;
+    memset(reinterpret_cast<void*>(&ikey), 0, sizeof(ikey));
+    ASSERT_TRUE(rocksdb::ParseInternalKey(iter->key(), &ikey));
+    switch (ikey.type) {
+      case rocksdb::kTypeValue:
+        state.append("Put(");
+        state.append(ikey.user_key.ToString());
+        state.append(", ");
+        state.append(iter->value().ToString());
+        state.append(")");
+        count++;
+        break;
+      case rocksdb::kTypeMerge:
+        state.append("Merge(");
+        state.append(ikey.user_key.ToString());
+        state.append(", ");
+        state.append(iter->value().ToString());
+        state.append(")");
+        count++;
+        break;
+      case rocksdb::kTypeDeletion:
+        state.append("Delete(");
+        state.append(ikey.user_key.ToString());
+        state.append(")");
+        count++;
+        break;
+      default:
+        assert(false);
+        break;
+    }
+    state.append("@");
+    state.append(rocksdb::NumberToString(ikey.sequence));
+  }
+  if (!s.ok()) {
+    state.append(s.ToString());
+  } else if (count != rocksdb::WriteBatchInternal::Count(b)) {
+    state.append("CountMismatch()");
+  }
+  delete mem->Unref();
+
+  jbyteArray jstate = env->NewByteArray(static_cast<jsize>(state.size()));
+  env->SetByteArrayRegion(jstate, 0, static_cast<jsize>(state.size()),
+                          reinterpret_cast<const jbyte*>(state.c_str()));
+
+  return jstate;
+}
+
+/*
+ * Class:     org_rocksdb_WriteBatchTestInternalHelper
+ * Method:    setSequence
+ * Signature: (Lorg/rocksdb/WriteBatch;J)V
+ */
+void Java_org_rocksdb_WriteBatchTestInternalHelper_setSequence(
+    JNIEnv* env, jclass jclazz, jobject jobj, jlong jsn) {
+  rocksdb::WriteBatch* wb = rocksdb::WriteBatchJni::getHandle(env, jobj);
+  assert(wb != nullptr);
+
+  rocksdb::WriteBatchInternal::SetSequence(
+      wb, static_cast<rocksdb::SequenceNumber>(jsn));
+}
+
+/*
+ * Class:     org_rocksdb_WriteBatchTestInternalHelper
+ * Method:    sequence
+ * Signature: (Lorg/rocksdb/WriteBatch;)J
+ */
+jlong Java_org_rocksdb_WriteBatchTestInternalHelper_sequence(
+    JNIEnv* env, jclass jclazz, jobject jobj) {
+  rocksdb::WriteBatch* wb = rocksdb::WriteBatchJni::getHandle(env, jobj);
+  assert(wb != nullptr);
+
+  return static_cast<jlong>(rocksdb::WriteBatchInternal::Sequence(wb));
+}
+
+/*
+ * Class:     org_rocksdb_WriteBatchTestInternalHelper
+ * Method:    append
+ * Signature: (Lorg/rocksdb/WriteBatch;Lorg/rocksdb/WriteBatch;)V
+ */
+void Java_org_rocksdb_WriteBatchTestInternalHelper_append(
+    JNIEnv* env, jclass jclazz, jobject jwb1, jobject jwb2) {
+  rocksdb::WriteBatch* wb1 = rocksdb::WriteBatchJni::getHandle(env, jwb1);
+  assert(wb1 != nullptr);
+  rocksdb::WriteBatch* wb2 = rocksdb::WriteBatchJni::getHandle(env, jwb2);
+  assert(wb2 != nullptr);
+
+  rocksdb::WriteBatchInternal::Append(wb1, wb2);
+}

java/src/test/java/org/rocksdb/AbstractComparatorTest.java

@@ -3,9 +3,7 @@
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
 
-package org.rocksdb.test;
+package org.rocksdb;
-
-import org.rocksdb.*;
 
 import java.io.IOException;
 import java.nio.file.*;
@@ -14,8 +12,8 @@ import java.util.List;
 import java.util.Random;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.rocksdb.test.Types.byteToInt;
+import static org.rocksdb.Types.byteToInt;
-import static org.rocksdb.test.Types.intToByte;
+import static org.rocksdb.Types.intToByte;
 
 /**
  * Abstract tests for both Comparator and DirectComparator

java/src/test/java/org/rocksdb/BackupableDBOptionsTest.java

@@ -3,13 +3,12 @@
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
 
-package org.rocksdb.test;
+package org.rocksdb;
 
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.rocksdb.BackupableDBOptions;
 
 import java.util.Random;
 

java/src/test/java/org/rocksdb/BackupableDBTest.java

@@ -3,13 +3,12 @@
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
 
-package org.rocksdb.test;
+package org.rocksdb;
 
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.rocksdb.*;
 
 import java.util.List;
 

java/src/test/java/org/rocksdb/BlockBasedTableConfigTest.java

@@ -3,11 +3,10 @@
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
 
-package org.rocksdb.test;
+package org.rocksdb;
 
 import org.junit.ClassRule;
 import org.junit.Test;
-import org.rocksdb.*;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

java/src/test/java/org/rocksdb/CheckPointTest.java

@@ -1,14 +1,10 @@
-package org.rocksdb.test;
+package org.rocksdb;
 
 
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.rocksdb.Checkpoint;
-import org.rocksdb.Options;
-import org.rocksdb.RocksDB;
-import org.rocksdb.RocksDBException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

java/src/test/java/org/rocksdb/ColumnFamilyOptionsTest.java

@@ -3,11 +3,10 @@
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
 
-package org.rocksdb.test;
+package org.rocksdb;
 
 import org.junit.ClassRule;
 import org.junit.Test;
-import org.rocksdb.*;
 
 import java.util.Properties;
 import java.util.Random;

java/src/test/java/org/rocksdb/ColumnFamilyTest.java

@@ -3,7 +3,7 @@
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
 
-package org.rocksdb.test;
+package org.rocksdb;
 
 import java.util.HashMap;
 import java.util.List;
@@ -14,7 +14,6 @@ import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.rocksdb.*;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

java/src/test/java/org/rocksdb/ComparatorOptionsTest.java

@@ -3,11 +3,10 @@
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
 
-package org.rocksdb.test;
+package org.rocksdb;
 
 import org.junit.ClassRule;
 import org.junit.Test;
-import org.rocksdb.ComparatorOptions;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

java/src/test/java/org/rocksdb/ComparatorTest.java

@@ -3,13 +3,12 @@
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
 
-package org.rocksdb.test;
+package org.rocksdb;
 
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.rocksdb.*;
 
 import java.io.IOException;
 import java.nio.file.FileSystems;

java/src/test/java/org/rocksdb/CompressionOptionsTest.java

@@ -3,10 +3,9 @@
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
 
-package org.rocksdb.test;
+package org.rocksdb;
 
 import org.junit.Test;
-import org.rocksdb.CompressionType;
 
 
 public class CompressionOptionsTest

java/src/test/java/org/rocksdb/DBOptionsTest.java

@@ -3,11 +3,10 @@
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
 
-package org.rocksdb.test;
+package org.rocksdb;
 
 import org.junit.ClassRule;
 import org.junit.Test;
-import org.rocksdb.*;
 
 import java.util.Properties;
 import java.util.Random;

java/src/test/java/org/rocksdb/DirectComparatorTest.java

@@ -3,13 +3,12 @@
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
 
-package org.rocksdb.test;
+package org.rocksdb;
 
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.rocksdb.*;
 
 import java.io.IOException;
 import java.nio.file.FileSystems;

java/src/test/java/org/rocksdb/DirectSliceTest.java

@@ -2,11 +2,10 @@
 // This source code is licensed under the BSD-style license found in the
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
-package org.rocksdb.test;
+package org.rocksdb;
 
 import org.junit.ClassRule;
 import org.junit.Test;
-import org.rocksdb.DirectSlice;
 
 import java.nio.ByteBuffer;
 

java/src/test/java/org/rocksdb/FilterTest.java

@@ -3,11 +3,10 @@
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
 
-package org.rocksdb.test;
+package org.rocksdb;
 
 import org.junit.ClassRule;
 import org.junit.Test;
-import org.rocksdb.*;
 
 public class FilterTest {
 

java/src/test/java/org/rocksdb/FlushTest.java

@@ -2,13 +2,12 @@
 // This source code is licensed under the BSD-style license found in the
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
-package org.rocksdb.test;
+package org.rocksdb;
 
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.rocksdb.*;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

java/src/test/java/org/rocksdb/InfoLogLevelTest.java

@@ -1,10 +1,9 @@
-package org.rocksdb.test;
+package org.rocksdb;
 
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.rocksdb.*;
 
 import java.io.IOException;
 

java/src/test/java/org/rocksdb/KeyMayExistTest.java

@@ -2,13 +2,12 @@
 // This source code is licensed under the BSD-style license found in the
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
-package org.rocksdb.test;
+package org.rocksdb;
 
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.rocksdb.*;
 
 import java.util.ArrayList;
 import java.util.List;

java/src/test/java/org/rocksdb/MemTableTest.java

@@ -3,11 +3,10 @@
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
 
-package org.rocksdb.test;
+package org.rocksdb;
 
 import org.junit.ClassRule;
 import org.junit.Test;
-import org.rocksdb.*;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

java/src/test/java/org/rocksdb/MergeTest.java

@@ -3,7 +3,7 @@
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
 
-package org.rocksdb.test;
+package org.rocksdb;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -12,7 +12,6 @@ import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.rocksdb.*;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

java/src/test/java/org/rocksdb/MixedOptionsTest.java

@@ -3,11 +3,10 @@
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
 
-package org.rocksdb.test;
+package org.rocksdb;
 
 import org.junit.ClassRule;
 import org.junit.Test;
-import org.rocksdb.*;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

java/src/test/java/org/rocksdb/OptionsTest.java

@@ -3,12 +3,11 @@
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
 
-package org.rocksdb.test;
+package org.rocksdb;
 
 import java.util.Random;
 import org.junit.ClassRule;
 import org.junit.Test;
-import org.rocksdb.*;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

java/src/test/java/org/rocksdb/PlainTableConfigTest.java

@@ -3,13 +3,10 @@
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
 
-package org.rocksdb.test;
+package org.rocksdb;
 
 import org.junit.ClassRule;
 import org.junit.Test;
-import org.rocksdb.EncodingType;
-import org.rocksdb.Options;
-import org.rocksdb.PlainTableConfig;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

java/src/test/java/org/rocksdb/PlatformRandomHelper.java

@@ -3,7 +3,7 @@
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
 
-package org.rocksdb.test;
+package org.rocksdb;
 
 import java.util.Random;
 

java/src/test/java/org/rocksdb/ReadOnlyTest.java

@@ -2,13 +2,12 @@
 // This source code is licensed under the BSD-style license found in the
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
-package org.rocksdb.test;
+package org.rocksdb;
 
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.rocksdb.*;
 
 import java.util.ArrayList;
 import java.util.List;

java/src/test/java/org/rocksdb/ReadOptionsTest.java

@@ -3,7 +3,7 @@
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
 
-package org.rocksdb.test;
+package org.rocksdb;
 
 import java.util.Random;
 
@@ -11,7 +11,6 @@ import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.rocksdb.ReadOptions;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

java/src/test/java/org/rocksdb/RocksDBTest.java

@@ -2,13 +2,12 @@
 // This source code is licensed under the BSD-style license found in the
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
-package org.rocksdb.test;
+package org.rocksdb;
 
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.rocksdb.*;
 
 import java.util.ArrayList;
 import java.util.List;

java/src/test/java/org/rocksdb/RocksEnvTest.java

@@ -3,11 +3,10 @@
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
 
-package org.rocksdb.test;
+package org.rocksdb;
 
 import org.junit.ClassRule;
 import org.junit.Test;
-import org.rocksdb.RocksEnv;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

java/src/test/java/org/rocksdb/RocksIteratorTest.java

@@ -2,16 +2,12 @@
 // This source code is licensed under the BSD-style license found in the
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
-package org.rocksdb.test;
+package org.rocksdb;
 
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.rocksdb.Options;
-import org.rocksdb.RocksDB;
-import org.rocksdb.RocksDBException;
-import org.rocksdb.RocksIterator;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

java/src/test/java/org/rocksdb/RocksMemoryResource.java

@@ -1,7 +1,6 @@
-package org.rocksdb.test;
+package org.rocksdb;
 
 import org.junit.rules.ExternalResource;
-import org.rocksdb.RocksDB;
 
 /**
  * Resource to trigger garbage collection after each test

java/src/test/java/org/rocksdb/SliceTest.java

@@ -2,11 +2,10 @@
 // This source code is licensed under the BSD-style license found in the
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
-package org.rocksdb.test;
+package org.rocksdb;
 
 import org.junit.ClassRule;
 import org.junit.Test;
-import org.rocksdb.Slice;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

java/src/test/java/org/rocksdb/SnapshotTest.java

@@ -2,13 +2,12 @@
 // This source code is licensed under the BSD-style license found in the
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
-package org.rocksdb.test;
+package org.rocksdb;
 
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.rocksdb.*;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

java/src/test/java/org/rocksdb/StatisticsCollectorTest.java

@@ -3,7 +3,7 @@
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
 
-package org.rocksdb.test;
+package org.rocksdb;
 
 import java.util.Collections;
 
@@ -11,7 +11,6 @@ import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.rocksdb.*;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

java/src/test/java/org/rocksdb/StatsCallbackMock.java

@@ -3,9 +3,7 @@
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
 
-package org.rocksdb.test;
+package org.rocksdb;
-
-import org.rocksdb.*;
 
 public class StatsCallbackMock implements StatisticsCollectorCallback {
   public int tickerCallbackCount = 0;

java/src/test/java/org/rocksdb/TransactionLogIteratorTest.java

@@ -1,10 +1,9 @@
-package org.rocksdb.test;
+package org.rocksdb;
 
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.rocksdb.*;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

java/src/test/java/org/rocksdb/TtlDBTest.java

@@ -3,13 +3,12 @@
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
 
-package org.rocksdb.test;
+package org.rocksdb;
 
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.rocksdb.*;
 
 import java.util.ArrayList;
 import java.util.List;

java/src/test/java/org/rocksdb/Types.java

@@ -3,7 +3,7 @@
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
 
-package org.rocksdb.test;
+package org.rocksdb;
 
 /**
  * Simple type conversion methods

java/src/test/java/org/rocksdb/WriteBatchHandlerTest.java

@@ -3,10 +3,7 @@
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
 
-package org.rocksdb.test;
+package org.rocksdb;
-
-import org.rocksdb.RocksDBException;
-import org.rocksdb.WriteBatch;
 
 import java.io.IOException;
 import java.util.ArrayList;

java/src/test/java/org/rocksdb/WriteBatchTest.java

@@ -6,13 +6,12 @@
 // Copyright (c) 2011 The LevelDB Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
-package org.rocksdb.test;
+package org.rocksdb;
 
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.rocksdb.WriteBatch;
 
 import java.io.UnsupportedEncodingException;
 
@@ -48,8 +47,8 @@ public class WriteBatchTest {
     batch.put("foo".getBytes("US-ASCII"), "bar".getBytes("US-ASCII"));
     batch.remove("box".getBytes("US-ASCII"));
     batch.put("baz".getBytes("US-ASCII"), "boo".getBytes("US-ASCII"));
-    WriteBatchInternal.setSequence(batch, 100);
+    WriteBatchTestInternalHelper.setSequence(batch, 100);
-    assertThat(WriteBatchInternal.sequence(batch)).
+    assertThat(WriteBatchTestInternalHelper.sequence(batch)).
         isNotNull().
         isEqualTo(100);
     assertThat(batch.count()).isEqualTo(3);
@@ -64,24 +63,24 @@ public class WriteBatchTest {
       throws UnsupportedEncodingException {
     WriteBatch b1 = new WriteBatch();
     WriteBatch b2 = new WriteBatch();
-    WriteBatchInternal.setSequence(b1, 200);
+    WriteBatchTestInternalHelper.setSequence(b1, 200);
-    WriteBatchInternal.setSequence(b2, 300);
+    WriteBatchTestInternalHelper.setSequence(b2, 300);
-    WriteBatchInternal.append(b1, b2);
+    WriteBatchTestInternalHelper.append(b1, b2);
     assertThat(getContents(b1).length).isEqualTo(0);
     assertThat(b1.count()).isEqualTo(0);
     b2.put("a".getBytes("US-ASCII"), "va".getBytes("US-ASCII"));
-    WriteBatchInternal.append(b1, b2);
+    WriteBatchTestInternalHelper.append(b1, b2);
     assertThat("Put(a, va)@200".equals(new String(getContents(b1), "US-ASCII")));
     assertThat(b1.count()).isEqualTo(1);
     b2.clear();
     b2.put("b".getBytes("US-ASCII"), "vb".getBytes("US-ASCII"));
-    WriteBatchInternal.append(b1, b2);
+    WriteBatchTestInternalHelper.append(b1, b2);
     assertThat(("Put(a, va)@200" +
             "Put(b, vb)@201")
                 .equals(new String(getContents(b1), "US-ASCII")));
     assertThat(b1.count()).isEqualTo(2);
     b2.remove("foo".getBytes("US-ASCII"));
-    WriteBatchInternal.append(b1, b2);
+    WriteBatchTestInternalHelper.append(b1, b2);
     assertThat(("Put(a, va)@200" +
         "Put(b, vb)@202" +
         "Put(b, vb)@201" +
@@ -117,7 +116,7 @@ public class WriteBatchTest {
  * Package-private class which provides java api to access
  * c++ WriteBatchInternal.
  */
-class WriteBatchInternal {
+class WriteBatchTestInternalHelper {
   static native void setSequence(WriteBatch batch, long sn);
   static native long sequence(WriteBatch batch);
   static native void append(WriteBatch b1, WriteBatch b2);

java/src/test/java/org/rocksdb/WriteBatchWithIndexTest.java

@@ -7,20 +7,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-package org.rocksdb.test;
+package org.rocksdb;
 
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.rocksdb.WriteBatchWithIndex;
-import org.rocksdb.DirectSlice;
-import org.rocksdb.Options;
-import org.rocksdb.RocksDB;
-import org.rocksdb.RocksDBException;
-import org.rocksdb.RocksIterator;
-import org.rocksdb.WriteOptions;
-import org.rocksdb.WBWIRocksIterator;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayDeque;

java/src/test/java/org/rocksdb/WriteOptionsTest.java

@@ -3,11 +3,10 @@
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
 
-package org.rocksdb.test;
+package org.rocksdb;
 
 import org.junit.ClassRule;
 import org.junit.Test;
-import org.rocksdb.WriteOptions;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

java/src/test/java/org/rocksdb/util/EnvironmentTest.java

@@ -2,10 +2,9 @@
 // This source code is licensed under the BSD-style license found in the
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
-package org.rocksdb.test;
+package org.rocksdb.util;
 
 import org.junit.Test;
-import org.rocksdb.util.Environment;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;

java/src/test/java/org/rocksdb/util/SizeUnitTest.java

@@ -2,10 +2,9 @@
 // This source code is licensed under the BSD-style license found in the
 // LICENSE file in the root directory of this source tree. An additional grant
 // of patent rights can be found in the PATENTS file in the same directory.
-package org.rocksdb.test;
+package org.rocksdb.util;
 
 import org.junit.Test;
-import org.rocksdb.util.SizeUnit;
 
 import static org.assertj.core.api.Assertions.assertThat;