From 2a294360b047d456e07ff9584e654bbe417cd209 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Tue, 1 Jul 2014 22:51:44 +0200
Subject: [PATCH] Move 2 test util classes to the "testUtils" package

---
 tests/org/cacert/gigi/TestSSL.java                        | 1 +
 tests/org/cacert/gigi/pages/main/RegisterPageTest.java    | 2 +-
 tests/org/cacert/gigi/pages/wot/TestAssurance.java        | 2 +-
 tests/org/cacert/gigi/{ => testUtils}/IOUtils.java        | 2 +-
 tests/org/cacert/gigi/{ => testUtils}/InitTruststore.java | 2 +-
 tests/org/cacert/gigi/testUtils/ManagedTest.java          | 2 --
 6 files changed, 5 insertions(+), 6 deletions(-)
 rename tests/org/cacert/gigi/{ => testUtils}/IOUtils.java (96%)
 rename tests/org/cacert/gigi/{ => testUtils}/InitTruststore.java (87%)

diff --git a/tests/org/cacert/gigi/TestSSL.java b/tests/org/cacert/gigi/TestSSL.java
index 513fd2b3..9756a7f3 100644
--- 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 org.cacert.gigi.testUtils.InitTruststore;
 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 e570ccd5..06787248 100644
--- 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 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;
diff --git a/tests/org/cacert/gigi/pages/wot/TestAssurance.java b/tests/org/cacert/gigi/pages/wot/TestAssurance.java
index b81a4333..54a85d8b 100644
--- 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 org.cacert.gigi.IOUtils;
 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;
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 108c5866..ab18ee2e 100644
--- 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;
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 65c48fee..39c1d370 100644
--- 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() {
diff --git a/tests/org/cacert/gigi/testUtils/ManagedTest.java b/tests/org/cacert/gigi/testUtils/ManagedTest.java
index 3d645727..ce60a295 100644
--- 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 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;
-- 
2.39.2