Move test classes to test scope

maltemoeser · Mar 21, 2016 · 35ee8fa · 35ee8fa
1 parent 6a1df89
commit 35ee8fa
Show file tree

Hide file tree

Showing 24 changed files with 31 additions and 38 deletions.
diff --git a/src/test/java/de/maltemoeser/bcgraph/blockchain/DiskBlockChainTest.java b/src/test/java/de/maltemoeser/bcgraph/blockchain/DiskBlockChainTest.java
@@ -1,6 +1,6 @@
 package de.maltemoeser.bcgraph.blockchain;
 
-import de.maltemoeser.bcgraph.testing.TestInjector;
+import de.maltemoeser.bcgraph.utils.TestInjector;
 import de.maltemoeser.bcgraph.config.ApplicationConfig;
 import org.bitcoinj.store.BlockStoreException;
 import org.junit.After;

diff --git a/src/test/java/de/maltemoeser/bcgraph/config/TestConfigTest.java b/src/test/java/de/maltemoeser/bcgraph/config/TestConfigTest.java
@@ -1,6 +1,6 @@
 package de.maltemoeser.bcgraph.config;
 
-import de.maltemoeser.bcgraph.testing.TestInjector;
+import de.maltemoeser.bcgraph.utils.TestInjector;
 import org.bitcoinj.params.MainNetParams;
 import org.junit.Test;
 

diff --git a/src/test/java/de/maltemoeser/bcgraph/entities/BCAddressTest.java b/src/test/java/de/maltemoeser/bcgraph/entities/BCAddressTest.java
@@ -2,7 +2,7 @@
 
 import de.maltemoeser.bcgraph.constants.LabelType;
 import de.maltemoeser.bcgraph.constants.NodeProperty;
-import de.maltemoeser.bcgraph.testing.Neo4jTest;
+import de.maltemoeser.bcgraph.utils.Neo4jTest;
 import org.junit.Test;
 import org.neo4j.graphdb.Node;
 

diff --git a/src/test/java/de/maltemoeser/bcgraph/entities/BCBlockTest.java b/src/test/java/de/maltemoeser/bcgraph/entities/BCBlockTest.java
@@ -3,7 +3,7 @@
 import de.maltemoeser.bcgraph.constants.LabelType;
 import de.maltemoeser.bcgraph.constants.NodeProperty;
 import de.maltemoeser.bcgraph.constants.RelType;
-import de.maltemoeser.bcgraph.testing.Neo4jTest;
+import de.maltemoeser.bcgraph.utils.Neo4jTest;
 import org.junit.Test;
 import org.neo4j.graphdb.Direction;
 import org.neo4j.graphdb.Node;

diff --git a/src/test/java/de/maltemoeser/bcgraph/entities/BCEntityTest.java b/src/test/java/de/maltemoeser/bcgraph/entities/BCEntityTest.java
@@ -1,6 +1,6 @@
 package de.maltemoeser.bcgraph.entities;
 
-import de.maltemoeser.bcgraph.testing.Neo4jTest;
+import de.maltemoeser.bcgraph.utils.Neo4jTest;
 import org.junit.Test;
 import org.neo4j.graphdb.Node;
 

diff --git a/src/test/java/de/maltemoeser/bcgraph/entities/BCOutputTest.java b/src/test/java/de/maltemoeser/bcgraph/entities/BCOutputTest.java
@@ -2,7 +2,7 @@
 
 import de.maltemoeser.bcgraph.constants.LabelType;
 import de.maltemoeser.bcgraph.constants.NodeProperty;
-import de.maltemoeser.bcgraph.testing.Neo4jTest;
+import de.maltemoeser.bcgraph.utils.Neo4jTest;
 import org.junit.Before;
 import org.junit.Test;
 import org.neo4j.graphdb.Node;

diff --git a/src/test/java/de/maltemoeser/bcgraph/entities/BCServiceTest.java b/src/test/java/de/maltemoeser/bcgraph/entities/BCServiceTest.java
@@ -1,6 +1,6 @@
 package de.maltemoeser.bcgraph.entities;
 
