From 419056ba4c391cef4dc23e28e133d96727631bf5 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Thu, 27 Apr 2023 14:32:13 +0200 Subject: [PATCH] Fix checkstyle issues --- .../src/test/java/sop/ByteArrayAndResultTest.java | 10 ++++------ sop-java/src/test/java/sop/MicAlgTest.java | 11 +++++------ sop-java/src/test/java/sop/ProfileTest.java | 1 - sop-java/src/test/java/sop/ReadyTest.java | 5 ++--- sop-java/src/test/java/sop/ReadyWithResultTest.java | 13 +++++-------- sop-java/src/test/java/sop/SessionKeyTest.java | 7 +++---- sop-java/src/test/java/sop/SigningResultTest.java | 6 ++---- sop-java/src/test/java/sop/VerificationTest.java | 1 - 8 files changed, 21 insertions(+), 33 deletions(-) diff --git a/sop-java/src/test/java/sop/ByteArrayAndResultTest.java b/sop-java/src/test/java/sop/ByteArrayAndResultTest.java index 8d89842..9f9d9ce 100644 --- a/sop-java/src/test/java/sop/ByteArrayAndResultTest.java +++ b/sop-java/src/test/java/sop/ByteArrayAndResultTest.java @@ -4,18 +4,16 @@ package sop; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; +import sop.util.UTCUtil; import java.nio.charset.StandardCharsets; import java.text.ParseException; import java.util.Collections; import java.util.List; -import org.junit.jupiter.api.Test; -import sop.ByteArrayAndResult; -import sop.Verification; -import sop.util.UTCUtil; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ByteArrayAndResultTest { diff --git a/sop-java/src/test/java/sop/MicAlgTest.java b/sop-java/src/test/java/sop/MicAlgTest.java index a2cbf73..16f54ef 100644 --- a/sop-java/src/test/java/sop/MicAlgTest.java +++ b/sop-java/src/test/java/sop/MicAlgTest.java @@ -4,16 +4,15 @@ package sop; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.Map; -import org.junit.jupiter.api.Test; -import sop.MicAlg; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; public class MicAlgTest { diff --git a/sop-java/src/test/java/sop/ProfileTest.java b/sop-java/src/test/java/sop/ProfileTest.java index d76d270..564a6af 100644 --- a/sop-java/src/test/java/sop/ProfileTest.java +++ b/sop-java/src/test/java/sop/ProfileTest.java @@ -5,7 +5,6 @@ package sop; import org.junit.jupiter.api.Test; -import sop.Profile; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/sop-java/src/test/java/sop/ReadyTest.java b/sop-java/src/test/java/sop/ReadyTest.java index 409bfc0..49c297b 100644 --- a/sop-java/src/test/java/sop/ReadyTest.java +++ b/sop-java/src/test/java/sop/ReadyTest.java @@ -4,14 +4,13 @@ package sop; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.OutputStream; import java.nio.charset.StandardCharsets; -import org.junit.jupiter.api.Test; -import sop.Ready; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; public class ReadyTest { diff --git a/sop-java/src/test/java/sop/ReadyWithResultTest.java b/sop-java/src/test/java/sop/ReadyWithResultTest.java index 072314a..88231dc 100644 --- a/sop-java/src/test/java/sop/ReadyWithResultTest.java +++ b/sop-java/src/test/java/sop/ReadyWithResultTest.java @@ -4,8 +4,9 @@ package sop; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; +import sop.exception.SOPGPException; +import sop.util.UTCUtil; import java.io.IOException; import java.io.OutputStream; @@ -14,12 +15,8 @@ import java.text.ParseException; import java.util.Collections; import java.util.List; -import org.junit.jupiter.api.Test; -import sop.ByteArrayAndResult; -import sop.ReadyWithResult; -import sop.Verification; -import sop.exception.SOPGPException; -import sop.util.UTCUtil; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ReadyWithResultTest { diff --git a/sop-java/src/test/java/sop/SessionKeyTest.java b/sop-java/src/test/java/sop/SessionKeyTest.java index 7737a29..6dd3c90 100644 --- a/sop-java/src/test/java/sop/SessionKeyTest.java +++ b/sop-java/src/test/java/sop/SessionKeyTest.java @@ -4,14 +4,13 @@ package sop; +import org.junit.jupiter.api.Test; +import sop.util.HexUtil; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import org.junit.jupiter.api.Test; -import sop.SessionKey; -import sop.util.HexUtil; - public class SessionKeyTest { @Test diff --git a/sop-java/src/test/java/sop/SigningResultTest.java b/sop-java/src/test/java/sop/SigningResultTest.java index a2f2d77..b0e1afd 100644 --- a/sop-java/src/test/java/sop/SigningResultTest.java +++ b/sop-java/src/test/java/sop/SigningResultTest.java @@ -4,11 +4,9 @@ package sop; -import static org.junit.jupiter.api.Assertions.assertEquals; - import org.junit.jupiter.api.Test; -import sop.MicAlg; -import sop.SigningResult; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class SigningResultTest { diff --git a/sop-java/src/test/java/sop/VerificationTest.java b/sop-java/src/test/java/sop/VerificationTest.java index c0b0cbc..e956435 100644 --- a/sop-java/src/test/java/sop/VerificationTest.java +++ b/sop-java/src/test/java/sop/VerificationTest.java @@ -5,7 +5,6 @@ package sop; import org.junit.jupiter.api.Test; -import sop.Verification; import sop.enums.SignatureMode; import sop.testsuite.assertions.VerificationAssert; import sop.util.UTCUtil;