RM-3063: move cli tests to the package

Author: OlesjaAarma

cdoc2-cli/src/main/java/ee/cyber/cdoc2/cli/commands/CDocInfoCmd.java

@@ -21,7 +21,6 @@
 import static ee.cyber.cdoc2.crypto.KeyLabelTools.keyLabelParamsForDisplaying;
 
 
-
 //S106 Standard outputs should not be used directly to log anything
 //CLI needs to interact with standard outputs
 @SuppressWarnings("java:S106")
@@ -44,18 +43,15 @@ private void setProperty(Map<String, String> props) {
 
     @Override
     public Void call() throws Exception {
-
-
         List<Recipient> recipients = Envelope.parseHeader(Files.newInputStream(cdocFile.toPath()));
         for (Recipient recipient: recipients) {
-
             String type = getHumanReadableType(recipient);
 
             Map<String, String> keyLabelParams
                 = extractKeyLabelParams(recipient.getRecipientKeyLabel());
 
-            String server = (recipient instanceof ServerRecipient)
-                ? "(server: " + ((ServerRecipient) recipient).getKeyServerId() + ")"
+            String server = (recipient instanceof ServerRecipient serverRecipient)
+                ? "(server: " + serverRecipient.getKeyServerId() + ")"
                 : "";
 
             System.out.println(
@@ -69,8 +65,8 @@ public Void call() throws Exception {
     String getHumanReadableType(Recipient recipient) {
         Objects.requireNonNull(recipient); //can't have null recipient, fail with exception
 
-        if (recipient instanceof PublicKeyRecipient) {
-            return ((PublicKeyRecipient) recipient).getRecipientPubKey().getAlgorithm() + " PublicKey";
+        if (recipient instanceof PublicKeyRecipient publicKeyRecipient) {
+            return publicKeyRecipient.getRecipientPubKey().getAlgorithm() + " PublicKey";
         } else if (recipient instanceof SymmetricKeyRecipient) {
             return "SymmetricKey";
         } else if (recipient instanceof PBKDF2Recipient) {
@@ -81,4 +77,5 @@ String getHumanReadableType(Recipient recipient) {
             return recipient.getClass().toString();
         }
     }
+    
 }

cdoc2-cli/src/test/java/CDocCliTest.java …2-cli/src/test/java/cli/CDocCliTest.javacdoc2-cli/src/test/java/CDocCliTest.java renamed to cdoc2-cli/src/test/java/cli/CDocCliTest.java cdoc2-cli/src/test/java/CDocCliTest.java renamed to cdoc2-cli/src/test/java/cli/CDocCliTest.java

@@ -1,4 +1,4 @@
-import ee.cyber.cdoc2.cli.CDocCli;
+package cli;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -21,6 +21,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import picocli.CommandLine;
+
+import ee.cyber.cdoc2.cli.CDocCli;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;

cdoc2-cli/src/test/java/CryptoTest.java …c2-cli/src/test/java/cli/CryptoTest.javacdoc2-cli/src/test/java/CryptoTest.java renamed to cdoc2-cli/src/test/java/cli/CryptoTest.java cdoc2-cli/src/test/java/CryptoTest.java renamed to cdoc2-cli/src/test/java/cli/CryptoTest.java

@@ -1,3 +1,5 @@
+package cli;
+
 import org.junit.jupiter.api.Test;
 
 import ee.cyber.cdoc2.crypto.Crypto;