From 7ea46a1916eefbd4b50c8be496dcb4300794b580 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Thu, 27 Apr 2023 14:23:58 +0200
Subject: [PATCH] Move tests

---
 .../src/test/java/sop/{util => }/ByteArrayAndResultTest.java   | 3 ++-
 sop-java/src/test/java/sop/{util => }/MicAlgTest.java          | 2 +-
 sop-java/src/test/java/sop/{util => }/ReadyTest.java           | 2 +-
 sop-java/src/test/java/sop/{util => }/ReadyWithResultTest.java | 3 ++-
 sop-java/src/test/java/sop/{util => }/SessionKeyTest.java      | 3 ++-
 sop-java/src/test/java/sop/{util => }/SigningResultTest.java   | 2 +-
 6 files changed, 9 insertions(+), 6 deletions(-)
 rename sop-java/src/test/java/sop/{util => }/ByteArrayAndResultTest.java (96%)
 rename sop-java/src/test/java/sop/{util => }/MicAlgTest.java (98%)
 rename sop-java/src/test/java/sop/{util => }/ReadyTest.java (97%)
 rename sop-java/src/test/java/sop/{util => }/ReadyWithResultTest.java (97%)
 rename sop-java/src/test/java/sop/{util => }/SessionKeyTest.java (98%)
 rename sop-java/src/test/java/sop/{util => }/SigningResultTest.java (96%)

diff --git a/sop-java/src/test/java/sop/util/ByteArrayAndResultTest.java b/sop-java/src/test/java/sop/ByteArrayAndResultTest.java
similarity index 96%
rename from sop-java/src/test/java/sop/util/ByteArrayAndResultTest.java
rename to sop-java/src/test/java/sop/ByteArrayAndResultTest.java
index a1413b4..8d89842 100644
--- a/sop-java/src/test/java/sop/util/ByteArrayAndResultTest.java
+++ b/sop-java/src/test/java/sop/ByteArrayAndResultTest.java
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package sop.util;
+package sop;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -15,6 +15,7 @@ import java.util.List;
 import org.junit.jupiter.api.Test;
 import sop.ByteArrayAndResult;
 import sop.Verification;
+import sop.util.UTCUtil;
 
 public class ByteArrayAndResultTest {
 
diff --git a/sop-java/src/test/java/sop/util/MicAlgTest.java b/sop-java/src/test/java/sop/MicAlgTest.java
similarity index 98%
rename from sop-java/src/test/java/sop/util/MicAlgTest.java
rename to sop-java/src/test/java/sop/MicAlgTest.java
index f720c85..a2cbf73 100644
--- a/sop-java/src/test/java/sop/util/MicAlgTest.java
+++ b/sop-java/src/test/java/sop/MicAlgTest.java
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package sop.util;
+package sop;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
diff --git a/sop-java/src/test/java/sop/util/ReadyTest.java b/sop-java/src/test/java/sop/ReadyTest.java
similarity index 97%
rename from sop-java/src/test/java/sop/util/ReadyTest.java
rename to sop-java/src/test/java/sop/ReadyTest.java
index 07fa090..409bfc0 100644
--- a/sop-java/src/test/java/sop/util/ReadyTest.java
+++ b/sop-java/src/test/java/sop/ReadyTest.java
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package sop.util;
+package sop;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 
diff --git a/sop-java/src/test/java/sop/util/ReadyWithResultTest.java b/sop-java/src/test/java/sop/ReadyWithResultTest.java
similarity index 97%
rename from sop-java/src/test/java/sop/util/ReadyWithResultTest.java
rename to sop-java/src/test/java/sop/ReadyWithResultTest.java
index 1207c5c..072314a 100644
--- a/sop-java/src/test/java/sop/util/ReadyWithResultTest.java
+++ b/sop-java/src/test/java/sop/ReadyWithResultTest.java
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package sop.util;
+package sop;
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -19,6 +19,7 @@ import sop.ByteArrayAndResult;
 import sop.ReadyWithResult;
 import sop.Verification;
 import sop.exception.SOPGPException;
+import sop.util.UTCUtil;
 
 public class ReadyWithResultTest {
 
diff --git a/sop-java/src/test/java/sop/util/SessionKeyTest.java b/sop-java/src/test/java/sop/SessionKeyTest.java
similarity index 98%
rename from sop-java/src/test/java/sop/util/SessionKeyTest.java
rename to sop-java/src/test/java/sop/SessionKeyTest.java
index db7e89f..7737a29 100644
--- a/sop-java/src/test/java/sop/util/SessionKeyTest.java
+++ b/sop-java/src/test/java/sop/SessionKeyTest.java
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package sop.util;
+package sop;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -10,6 +10,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.junit.jupiter.api.Test;
 import sop.SessionKey;
+import sop.util.HexUtil;
 
 public class SessionKeyTest {
 
diff --git a/sop-java/src/test/java/sop/util/SigningResultTest.java b/sop-java/src/test/java/sop/SigningResultTest.java
similarity index 96%
rename from sop-java/src/test/java/sop/util/SigningResultTest.java
rename to sop-java/src/test/java/sop/SigningResultTest.java
index 0d35cdc..a2f2d77 100644
--- a/sop-java/src/test/java/sop/util/SigningResultTest.java
+++ b/sop-java/src/test/java/sop/SigningResultTest.java
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package sop.util;
+package sop;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;