-import de.maltemoeser.bcgraph.testing.Neo4jTest;
+import de.maltemoeser.bcgraph.utils.Neo4jTest;
 import org.junit.Before;
 import org.junit.Test;
 

diff --git a/src/test/java/de/maltemoeser/bcgraph/entities/BCTransactionTest.java b/src/test/java/de/maltemoeser/bcgraph/entities/BCTransactionTest.java
@@ -3,7 +3,7 @@
 import de.maltemoeser.bcgraph.constants.LabelType;
 import de.maltemoeser.bcgraph.constants.NodeProperty;
 import de.maltemoeser.bcgraph.constants.RelType;
-import de.maltemoeser.bcgraph.testing.Neo4jTest;
+import de.maltemoeser.bcgraph.utils.Neo4jTest;
 import org.junit.Test;
 import org.neo4j.graphdb.Direction;
 import org.neo4j.graphdb.Node;

diff --git a/src/test/java/de/maltemoeser/bcgraph/importer/AddressImporterTest.java b/src/test/java/de/maltemoeser/bcgraph/importer/AddressImporterTest.java
@@ -1,8 +1,8 @@
 package de.maltemoeser.bcgraph.importer;
 
 import de.maltemoeser.bcgraph.entities.BCAddress;
-import de.maltemoeser.bcgraph.testing.Neo4jTest;
-import de.maltemoeser.bcgraph.testing.TestUtils;
+import de.maltemoeser.bcgraph.utils.Neo4jTest;
+import de.maltemoeser.bcgraph.utils.TestUtils;
 import org.bitcoinj.core.ECKey;
 import org.bitcoinj.core.Transaction;
 import org.bitcoinj.script.Script;

diff --git a/src/test/java/de/maltemoeser/bcgraph/importer/BlockChainImporterTest.java b/src/test/java/de/maltemoeser/bcgraph/importer/BlockChainImporterTest.java
@@ -1,7 +1,7 @@
 package de.maltemoeser.bcgraph.importer;
 
 import de.maltemoeser.bcgraph.entities.*;
-import de.maltemoeser.bcgraph.testing.Neo4jTest;
+import de.maltemoeser.bcgraph.utils.Neo4jTest;
 import org.bitcoinj.core.Coin;
 import org.junit.Test;
 

diff --git a/src/test/java/de/maltemoeser/bcgraph/importer/BlockImporterTest.java b/src/test/java/de/maltemoeser/bcgraph/importer/BlockImporterTest.java
@@ -1,8 +1,8 @@
 package de.maltemoeser.bcgraph.importer;
 
 import de.maltemoeser.bcgraph.entities.BCBlock;
-import de.maltemoeser.bcgraph.testing.Neo4jTest;
-import de.maltemoeser.bcgraph.testing.TestUtils;
+import de.maltemoeser.bcgraph.utils.Neo4jTest;
+import de.maltemoeser.bcgraph.utils.TestUtils;
 import org.bitcoinj.core.Block;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/src/test/java/de/maltemoeser/bcgraph/importer/ScriptParserTest.java b/src/test/java/de/maltemoeser/bcgraph/importer/ScriptParserTest.java
@@ -2,8 +2,8 @@
 
 import de.maltemoeser.bcgraph.constants.OutputType;
 import de.maltemoeser.bcgraph.entities.BCOutput;
-import de.maltemoeser.bcgraph.testing.Neo4jTest;
-import de.maltemoeser.bcgraph.testing.TestUtils;
+import de.maltemoeser.bcgraph.utils.Neo4jTest;
+import de.maltemoeser.bcgraph.utils.TestUtils;
 import org.bitcoinj.core.ECKey;
 import org.bitcoinj.core.TransactionOutput;
 import org.bitcoinj.script.Script;

