Move 2 test util classes to the "testUtils" package

diff --git a/tests/org/cacert/gigi/TestSSL.java b/tests/org/cacert/gigi/TestSSL.java
index 513fd2b32e863996c2afad25a5a7c3177142527d..9756a7f3f4e2a044acd5860d1b58c000bf84fee5 100644 (file)
--- a/tests/org/cacert/gigi/TestSSL.java
+++ b/tests/org/cacert/gigi/TestSSL.java
@@ -13,6 +13,7 @@ import javax.net.ssl.SSLEngineResult;
 import javax.net.ssl.SSLEngineResult.HandshakeStatus;
 import javax.net.ssl.SSLException;
 
 import javax.net.ssl.SSLEngineResult.HandshakeStatus;
 import javax.net.ssl.SSLException;
 

+import org.cacert.gigi.testUtils.InitTruststore;

 import org.cacert.gigi.testUtils.ManagedTest;
 import org.junit.Test;
 
 import org.cacert.gigi.testUtils.ManagedTest;
 import org.junit.Test;
 

diff --git a/tests/org/cacert/gigi/pages/main/RegisterPageTest.java b/tests/org/cacert/gigi/pages/main/RegisterPageTest.java
index e570ccd561b7d12c93305250b62cd892e61c61b6..06787248d311a6f3639691a4e7c2726dda397bd7 100644 (file)
--- a/tests/org/cacert/gigi/pages/main/RegisterPageTest.java
+++ b/tests/org/cacert/gigi/pages/main/RegisterPageTest.java
@@ -6,7 +6,7 @@ import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.util.regex.Pattern;
 
 import java.net.HttpURLConnection;
 import java.util.regex.Pattern;
 

-import org.cacert.gigi.InitTruststore;
+import org.cacert.gigi.testUtils.InitTruststore;

 import org.cacert.gigi.testUtils.ManagedTest;
 import org.cacert.gigi.testUtils.TestEmailReciever.TestMail;
 import org.junit.Before;
 import org.cacert.gigi.testUtils.ManagedTest;
 import org.cacert.gigi.testUtils.TestEmailReciever.TestMail;
 import org.junit.Before;

diff --git a/tests/org/cacert/gigi/pages/wot/TestAssurance.java b/tests/org/cacert/gigi/pages/wot/TestAssurance.java
index b81a433390d431c6914ae86b796a513573795d1b..54a85d8bd964b34321a20a87601e251ed212fa72 100644 (file)
--- a/tests/org/cacert/gigi/pages/wot/TestAssurance.java
+++ b/tests/org/cacert/gigi/pages/wot/TestAssurance.java
@@ -11,8 +11,8 @@ import java.sql.SQLException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 

-import org.cacert.gigi.IOUtils;

 import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.database.DatabaseConnection;

+import org.cacert.gigi.testUtils.IOUtils;

 import org.cacert.gigi.testUtils.ManagedTest;
 import org.junit.Before;
 import org.junit.Test;
 import org.cacert.gigi.testUtils.ManagedTest;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/tests/org/cacert/gigi/IOUtils.java b/tests/org/cacert/gigi/testUtils/IOUtils.java
similarity index 96%
rename from tests/org/cacert/gigi/IOUtils.java
rename to tests/org/cacert/gigi/testUtils/IOUtils.java
index 108c586621f821f81de10dd7320e12196d98abc9..ab18ee2ed6ba38068bc0900da6bddeb5ad92b180 100644 (file)
--- a/tests/org/cacert/gigi/IOUtils.java
+++ b/tests/org/cacert/gigi/testUtils/IOUtils.java
@@ -1,4 +1,4 @@
-package org.cacert.gigi;
+package org.cacert.gigi.testUtils;

 
 import java.io.CharArrayWriter;
 import java.io.IOException;
 
 import java.io.CharArrayWriter;
 import java.io.IOException;

diff --git a/tests/org/cacert/gigi/InitTruststore.java b/tests/org/cacert/gigi/testUtils/InitTruststore.java
similarity index 87%
rename from tests/org/cacert/gigi/InitTruststore.java
rename to tests/org/cacert/gigi/testUtils/InitTruststore.java
index 65c48feee1f23f2d90abf0e088dc9b6e981bea28..39c1d370ea7bc70aad956c9943956679f127e161 100644 (file)
--- a/tests/org/cacert/gigi/InitTruststore.java
+++ b/tests/org/cacert/gigi/testUtils/InitTruststore.java
@@ -1,4 +1,4 @@
-package org.cacert.gigi;
+package org.cacert.gigi.testUtils;

 
 public class InitTruststore {
        private InitTruststore() {
 
 public class InitTruststore {
        private InitTruststore() {

diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java
index 3d6457275d90af32c23b38d05d5be21caa041cda..ce60a295832584c5c6b282af91bee8ae1de52838 100644 (file)
--- a/tests/org/cacert/gigi/testUtils/ManagedTest.java
+++ b/tests/org/cacert/gigi/testUtils/ManagedTest.java
@@ -22,8 +22,6 @@ import java.sql.SQLException;
 import java.util.Properties;
 
 import org.cacert.gigi.DevelLauncher;
 import java.util.Properties;
 
 import org.cacert.gigi.DevelLauncher;

-import org.cacert.gigi.IOUtils;
-import org.cacert.gigi.InitTruststore;

 import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.testUtils.TestEmailReciever.TestMail;
 import org.cacert.gigi.util.DatabaseManager;
 import org.cacert.gigi.database.DatabaseConnection;
 import org.cacert.gigi.testUtils.TestEmailReciever.TestMail;
 import org.cacert.gigi.util.DatabaseManager;