diff --git a/src/test/java/de/maltemoeser/bcgraph/importer/TransactionImporterTest.java b/src/test/java/de/maltemoeser/bcgraph/importer/TransactionImporterTest.java
@@ -3,8 +3,8 @@
 import de.maltemoeser.bcgraph.entities.BCAddress;
 import de.maltemoeser.bcgraph.entities.BCOutput;
 import de.maltemoeser.bcgraph.entities.BCTransaction;
-import de.maltemoeser.bcgraph.testing.Neo4jTest;
-import de.maltemoeser.bcgraph.testing.TestUtils;
+import de.maltemoeser.bcgraph.utils.Neo4jTest;
+import de.maltemoeser.bcgraph.utils.TestUtils;
 import org.bitcoinj.core.Transaction;
 import org.bitcoinj.core.TransactionOutput;
 import org.junit.Before;

diff --git a/...trictions/TransactionRestrictionTest.java → ...ictions/BCTransactionRestrictionTest.java b/...trictions/TransactionRestrictionTest.java → ...ictions/BCTransactionRestrictionTest.java
@@ -1,14 +1,14 @@
 package de.maltemoeser.bcgraph.restrictions;
 
 import de.maltemoeser.bcgraph.entities.BCTransaction;
-import de.maltemoeser.bcgraph.testing.Neo4jTest;
+import de.maltemoeser.bcgraph.utils.Neo4jTest;
 import org.junit.Test;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 
-public class TransactionRestrictionTest extends Neo4jTest {
+public class BCTransactionRestrictionTest extends Neo4jTest {
 
     @Test
     public void testMinInputCountRestriction() {

diff --git a/src/test/java/de/maltemoeser/bcgraph/testing/Neo4jTestTest.java b/src/test/java/de/maltemoeser/bcgraph/testing/Neo4jTestTest.java
@@ -4,6 +4,7 @@
 import de.maltemoeser.bcgraph.entities.BCBlock;
 import de.maltemoeser.bcgraph.entities.BCOutput;
 import de.maltemoeser.bcgraph.entities.BCTransaction;
+import de.maltemoeser.bcgraph.utils.Neo4jTest;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;

diff --git a/src/test/java/de/maltemoeser/bcgraph/testing/TestUtilsTest.java b/src/test/java/de/maltemoeser/bcgraph/testing/TestUtilsTest.java
@@ -1,7 +1,7 @@
 package de.maltemoeser.bcgraph.testing;
 
-import de.maltemoeser.bcgraph.testing.BitcoinTest;
-import de.maltemoeser.bcgraph.testing.TestUtils;
+import de.maltemoeser.bcgraph.utils.BitcoinTest;
+import de.maltemoeser.bcgraph.utils.TestUtils;
 import org.bitcoinj.core.Block;
 import org.bitcoinj.core.Transaction;
 import org.junit.Test;

diff --git a/src/test/java/de/maltemoeser/bcgraph/traversal/evaluator/TransactionEvaluatorTest.java b/src/test/java/de/maltemoeser/bcgraph/traversal/evaluator/TransactionEvaluatorTest.java
@@ -3,9 +3,9 @@
 import de.maltemoeser.bcgraph.constants.RelType;
 import de.maltemoeser.bcgraph.entities.BCBlock;
 import de.maltemoeser.bcgraph.entities.BCTransaction;
-import de.maltemoeser.bcgraph.testing.BlockTransactionPair;
-import de.maltemoeser.bcgraph.testing.Neo4jTest;
-import de.maltemoeser.bcgraph.testing.TestGraphUtils;
+import de.maltemoeser.bcgraph.utils.BlockTransactionPair;
+import de.maltemoeser.bcgraph.utils.Neo4jTest;
+import de.maltemoeser.bcgraph.utils.TestGraphUtils;
 import org.junit.Before;
 import org.junit.Test;
 import org.neo4j.graphdb.Direction;

diff --git a/...temoeser/bcgraph/testing/BitcoinTest.java → ...altemoeser/bcgraph/utils/BitcoinTest.java b/...temoeser/bcgraph/testing/BitcoinTest.java → ...altemoeser/bcgraph/utils/BitcoinTest.java
@@ -1,4 +1,4 @@
-package de.maltemoeser.bcgraph.testing;
+package de.maltemoeser.bcgraph.utils;
 
 import org.bitcoinj.core.Context;
 import org.bitcoinj.params.MainNetParams;

diff --git a/...bcgraph/testing/BlockTransactionPair.java → ...r/bcgraph/utils/BlockTransactionPair.java b/...bcgraph/testing/BlockTransactionPair.java → ...r/bcgraph/utils/BlockTransactionPair.java
@@ -1,4 +1,4 @@
-package de.maltemoeser.bcgraph.testing;
+package de.maltemoeser.bcgraph.utils;
 
 import de.maltemoeser.bcgraph.entities.BCBlock;
 import de.maltemoeser.bcgraph.entities.BCTransaction;

diff --git a/...altemoeser/bcgraph/testing/Neo4jTest.java → .../maltemoeser/bcgraph/utils/Neo4jTest.java b/...altemoeser/bcgraph/testing/Neo4jTest.java → .../maltemoeser/bcgraph/utils/Neo4jTest.java
@@ -1,4 +1,4 @@
-package de.maltemoeser.bcgraph.testing;
+package de.maltemoeser.bcgraph.utils;
 
 import de.maltemoeser.bcgraph.constants.LabelType;
 import de.maltemoeser.bcgraph.database.Database;

diff --git a/src/test/java/de/maltemoeser/bcgraph/utils/ScriptUtilsTest.java b/src/test/java/de/maltemoeser/bcgraph/utils/ScriptUtilsTest.java
@@ -1,7 +1,5 @@
 package de.maltemoeser.bcgraph.utils;
 
-import de.maltemoeser.bcgraph.testing.BitcoinTest;
-import de.maltemoeser.bcgraph.testing.TestUtils;
 import org.bitcoinj.core.ECKey;
 import org.bitcoinj.core.Transaction;
 import org.bitcoinj.core.TransactionInput;

diff --git a/...oeser/bcgraph/testing/TestGraphUtils.java → ...emoeser/bcgraph/utils/TestGraphUtils.java b/...oeser/bcgraph/testing/TestGraphUtils.java → ...emoeser/bcgraph/utils/TestGraphUtils.java
@@ -1,4 +1,4 @@
-package de.maltemoeser.bcgraph.testing;
+package de.maltemoeser.bcgraph.utils;
 
 import com.google.inject.Inject;
 import de.maltemoeser.bcgraph.database.Database;

diff --git a/...emoeser/bcgraph/testing/TestInjector.java → ...ltemoeser/bcgraph/utils/TestInjector.java b/...emoeser/bcgraph/testing/TestInjector.java → ...ltemoeser/bcgraph/utils/TestInjector.java
@@ -1,4 +1,4 @@
-package de.maltemoeser.bcgraph.testing;
+package de.maltemoeser.bcgraph.utils;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;

diff --git a/...altemoeser/bcgraph/testing/TestUtils.java → .../maltemoeser/bcgraph/utils/TestUtils.java b/...altemoeser/bcgraph/testing/TestUtils.java → .../maltemoeser/bcgraph/utils/TestUtils.java
@@ -1,21 +1,15 @@
-package de.maltemoeser.bcgraph.testing;
+package de.maltemoeser.bcgraph.utils;
 
 import org.apache.commons.io.FileUtils;
 import org.bitcoinj.core.Block;
-import org.bitcoinj.core.Context;
 import org.bitcoinj.core.Transaction;
 import org.bitcoinj.core.TransactionOutput;
 import org.bitcoinj.params.MainNetParams;
-import org.junit.Before;
-import org.junit.Test;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.NoSuchElementException;
 
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.Assert.*;
-
 public class TestUtils {
 
     public static final int TEST_BLOCK_HEIGHT = 350010;