From 4b1ed48ef57580c25a1ec2f9a565f65de1dc131f Mon Sep 17 00:00:00 2001 From: akafredperry Date: Wed, 4 Feb 2026 15:40:03 +0000 Subject: [PATCH 1/2] fix: update and simplify dependencies, NOTE: jnit4 and commons-lang removed --- at_client/README.md | 1 - at_client/pom.xml | 23 ++- .../main/java/org/atsign/client/cli/Scan.java | 4 +- .../client/util/AtClientValidation.java | 2 +- .../org/atsign/client/util/StringUtil.java | 15 ++ .../java/org/atsign/common/VerbBuilders.java | 20 +- .../atsign/common/AtClientValidationIT.java | 153 +++++++++++++++ .../atsign/common/AtClientValidationTest.java | 183 +++--------------- .../java/org/atsign/common/ByteUtilTest.java | 18 +- .../org/atsign/common/ConfigReaderTest.java | 6 +- .../java/org/atsign/common/DateUtilTest.java | 6 +- .../org/atsign/common/FromStringTest.java | 9 +- .../org/atsign/common/KeyStringUtilTest.java | 176 ++++++++--------- .../java/org/atsign/common/KeysUtilTest.java | 14 +- .../common/ResponseTransformerTest.java | 18 +- .../org/atsign/common/VerbBuildersTest.java | 138 +++++-------- .../java/org/atsign/cucumber/CucumberIT.java | 34 ++-- .../cucumber/CucumberVirtualEnvPlugin.java | 20 ++ .../cucumber/steps/AtClientContext.java | 8 +- at_shell/pom.xml | 6 +- at_utils/pom.xml | 10 +- .../org/atsign/client/util/CameraUtil.java | 18 +- pom.xml | 63 ++---- 23 files changed, 442 insertions(+), 503 deletions(-) create mode 100644 at_client/src/main/java/org/atsign/client/util/StringUtil.java create mode 100644 at_client/src/test/java/org/atsign/common/AtClientValidationIT.java create mode 100644 at_client/src/test/java/org/atsign/cucumber/CucumberVirtualEnvPlugin.java diff --git a/at_client/README.md b/at_client/README.md index 3cbc88eb..2adbc310 100644 --- a/at_client/README.md +++ b/at_client/README.md @@ -33,7 +33,6 @@ The library currently depends on the following * Bouncycastle * Jackson -* Apache Commons (will be removed) * Pico CLI ## Developer Instructions diff --git a/at_client/pom.xml b/at_client/pom.xml index 8772e769..2c49e70c 100644 --- a/at_client/pom.xml +++ b/at_client/pom.xml @@ -99,7 +99,6 @@ com.fasterxml.jackson.core jackson-databind - com.fasterxml.jackson.dataformat jackson-dataformat-yaml @@ -110,25 +109,24 @@ bcprov-jdk15to18 - - org.apache.commons - commons-lang3 - - info.picocli picocli - junit - junit + org.junit.jupiter + junit-jupiter test - - org.mockito - mockito-inline + org.junit.platform + junit-platform-suite-api + test + + + org.junit.platform + junit-platform-suite-engine test @@ -145,7 +143,7 @@ io.cucumber - cucumber-junit + cucumber-junit-platform-engine test @@ -163,6 +161,7 @@ org.slf4j slf4j-api + test org.slf4j diff --git a/at_client/src/main/java/org/atsign/client/cli/Scan.java b/at_client/src/main/java/org/atsign/client/cli/Scan.java index adecdb7f..b20b56f1 100644 --- a/at_client/src/main/java/org/atsign/client/cli/Scan.java +++ b/at_client/src/main/java/org/atsign/client/cli/Scan.java @@ -5,11 +5,11 @@ import java.util.Scanner; import java.util.concurrent.ExecutionException; -import org.apache.commons.lang3.StringUtils; import org.atsign.client.api.AtClient; import org.atsign.client.api.Secondary; import org.atsign.client.util.ArgsUtil; import org.atsign.client.util.KeysUtil; +import org.atsign.client.util.StringUtil; import org.atsign.common.AtException; import org.atsign.common.AtSign; import org.atsign.common.Keys.AtKey; @@ -81,7 +81,7 @@ public static void main(String[] args) { // _printAtKeys(atKeys); System.out.println("Enter index you want to llookup (l to list, q to quit):"); input = scanner.nextLine(); - if (StringUtils.isNumeric(input)) { + if (StringUtil.isNumeric(input)) { int index = Integer.parseInt(input); if (index < atKeys.size()) { AtKey atKey = atKeys.get(index); diff --git a/at_client/src/main/java/org/atsign/client/util/AtClientValidation.java b/at_client/src/main/java/org/atsign/client/util/AtClientValidation.java index f46295e6..c33280e8 100644 --- a/at_client/src/main/java/org/atsign/client/util/AtClientValidation.java +++ b/at_client/src/main/java/org/atsign/client/util/AtClientValidation.java @@ -57,7 +57,7 @@ public static void validateMetadata(Metadata metadata) throws AtException { // validate ttr if (metadata.ttr == null || metadata.ttr < -1) { - throw new AtInvalidAtKeyException("ttb cannot be null and cannot be < -1"); + throw new AtInvalidAtKeyException("ttr cannot be null and cannot be < -1"); } } diff --git a/at_client/src/main/java/org/atsign/client/util/StringUtil.java b/at_client/src/main/java/org/atsign/client/util/StringUtil.java new file mode 100644 index 00000000..1bef3637 --- /dev/null +++ b/at_client/src/main/java/org/atsign/client/util/StringUtil.java @@ -0,0 +1,15 @@ +package org.atsign.client.util; + +// enables removal of commons-lang +// TODO: review after JDK upgrade +public class StringUtil { + + public static boolean isBlank(String s) { + return s == null || s.trim().isEmpty(); + } + + public static boolean isNumeric(String s) { + return s.matches("\\d+"); + } + +} diff --git a/at_client/src/main/java/org/atsign/common/VerbBuilders.java b/at_client/src/main/java/org/atsign/common/VerbBuilders.java index ef8007ed..bd26a218 100644 --- a/at_client/src/main/java/org/atsign/common/VerbBuilders.java +++ b/at_client/src/main/java/org/atsign/common/VerbBuilders.java @@ -1,10 +1,11 @@ package org.atsign.common; -import org.apache.commons.lang3.StringUtils; import org.atsign.common.Keys.AtKey; import org.atsign.common.Keys.PublicKey; import org.atsign.common.Keys.SharedKey; +import static org.atsign.client.util.StringUtil.isBlank; + /** * * Contains builders that build commands that are accepted by a secondary server @@ -575,11 +576,11 @@ public String build() { command += ":showHidden:true"; } - if (fromAtSign != null && !StringUtils.isBlank(fromAtSign)) { + if (fromAtSign != null && !isBlank(fromAtSign)) { command += ":" + fromAtSign; } - if (regex != null && !StringUtils.isBlank(regex)) { + if (regex != null && !isBlank(regex)) { command += " " + regex; } @@ -674,7 +675,7 @@ public void setTtr(long ttr) { //notify:((?update|delete):)?(messageType:(?key|text):)?(priority:(?low|medium|high):)?(strategy:(?all|latest):)?(latestN:(?\d+):)?(notifier:(?[^\s:]+):)?(ttln:(?\d+):)?(ttl:(?\d+):)?(ttb:(?\d+):)?(ttr:(?(-)?\d+):)?(ccd:(?true|false):)?(@(?[^@:\s]*)):(?[^:@]((?!:{2})[^@])+)(@(?[^@:\s]+))?(:(?.+))?$ public String build() { - if (key == null || StringUtils.isBlank(key)) { + if (key == null || isBlank(key)) { throw new IllegalArgumentException("key cannot be null or empty"); } @@ -687,7 +688,7 @@ public String build() { throw new IllegalArgumentException("Invalid value for ttr. Only -1 and positive numbers are allowed"); } - if (ttr != defaultTTRValue && (value == null || StringUtils.isBlank(value))) { + if (ttr != defaultTTRValue && (value == null || isBlank(value))) { throw new IllegalArgumentException("When the ttr is specified value cannot be null or empty"); } @@ -699,7 +700,7 @@ public String build() { } // append recipients @sign if it is not part of the key already - if (recipientAtSign != null && !StringUtils.isBlank(recipientAtSign)) { + if (recipientAtSign != null && !isBlank(recipientAtSign)) { if (!recipientAtSign.startsWith("@")) { recipientAtSign = "@" + recipientAtSign; @@ -711,7 +712,7 @@ public String build() { // append the key command += key; - if (senderAtSign != null && !StringUtils.isBlank(senderAtSign)) { + if (senderAtSign != null && !isBlank(senderAtSign)) { if (!senderAtSign.startsWith("@")) { senderAtSign = "@" + senderAtSign; @@ -720,7 +721,7 @@ public String build() { command += senderAtSign; } - if (value != null && !StringUtils.isBlank(value)) { + if (value != null && !isBlank(value)) { command += ":" + value; } @@ -739,12 +740,11 @@ public void setNotificationId(String notificationId) { //notify:status:(?\S+)$'; public String build() { - if (notificationId == null || StringUtils.isBlank(notificationId)) { + if (notificationId == null || isBlank(notificationId)) { throw new IllegalArgumentException("notificationId cannot be null or empty"); } return "notify:status:" + notificationId; } } - } diff --git a/at_client/src/test/java/org/atsign/common/AtClientValidationIT.java b/at_client/src/test/java/org/atsign/common/AtClientValidationIT.java new file mode 100644 index 00000000..66fdd8b7 --- /dev/null +++ b/at_client/src/test/java/org/atsign/common/AtClientValidationIT.java @@ -0,0 +1,153 @@ +package org.atsign.common; + +import static java.util.concurrent.TimeUnit.SECONDS; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import org.atsign.client.util.AtClientValidation; +import org.atsign.common.Keys.PublicKey; +import org.atsign.common.Keys.SelfKey; +import org.atsign.common.Keys.SharedKey; +import org.atsign.cucumber.helpers.Helpers; +import org.atsign.virtualenv.VirtualEnv; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +public class AtClientValidationIT { + + private static final String VE_ROOT_URL = "vip.ve.atsign.zone:64"; // prod rootUrl + + @BeforeAll + public static void classSetup() { + if (!Helpers.isHostPortReachable(VE_ROOT_URL, SECONDS.toMillis(2))) { + VirtualEnv.setUp(); + } + } + + // atSign exists (uses secondaryaddress.finder) + @Test + public void atSignExistsTest() { + + // null atSign + assertThrows(AtException.class, () -> { + AtSign atSign = null; + AtClientValidation.atSignExists(atSign, VE_ROOT_URL); + }); + + // empty atSign + assertThrows(IllegalArgumentException.class, () -> { + AtSign atSign = new AtSign(""); + AtClientValidation.atSignExists(atSign, VE_ROOT_URL); + }); + + // root does not contain atSign + assertThrows(AtException.class, () -> { + AtSign atSign = new AtSign("someAtSignThatDNE456"); + AtClientValidation.atSignExists(atSign, VE_ROOT_URL); + }); + + // invalid root + assertThrows(AtException.class, () -> { + AtSign atSign = new AtSign("smoothalligator"); + AtClientValidation.atSignExists(atSign, "invalidroot:32123"); + }); + + } + + // validate AtKey object is ready (checks atKey.name validity, metadata + // validity, and if sharedWith exists) + @Test + public void validateAtKeyTest() { + + // ==================================== + // PublicKey tests + // ==================================== + + // null publicKey + assertThrows(AtException.class, () -> { + PublicKey publicKey = null; + AtClientValidation.validateAtKey(publicKey, VE_ROOT_URL); + }); + + // public key with invalid ttr + assertThrows(AtException.class, () -> { + AtSign sharedBy = new AtSign("@bob"); + PublicKey publicKey = new KeyBuilders.PublicKeyBuilder(sharedBy).key("test").build(); + publicKey.metadata.ttr = -2; + AtClientValidation.validateAtKey(publicKey, ""); + }); + + // ==================================== + // SelfKey tests + // ==================================== + + // null selfKey + assertThrows(AtException.class, () -> { + SelfKey selfKey = null; + AtClientValidation.validateAtKey(selfKey, VE_ROOT_URL); + }); + + // self key with invalid keyName + assertThrows(AtException.class, () -> { + AtSign sharedBy = new AtSign("@bob"); + SelfKey selfKey = new KeyBuilders.SelfKeyBuilder(sharedBy).key("t est").build(); + AtClientValidation.validateAtKey(selfKey, VE_ROOT_URL); + }); + + // self key with non-existent sharedWith atSign in root + assertThrows(AtException.class, () -> { + AtSign sharedBy = new AtSign("@nonexistentatsign"); + AtSign sharedWith = new AtSign("@nonexistentatsign"); // atSign does not exist in root + SelfKey selfKey = new KeyBuilders.SelfKeyBuilder(sharedBy, sharedWith).key("test").build(); + AtClientValidation.validateAtKey(selfKey, VE_ROOT_URL); + }); + + // ==================================== + // SharedKey tests + // ==================================== + + // null shared key test + assertThrows(AtException.class, () -> { + SharedKey sharedKey = null; + AtClientValidation.validateAtKey(sharedKey, VE_ROOT_URL); + }); + + // shared key with ttr < -1 + assertThrows(AtException.class, () -> { + AtSign sharedBy = new AtSign("@bob"); + AtSign sharedWith = new AtSign("@alice"); + SharedKey sharedKey = new KeyBuilders.SharedKeyBuilder(sharedBy, sharedWith).key("test").build(); + sharedKey.metadata.ttr = -22323; + AtClientValidation.validateAtKey(sharedKey, VE_ROOT_URL); + }); + + // shared key with invalid keyName + assertThrows(AtException.class, () -> { + AtSign sharedBy = new AtSign("@bob"); + AtSign sharedWith = new AtSign("@alice"); + SharedKey sharedKey = new KeyBuilders.SharedKeyBuilder(sharedBy, sharedWith).key("t est").build(); + AtClientValidation.validateAtKey(sharedKey, VE_ROOT_URL); + }); + + // shared key with invalid sharedWith atSign (atSign dne in root) + assertThrows(AtException.class, () -> { + AtSign sharedBy = new AtSign("@wildgreen"); + AtSign sharedWith = new AtSign("@nonexistentatsign"); // atSign does not exist in root + SharedKey sharedKey = new KeyBuilders.SharedKeyBuilder(sharedBy, sharedWith).key("test").build(); + AtClientValidation.validateAtKey(sharedKey, VE_ROOT_URL); + }); + + // empty root url + assertThrows(AtException.class, () -> { + AtSign sharedBy = new AtSign("@bob"); + AtSign sharedWith = new AtSign("@alice"); + SharedKey sharedKey = new KeyBuilders.SharedKeyBuilder(sharedBy, sharedWith).key("test").build(); + AtClientValidation.validateAtKey(sharedKey, ""); + }); + + // ==================================== + // PrivateHiddenKey tests + // ==================================== + + // TODO + } +} diff --git a/at_client/src/test/java/org/atsign/common/AtClientValidationTest.java b/at_client/src/test/java/org/atsign/common/AtClientValidationTest.java index b3fb26c7..50989dfd 100644 --- a/at_client/src/test/java/org/atsign/common/AtClientValidationTest.java +++ b/at_client/src/test/java/org/atsign/common/AtClientValidationTest.java @@ -1,48 +1,46 @@ package org.atsign.common; -import static org.junit.Assert.assertThrows; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.junit.jupiter.api.Assertions.assertThrows; import org.atsign.client.util.AtClientValidation; -import org.atsign.common.Keys.PublicKey; -import org.atsign.common.Keys.SelfKey; -import org.atsign.common.Keys.SharedKey; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.atsign.common.exceptions.AtInvalidAtKeyException; +import org.junit.jupiter.api.Test; public class AtClientValidationTest { - @Before - public void setUp() {} - // valid key names (like "test", but not "cached:public:test@bob" <-- these key // names will always fail this test) @Test public void validateKeyNameTest() { // null key name - assertThrows(AtException.class, () -> { + AtException ex = assertThrows(AtInvalidAtKeyException.class, () -> { String keyName = null; AtClientValidation.validateKeyName(keyName); }); + assertThat(ex.getMessage(), equalTo("Key cannot be null or empty")); // empty key name - assertThrows(AtException.class, () -> { + ex = assertThrows(AtInvalidAtKeyException.class, () -> { String keyName = ""; AtClientValidation.validateKeyName(keyName); }); + assertThat(ex.getMessage(), equalTo("Key cannot be null or empty")); // key name with @ - assertThrows(AtException.class, () -> { + ex = assertThrows(AtInvalidAtKeyException.class, () -> { String keyName = "test@bob"; AtClientValidation.validateKeyName(keyName); }); + assertThat(ex.getMessage(), equalTo("Key cannot contain @")); // key name with spaces - assertThrows(AtException.class, () -> { + ex = assertThrows(AtInvalidAtKeyException.class, () -> { String keyName = " te st "; AtClientValidation.validateKeyName(keyName); }); - + assertThat(ex.getMessage(), equalTo("Key cannot have spaces")); } // valid metadata (null check, ttl, ttb, ttr) @@ -50,198 +48,71 @@ public void validateKeyNameTest() { public void validateMetadataTest() { // null metadata - assertThrows(AtException.class, () -> { + AtException ex = assertThrows(AtInvalidAtKeyException.class, () -> { Metadata metadata = null; AtClientValidation.validateMetadata(metadata); }); + assertThat(ex.getMessage(), equalTo("Metadata cannot be null")); // null ttl - assertThrows(AtException.class, () -> { + ex = assertThrows(AtInvalidAtKeyException.class, () -> { Metadata metadata = new Metadata(); metadata.ttl = null; metadata.ttb = 0; metadata.ttr = -1; AtClientValidation.validateMetadata(metadata); }); + assertThat(ex.getMessage(), equalTo("ttl cannot be null and cannot be negative")); // negative ttl - assertThrows(AtException.class, () -> { + ex = assertThrows(AtInvalidAtKeyException.class, () -> { Metadata metadata = new Metadata(); metadata.ttl = -100; metadata.ttb = 0; metadata.ttr = -1; AtClientValidation.validateMetadata(metadata); }); + assertThat(ex.getMessage(), equalTo("ttl cannot be null and cannot be negative")); // null ttb - assertThrows(AtException.class, () -> { + ex = assertThrows(AtInvalidAtKeyException.class, () -> { Metadata metadata = new Metadata(); metadata.ttl = 0; metadata.ttb = null; metadata.ttr = -1; AtClientValidation.validateMetadata(metadata); }); + assertThat(ex.getMessage(), equalTo("ttb cannot be null and cannot be negative")); // negative ttb - assertThrows(AtException.class, () -> { + ex = assertThrows(AtInvalidAtKeyException.class, () -> { Metadata metadata = new Metadata(); metadata.ttl = 0; metadata.ttb = -100; metadata.ttr = -1; AtClientValidation.validateMetadata(metadata); }); + assertThat(ex.getMessage(), equalTo("ttb cannot be null and cannot be negative")); // null ttr - assertThrows(AtException.class, () -> { + ex = assertThrows(AtInvalidAtKeyException.class, () -> { Metadata metadata = new Metadata(); metadata.ttl = 0; metadata.ttb = 0; metadata.ttr = null; AtClientValidation.validateMetadata(metadata); }); + assertThat(ex.getMessage(), equalTo("ttr cannot be null and cannot be < -1")); // ttr < -1 - assertThrows(AtException.class, () -> { + ex = assertThrows(AtInvalidAtKeyException.class, () -> { Metadata metadata = new Metadata(); metadata.ttl = 0; metadata.ttb = 0; metadata.ttr = -2; AtClientValidation.validateMetadata(metadata); }); - } - - // atSign exists (uses secondaryaddress.finder) - @Test - public void atSignExistsTest() { - - final String VALID_ROOT_URL = "root.atsign.org:64"; // prod rootUrl - - // null atSign - assertThrows(AtException.class, () -> { - AtSign atSign = null; - AtClientValidation.atSignExists(atSign, VALID_ROOT_URL); - }); - - // empty atSign - assertThrows(IllegalArgumentException.class, () -> { - AtSign atSign = new AtSign(""); - AtClientValidation.atSignExists(atSign, VALID_ROOT_URL); - }); - - // root does not contain atSign - assertThrows(AtException.class, () -> { - AtSign atSign = new AtSign("someAtSignThatDNE456"); - AtClientValidation.atSignExists(atSign, VALID_ROOT_URL); - }); - - // invalid root - assertThrows(AtException.class, () -> { - AtSign atSign = new AtSign("smoothalligator"); - AtClientValidation.atSignExists(atSign, "invalidroot:32123"); - }); - - } - - // validate AtKey object is ready (checks atKey.name validity, metadata - // validity, and if sharedWith exists) - @Test - public void validateAtKeyTest() { - final String ROOT_URL = "root.atsign.org:64"; - - // ==================================== - // PublicKey tests - // ==================================== - - // null publicKey - assertThrows(AtException.class, () -> { - PublicKey publicKey = null; - AtClientValidation.validateAtKey(publicKey, ROOT_URL); - }); - - // public key with invalid ttr - assertThrows(AtException.class, () -> { - AtSign sharedBy = new AtSign("@bob"); - PublicKey publicKey = new KeyBuilders.PublicKeyBuilder(sharedBy).key("test").build(); - publicKey.metadata.ttr = -2; - AtClientValidation.validateAtKey(publicKey, ""); - }); - - // ==================================== - // SelfKey tests - // ==================================== - - // null selfKey - assertThrows(AtException.class, () -> { - SelfKey selfKey = null; - AtClientValidation.validateAtKey(selfKey, ROOT_URL); - }); - - // self key with invalid keyName - assertThrows(AtException.class, () -> { - AtSign sharedBy = new AtSign("@bob"); - SelfKey selfKey = new KeyBuilders.SelfKeyBuilder(sharedBy).key("t est").build(); - AtClientValidation.validateAtKey(selfKey, ROOT_URL); - }); - - // self key with non-existent sharedWith atSign in root - assertThrows(AtException.class, () -> { - AtSign sharedBy = new AtSign("@nonexistentatsign"); - AtSign sharedWith = new AtSign("@nonexistentatsign"); // atSign does not exist in root - SelfKey selfKey = new KeyBuilders.SelfKeyBuilder(sharedBy, sharedWith).key("test").build(); - AtClientValidation.validateAtKey(selfKey, ROOT_URL); - }); - - // ==================================== - // SharedKey tests - // ==================================== - - // null shared key test - assertThrows(AtException.class, () -> { - SharedKey sharedKey = null; - AtClientValidation.validateAtKey(sharedKey, ROOT_URL); - }); + assertThat(ex.getMessage(), equalTo("ttr cannot be null and cannot be < -1")); - // shared key with ttr < -1 - assertThrows(AtException.class, () -> { - AtSign sharedBy = new AtSign("@bob"); - AtSign sharedWith = new AtSign("@alice"); - SharedKey sharedKey = new KeyBuilders.SharedKeyBuilder(sharedBy, sharedWith).key("test").build(); - sharedKey.metadata.ttr = -22323; - AtClientValidation.validateAtKey(sharedKey, ROOT_URL); - }); - - // shared key with invalid keyName - assertThrows(AtException.class, () -> { - AtSign sharedBy = new AtSign("@bob"); - AtSign sharedWith = new AtSign("@alice"); - SharedKey sharedKey = new KeyBuilders.SharedKeyBuilder(sharedBy, sharedWith).key("t est").build(); - AtClientValidation.validateAtKey(sharedKey, ROOT_URL); - }); - - // shared key with invalid sharedWith atSign (atSign dne in root) - assertThrows(AtException.class, () -> { - AtSign sharedBy = new AtSign("@wildgreen"); - AtSign sharedWith = new AtSign("@nonexistentatsign"); // atSign does not exist in root - SharedKey sharedKey = new KeyBuilders.SharedKeyBuilder(sharedBy, sharedWith).key("test").build(); - AtClientValidation.validateAtKey(sharedKey, ROOT_URL); - }); - - // empty root url - assertThrows(AtException.class, () -> { - AtSign sharedBy = new AtSign("@bob"); - AtSign sharedWith = new AtSign("@alice"); - SharedKey sharedKey = new KeyBuilders.SharedKeyBuilder(sharedBy, sharedWith).key("test").build(); - AtClientValidation.validateAtKey(sharedKey, ""); - }); - - // ==================================== - // PrivateHiddenKey tests - // ==================================== - - // TODO } - - @After - public void tearDown() {} - } diff --git a/at_client/src/test/java/org/atsign/common/ByteUtilTest.java b/at_client/src/test/java/org/atsign/common/ByteUtilTest.java index b504af88..bab1c660 100644 --- a/at_client/src/test/java/org/atsign/common/ByteUtilTest.java +++ b/at_client/src/test/java/org/atsign/common/ByteUtilTest.java @@ -1,11 +1,11 @@ package org.atsign.common; -import static org.junit.Assert.assertEquals; - import org.atsign.client.util.ByteUtil; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ByteUtilTest { @@ -22,7 +22,7 @@ public void testByteUtil0() { public void testByteUtil1() { String s = "ABC"; byte[] bytes = {65, 66, 67}; - Assert.assertArrayEquals(bytes, ByteUtil.convert(s)); + assertArrayEquals(bytes, ByteUtil.convert(s)); } @Test @@ -35,7 +35,7 @@ public void testByteUtil2() { public void testByteUtil3() { String s = "@>KU`-"; byte[] bytes = {64, 62, 75, 85, 96, 45}; - Assert.assertArrayEquals(bytes, ByteUtil.convert(s)); + assertArrayEquals(bytes, ByteUtil.convert(s)); } @Test @@ -48,7 +48,7 @@ public void testByteUtil4() { public void testByteUtil5() { String s = "TECHNOLOGY"; byte[] bytes = {84, 69, 67, 72, 78, 79, 76, 79, 71, 89}; - Assert.assertArrayEquals(bytes, ByteUtil.convert(s)); + assertArrayEquals(bytes, ByteUtil.convert(s)); } @Test @@ -61,7 +61,7 @@ public void testByteUtil6() { public void testByteUtil7() { String s = "+ada#4C0)"; byte[] bytes = {43, 97, 100, 97, 35, 52, 67, 48, 41}; - Assert.assertArrayEquals(bytes, ByteUtil.convert(s)); + assertArrayEquals(bytes, ByteUtil.convert(s)); } @Test @@ -74,7 +74,7 @@ public void testByteUtil8() { public void testByteUtil9() { String s = "at_sign"; byte[] bytes = {97, 116, 95, 115, 105, 103, 110}; - Assert.assertArrayEquals(bytes, ByteUtil.convert(s)); + assertArrayEquals(bytes, ByteUtil.convert(s)); } @Test diff --git a/at_client/src/test/java/org/atsign/common/ConfigReaderTest.java b/at_client/src/test/java/org/atsign/common/ConfigReaderTest.java index a615283c..6ad21c26 100644 --- a/at_client/src/test/java/org/atsign/common/ConfigReaderTest.java +++ b/at_client/src/test/java/org/atsign/common/ConfigReaderTest.java @@ -1,11 +1,11 @@ package org.atsign.common; -import static org.junit.Assert.assertEquals; - import java.io.IOException; import org.atsign.config.ConfigReader; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class ConfigReaderTest { diff --git a/at_client/src/test/java/org/atsign/common/DateUtilTest.java b/at_client/src/test/java/org/atsign/common/DateUtilTest.java index 7064a8ab..c127a6da 100644 --- a/at_client/src/test/java/org/atsign/common/DateUtilTest.java +++ b/at_client/src/test/java/org/atsign/common/DateUtilTest.java @@ -1,13 +1,13 @@ package org.atsign.common; -import static org.junit.Assert.assertEquals; - import java.text.ParseException; import java.time.Month; import java.time.OffsetDateTime; import org.atsign.client.util.DateUtil; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class DateUtilTest { diff --git a/at_client/src/test/java/org/atsign/common/FromStringTest.java b/at_client/src/test/java/org/atsign/common/FromStringTest.java index e781747e..9e3b0bf1 100644 --- a/at_client/src/test/java/org/atsign/common/FromStringTest.java +++ b/at_client/src/test/java/org/atsign/common/FromStringTest.java @@ -1,15 +1,12 @@ package org.atsign.common; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import org.atsign.client.api.Secondary; import org.atsign.common.Keys.AtKey; -import org.junit.Test; import com.fasterxml.jackson.core.JsonProcessingException; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; public class FromStringTest { diff --git a/at_client/src/test/java/org/atsign/common/KeyStringUtilTest.java b/at_client/src/test/java/org/atsign/common/KeyStringUtilTest.java index 7b919fa5..8de5799d 100644 --- a/at_client/src/test/java/org/atsign/common/KeyStringUtilTest.java +++ b/at_client/src/test/java/org/atsign/common/KeyStringUtilTest.java @@ -2,11 +2,11 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.*; import org.atsign.client.util.KeyStringUtil; import org.atsign.client.util.KeyStringUtil.KeyType; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class KeyStringUtilTest { // https://docs.google.com/spreadsheets/d/1EOcF_vznBoKWXxRT8dbeG47RP7wnF30ubwXghganTlk/edit#gid=0 @@ -18,12 +18,12 @@ public void publicKey() { KeyStringUtil keyStringUtil = new KeyStringUtil(KEY_NAME); assertEquals("public:phone@bob", keyStringUtil.getFullKeyName()); assertEquals("phone", keyStringUtil.getKeyName()); - assertEquals(null, keyStringUtil.getNamespace()); + assertNull(null, keyStringUtil.getNamespace()); assertEquals(KeyType.PUBLIC_KEY, keyStringUtil.getKeyType()); assertEquals("@bob", keyStringUtil.getSharedBy()); - assertEquals(null, keyStringUtil.getSharedWith()); - assertEquals(false, keyStringUtil.isCached()); - assertEquals(false, keyStringUtil.isHidden()); + assertNull(keyStringUtil.getSharedWith()); + assertFalse(keyStringUtil.isCached()); + assertFalse(keyStringUtil.isHidden()); } // Row 5 Public Hidden key @@ -33,12 +33,12 @@ public void publicKey2() { KeyStringUtil keyStringUtil = new KeyStringUtil(KEY_NAME); assertEquals("public:_phone@bob", keyStringUtil.getFullKeyName()); assertEquals("_phone", keyStringUtil.getKeyName()); - assertEquals(null, keyStringUtil.getNamespace()); + assertNull(keyStringUtil.getNamespace()); assertEquals(KeyType.PUBLIC_KEY, keyStringUtil.getKeyType()); assertEquals("@bob", keyStringUtil.getSharedBy()); - assertEquals(null, keyStringUtil.getSharedWith()); - assertEquals(false, keyStringUtil.isCached()); - assertEquals(true, keyStringUtil.isHidden()); + assertNull(keyStringUtil.getSharedWith()); + assertFalse(keyStringUtil.isCached()); + assertTrue(keyStringUtil.isHidden()); } // Row 6 Public Hidden key @@ -48,12 +48,12 @@ public void publicKey3() { KeyStringUtil keyStringUtil = new KeyStringUtil(KEY_NAME); assertEquals("public:__phone@bob", keyStringUtil.getFullKeyName()); assertEquals("__phone", keyStringUtil.getKeyName()); - assertEquals(null, keyStringUtil.getNamespace()); + assertNull(keyStringUtil.getNamespace()); assertEquals(KeyType.PUBLIC_KEY, keyStringUtil.getKeyType()); assertEquals("@bob", keyStringUtil.getSharedBy()); - assertEquals(null, keyStringUtil.getSharedWith()); - assertEquals(false, keyStringUtil.isCached()); - assertEquals(true, keyStringUtil.isHidden()); + assertNull(keyStringUtil.getSharedWith()); + assertFalse(keyStringUtil.isCached()); + assertTrue(keyStringUtil.isHidden()); } // Row 7A Public key and SharedWith populated @@ -62,12 +62,12 @@ public void publicKey4A() { KeyStringUtil keyStringUtil = new KeyStringUtil(KEY_NAME); assertEquals("public:@bob:phone@bob", keyStringUtil.getFullKeyName()); assertEquals("phone", keyStringUtil.getKeyName()); - assertEquals(null, keyStringUtil.getNamespace()); + assertNull(keyStringUtil.getNamespace()); assertEquals(KeyType.PUBLIC_KEY, keyStringUtil.getKeyType()); assertEquals("@bob", keyStringUtil.getSharedBy()); assertEquals("@bob", keyStringUtil.getSharedWith()); - assertEquals(false, keyStringUtil.isCached()); - assertEquals(false, keyStringUtil.isHidden()); + assertFalse(keyStringUtil.isCached()); + assertFalse(keyStringUtil.isHidden()); } // Row 7B Public key and SharedWith populated @@ -77,11 +77,11 @@ public void publicKey4B() { KeyStringUtil keyStringUtil = new KeyStringUtil(KEY_NAME); assertEquals("public:@alice:phone@bob", keyStringUtil.getFullKeyName()); assertEquals("phone", keyStringUtil.getKeyName()); - assertEquals(null, keyStringUtil.getNamespace()); + assertNull(keyStringUtil.getNamespace()); assertEquals(KeyType.PUBLIC_KEY, keyStringUtil.getKeyType()); assertEquals("@bob", keyStringUtil.getSharedBy()); assertEquals("@alice", keyStringUtil.getSharedWith()); - assertEquals(false, keyStringUtil.isCached()); + assertFalse(keyStringUtil.isCached()); } // Row 8 self key (sharedWith not populated) @@ -91,12 +91,12 @@ public void selfKey1() { KeyStringUtil keyStringUtil = new KeyStringUtil(KEY_NAME); assertEquals("phone@bob", keyStringUtil.getFullKeyName()); assertEquals("phone", keyStringUtil.getKeyName()); - assertEquals(null, keyStringUtil.getNamespace()); + assertNull(keyStringUtil.getNamespace()); assertEquals(KeyType.SELF_KEY, keyStringUtil.getKeyType()); assertEquals("@bob", keyStringUtil.getSharedBy()); - assertEquals(null, keyStringUtil.getSharedWith()); - assertEquals(false, keyStringUtil.isCached()); - assertEquals(false, keyStringUtil.isHidden()); + assertNull(keyStringUtil.getSharedWith()); + assertFalse(keyStringUtil.isCached()); + assertFalse(keyStringUtil.isHidden()); } // Row 9 Self key (sharedWith populated) @@ -106,12 +106,12 @@ public void selfKey2() { KeyStringUtil keyStringUtil = new KeyStringUtil(KEY_NAME); assertEquals("@bob:phone@bob", keyStringUtil.getFullKeyName()); assertEquals("phone", keyStringUtil.getKeyName()); - assertEquals(null, keyStringUtil.getNamespace()); + assertNull(keyStringUtil.getNamespace()); assertEquals(KeyType.SELF_KEY, keyStringUtil.getKeyType()); assertEquals("@bob", keyStringUtil.getSharedBy()); assertEquals("@bob", keyStringUtil.getSharedWith()); - assertEquals(false, keyStringUtil.isCached()); - assertEquals(false, keyStringUtil.isHidden()); + assertFalse(keyStringUtil.isCached()); + assertFalse(keyStringUtil.isHidden()); } // Row 10 Self hidden key (sharedWith populated) @@ -121,12 +121,12 @@ public void selfKey3() { KeyStringUtil keyStringUtil = new KeyStringUtil(KEY_NAME); assertEquals("@bob:_phone@bob", keyStringUtil.getFullKeyName()); assertEquals("_phone", keyStringUtil.getKeyName()); - assertEquals(null, keyStringUtil.getNamespace()); + assertNull(keyStringUtil.getNamespace()); assertEquals(KeyType.SELF_KEY, keyStringUtil.getKeyType()); assertEquals("@bob", keyStringUtil.getSharedBy()); assertEquals("@bob", keyStringUtil.getSharedWith()); - assertEquals(false, keyStringUtil.isCached()); - assertEquals(true, keyStringUtil.isHidden()); + assertFalse(keyStringUtil.isCached()); + assertTrue(keyStringUtil.isHidden()); } // row 11 Self Hidden Key without sharedWith @@ -136,12 +136,12 @@ public void selfKey4() { KeyStringUtil keyStringUtil = new KeyStringUtil(KEY_NAME); assertEquals("_phone@bob", keyStringUtil.getFullKeyName()); assertEquals("_phone", keyStringUtil.getKeyName()); - assertEquals(null, keyStringUtil.getNamespace()); + assertNull(keyStringUtil.getNamespace()); assertEquals(KeyType.PRIVATE_HIDDEN_KEY, keyStringUtil.getKeyType()); assertEquals("@bob", keyStringUtil.getSharedBy()); - assertEquals(null, keyStringUtil.getSharedWith()); - assertEquals(false, keyStringUtil.isCached()); - assertEquals(true, keyStringUtil.isHidden()); + assertNull(keyStringUtil.getSharedWith()); + assertFalse(keyStringUtil.isCached()); + assertTrue(keyStringUtil.isHidden()); } // Row 12 SharedKey @@ -151,12 +151,12 @@ public void sharedKey1() { KeyStringUtil keyStringUtil = new KeyStringUtil(KEY_NAME); assertEquals("@bob:phone@alice", keyStringUtil.getFullKeyName()); assertEquals("phone", keyStringUtil.getKeyName()); - assertEquals(null, keyStringUtil.getNamespace()); + assertNull(keyStringUtil.getNamespace()); assertEquals(KeyType.SHARED_KEY, keyStringUtil.getKeyType()); assertEquals("@bob", keyStringUtil.getSharedWith()); assertEquals("@alice", keyStringUtil.getSharedBy()); - assertEquals(false, keyStringUtil.isCached()); - assertEquals(false, keyStringUtil.isHidden()); + assertFalse(keyStringUtil.isCached()); + assertFalse(keyStringUtil.isHidden()); } // Row 13 Shared and hidden @@ -166,12 +166,12 @@ public void sharedKey2() { KeyStringUtil keyStringUtil = new KeyStringUtil(KEY_NAME); assertEquals("@alice:_phone@bob", keyStringUtil.getFullKeyName()); assertEquals("_phone", keyStringUtil.getKeyName()); - assertEquals(null, keyStringUtil.getNamespace()); + assertNull(keyStringUtil.getNamespace()); assertEquals(KeyType.SHARED_KEY, keyStringUtil.getKeyType()); assertEquals("@bob", keyStringUtil.getSharedBy()); assertEquals("@alice", keyStringUtil.getSharedWith()); - assertEquals(false, keyStringUtil.isCached()); - assertEquals(true, keyStringUtil.isHidden()); + assertFalse(keyStringUtil.isCached()); + assertTrue(keyStringUtil.isHidden()); } // Row 14A Private keys @@ -181,12 +181,12 @@ public void privateKey1() { KeyStringUtil keyStringUtil = new KeyStringUtil(KEY_NAME); assertEquals("private:phone@bob", keyStringUtil.getFullKeyName()); assertEquals("phone", keyStringUtil.getKeyName()); - assertEquals(null, keyStringUtil.getNamespace()); + assertNull(keyStringUtil.getNamespace()); assertEquals(KeyType.PRIVATE_HIDDEN_KEY, keyStringUtil.getKeyType()); assertEquals("@bob", keyStringUtil.getSharedBy()); - assertEquals(null, keyStringUtil.getSharedWith()); - assertEquals(false, keyStringUtil.isCached()); - assertEquals(true, keyStringUtil.isHidden()); + assertNull(keyStringUtil.getSharedWith()); + assertFalse(keyStringUtil.isCached()); + assertTrue(keyStringUtil.isHidden()); } // Row 14B Private keys @@ -196,12 +196,12 @@ public void privateKey2() { KeyStringUtil keyStringUtil = new KeyStringUtil(KEY_NAME); assertEquals("privatekey:phone@bob", keyStringUtil.getFullKeyName()); assertEquals("phone", keyStringUtil.getKeyName()); - assertEquals(null, keyStringUtil.getNamespace()); + assertNull(keyStringUtil.getNamespace()); assertEquals(KeyType.PRIVATE_HIDDEN_KEY, keyStringUtil.getKeyType()); assertEquals("@bob", keyStringUtil.getSharedBy()); - assertEquals(null, keyStringUtil.getSharedWith()); - assertEquals(false, keyStringUtil.isCached()); - assertEquals(true, keyStringUtil.isHidden()); + assertNull(keyStringUtil.getSharedWith()); + assertFalse(keyStringUtil.isCached()); + assertTrue(keyStringUtil.isHidden()); } /** @@ -222,12 +222,12 @@ public void suKey1() { KeyStringUtil keyStringUtil = new KeyStringUtil(KEY_NAME); assertEquals("@farinataanxious:lemon@sportsunconscious", keyStringUtil.getFullKeyName()); assertEquals("lemon", keyStringUtil.getKeyName()); - assertEquals(null, keyStringUtil.getNamespace()); + assertNull(keyStringUtil.getNamespace()); assertEquals(KeyType.SHARED_KEY, keyStringUtil.getKeyType()); assertEquals("@sportsunconscious", keyStringUtil.getSharedBy()); assertEquals("@farinataanxious", keyStringUtil.getSharedWith()); - assertEquals(false, keyStringUtil.isCached()); - assertEquals(false, keyStringUtil.isHidden()); + assertFalse(keyStringUtil.isCached()); + assertFalse(keyStringUtil.isHidden()); } @Test @@ -235,13 +235,13 @@ public void suKey2() { String KEY_NAME = "@farinataanxious:shared_key@sportsunconscious"; KeyStringUtil keyStringUtil = new KeyStringUtil(KEY_NAME); assertEquals("@farinataanxious:shared_key@sportsunconscious", keyStringUtil.getFullKeyName()); - assertEquals(null, keyStringUtil.getNamespace()); + assertNull(keyStringUtil.getNamespace()); assertEquals("shared_key", keyStringUtil.getKeyName()); assertEquals(KeyType.SHARED_KEY, keyStringUtil.getKeyType()); assertEquals("@sportsunconscious", keyStringUtil.getSharedBy()); assertEquals("@farinataanxious", keyStringUtil.getSharedWith()); - assertEquals(false, keyStringUtil.isCached()); - assertEquals(false, keyStringUtil.isHidden()); + assertFalse(keyStringUtil.isCached()); + assertFalse(keyStringUtil.isHidden()); } @Test @@ -250,12 +250,12 @@ public void suKey3() { KeyStringUtil keyStringUtil = new KeyStringUtil(KEY_NAME); assertEquals("@farinataanxious:test@sportsunconscious", keyStringUtil.getFullKeyName()); assertEquals("test", keyStringUtil.getKeyName()); - assertEquals(null, keyStringUtil.getNamespace()); + assertNull(keyStringUtil.getNamespace()); assertEquals(KeyType.SHARED_KEY, keyStringUtil.getKeyType()); assertEquals("@sportsunconscious", keyStringUtil.getSharedBy()); assertEquals("@farinataanxious", keyStringUtil.getSharedWith()); - assertEquals(false, keyStringUtil.isCached()); - assertEquals(false, keyStringUtil.isHidden()); + assertFalse(keyStringUtil.isCached()); + assertFalse(keyStringUtil.isHidden()); } @Test @@ -264,12 +264,12 @@ public void suKey4() { KeyStringUtil keyStringUtil = new KeyStringUtil(KEY_NAME); assertEquals("@sportsunconscious:shared_key@sportsunconscious", keyStringUtil.getFullKeyName()); assertEquals("shared_key", keyStringUtil.getKeyName()); - assertEquals(null, keyStringUtil.getNamespace()); + assertNull(keyStringUtil.getNamespace()); assertEquals(KeyType.SELF_KEY, keyStringUtil.getKeyType()); assertEquals("@sportsunconscious", keyStringUtil.getSharedBy()); assertEquals("@sportsunconscious", keyStringUtil.getSharedWith()); - assertEquals(false, keyStringUtil.isCached()); - assertEquals(false, keyStringUtil.isHidden()); + assertFalse(keyStringUtil.isCached()); + assertFalse(keyStringUtil.isHidden()); } @Test @@ -278,12 +278,12 @@ public void suKey5() { KeyStringUtil keyStringUtil = new KeyStringUtil(KEY_NAME); assertEquals("@sportsunconscious:signing_privatekey@sportsunconscious", keyStringUtil.getFullKeyName()); assertEquals("signing_privatekey", keyStringUtil.getKeyName()); - assertEquals(null, keyStringUtil.getNamespace()); + assertNull(keyStringUtil.getNamespace()); assertEquals(KeyType.SELF_KEY, keyStringUtil.getKeyType()); assertEquals("@sportsunconscious", keyStringUtil.getSharedBy()); assertEquals("@sportsunconscious", keyStringUtil.getSharedWith()); - assertEquals(false, keyStringUtil.isCached()); - assertEquals(false, keyStringUtil.isHidden()); + assertFalse(keyStringUtil.isCached()); + assertFalse(keyStringUtil.isHidden()); } @Test @@ -292,12 +292,12 @@ public void suKey6() { KeyStringUtil keyStringUtil = new KeyStringUtil(KEY_NAME); assertEquals("public:publickey@farinataanxious", keyStringUtil.getFullKeyName()); assertEquals("publickey", keyStringUtil.getKeyName()); - assertEquals(null, keyStringUtil.getNamespace()); + assertNull(keyStringUtil.getNamespace()); assertEquals(KeyType.PUBLIC_KEY, keyStringUtil.getKeyType()); assertEquals("@farinataanxious", keyStringUtil.getSharedBy()); - assertEquals(null, keyStringUtil.getSharedWith()); - assertEquals(false, keyStringUtil.isCached()); - assertEquals(false, keyStringUtil.isHidden()); + assertNull(keyStringUtil.getSharedWith()); + assertFalse(keyStringUtil.isCached()); + assertFalse(keyStringUtil.isHidden()); } @Test @@ -306,12 +306,12 @@ public void suKey7() { KeyStringUtil keyStringUtil = new KeyStringUtil(KEY_NAME); assertEquals("public:publickey@sportsunconscious", keyStringUtil.getFullKeyName()); assertEquals("publickey", keyStringUtil.getKeyName()); - assertEquals(null, keyStringUtil.getNamespace()); + assertNull(keyStringUtil.getNamespace()); assertEquals(KeyType.PUBLIC_KEY, keyStringUtil.getKeyType()); assertEquals("@sportsunconscious", keyStringUtil.getSharedBy()); - assertEquals(null, keyStringUtil.getSharedWith()); - assertEquals(false, keyStringUtil.isCached()); - assertEquals(false, keyStringUtil.isHidden()); + assertNull(keyStringUtil.getSharedWith()); + assertFalse(keyStringUtil.isCached()); + assertFalse(keyStringUtil.isHidden()); } @Test @@ -320,12 +320,12 @@ public void suKey8() { KeyStringUtil keyStringUtil = new KeyStringUtil(KEY_NAME); assertEquals("shared_key.farinataanxious@sportsunconscious", keyStringUtil.getFullKeyName()); assertEquals("shared_key.farinataanxious", keyStringUtil.getKeyName()); - assertEquals(null, keyStringUtil.getNamespace()); + assertNull(keyStringUtil.getNamespace()); assertEquals(KeyType.SELF_KEY, keyStringUtil.getKeyType()); assertEquals("@sportsunconscious", keyStringUtil.getSharedBy()); - assertEquals(null, keyStringUtil.getSharedWith()); - assertEquals(false, keyStringUtil.isCached()); - assertEquals(false, keyStringUtil.isHidden()); + assertNull(keyStringUtil.getSharedWith()); + assertFalse(keyStringUtil.isCached()); + assertFalse(keyStringUtil.isHidden()); } @Test @@ -400,8 +400,8 @@ public void saTest1() { assertEquals(KeyType.SHARED_KEY, keyStringUtil.getKeyType()); assertEquals("@smoothalligator", keyStringUtil.getSharedBy()); assertEquals("@abbcservicesinc", keyStringUtil.getSharedWith()); - assertEquals(false, keyStringUtil.isCached()); - assertEquals(false, keyStringUtil.isHidden()); + assertFalse(keyStringUtil.isCached()); + assertFalse(keyStringUtil.isHidden()); } @Test @@ -413,8 +413,8 @@ public void saTest2() { assertEquals(KeyType.SHARED_KEY, keyStringUtil.getKeyType()); assertEquals("@smoothalligator", keyStringUtil.getSharedBy()); assertEquals("@denise", keyStringUtil.getSharedWith()); - assertEquals(false, keyStringUtil.isCached()); - assertEquals(false, keyStringUtil.isHidden()); + assertFalse(keyStringUtil.isCached()); + assertFalse(keyStringUtil.isHidden()); } @Test @@ -423,13 +423,13 @@ public void saTest3() { KeyStringUtil keyStringUtil = new KeyStringUtil(KEY_NAME); assertEquals("@er_nobile_14:shared_key@smoothalligator", keyStringUtil.getFullKeyName()); assertEquals("shared_key", keyStringUtil.getKeyName()); - assertEquals(null, keyStringUtil.getNamespace()); + assertNull(keyStringUtil.getNamespace()); assertEquals(KeyType.SHARED_KEY, keyStringUtil.getKeyType()); assertEquals("@smoothalligator", keyStringUtil.getSharedBy()); assertEquals("@er_nobile_14", keyStringUtil.getSharedWith()); - assertEquals(false, keyStringUtil.isCached()); - assertEquals(false, keyStringUtil.isHidden()); - assertEquals(null, keyStringUtil.getNamespace()); + assertFalse(keyStringUtil.isCached()); + assertFalse(keyStringUtil.isHidden()); + assertNull(keyStringUtil.getNamespace()); } @Test @@ -438,12 +438,12 @@ public void saTest4() { KeyStringUtil keyStringUtil = new KeyStringUtil(KEY_NAME); assertEquals("@fascinatingsnow:shared_key@smoothalligator", keyStringUtil.getFullKeyName()); assertEquals("shared_key", keyStringUtil.getKeyName()); - assertEquals(null, keyStringUtil.getNamespace()); + assertNull(keyStringUtil.getNamespace()); assertEquals(KeyType.SHARED_KEY, keyStringUtil.getKeyType()); assertEquals("@smoothalligator", keyStringUtil.getSharedBy()); assertEquals("@fascinatingsnow", keyStringUtil.getSharedWith()); - assertEquals(false, keyStringUtil.isCached()); - assertEquals(false, keyStringUtil.isHidden()); + assertFalse(keyStringUtil.isCached()); + assertFalse(keyStringUtil.isHidden()); } @Test @@ -457,9 +457,9 @@ public void saTest7() { assertEquals("abbcservicesinc", keyStringUtil.getNamespace()); assertEquals(KeyType.SELF_KEY, keyStringUtil.getKeyType()); assertEquals("@smoothalligator", keyStringUtil.getSharedBy()); - assertEquals(null, keyStringUtil.getSharedWith()); - assertEquals(false, keyStringUtil.isCached()); - assertEquals(false, keyStringUtil.isHidden()); + assertNull(keyStringUtil.getSharedWith()); + assertFalse(keyStringUtil.isCached()); + assertFalse(keyStringUtil.isHidden()); } @Test diff --git a/at_client/src/test/java/org/atsign/common/KeysUtilTest.java b/at_client/src/test/java/org/atsign/common/KeysUtilTest.java index e0d2062f..6b48fc00 100644 --- a/at_client/src/test/java/org/atsign/common/KeysUtilTest.java +++ b/at_client/src/test/java/org/atsign/common/KeysUtilTest.java @@ -2,9 +2,7 @@ import static org.atsign.client.util.EncryptionUtil.generateAESKeyBase64; import static org.atsign.client.util.EncryptionUtil.generateRSAKeyPair; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; import java.io.File; import java.io.IOException; @@ -13,18 +11,14 @@ import org.atsign.client.api.AtKeys; import org.atsign.client.util.KeysUtil; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; public class KeysUtilTest { AtSign testAtSign = new AtSign("@testSaveKeysFile"); - @Before - public void setUp() {} - - @After + @AfterEach public void tearDown() throws IOException { Files.deleteIfExists(KeysUtil.getKeysFile(testAtSign, KeysUtil.expectedKeysFilesLocation).toPath()); Files.deleteIfExists(KeysUtil.getKeysFile(testAtSign, KeysUtil.legacyKeysFilesLocation).toPath()); diff --git a/at_client/src/test/java/org/atsign/common/ResponseTransformerTest.java b/at_client/src/test/java/org/atsign/common/ResponseTransformerTest.java index 57de672b..caefc7c3 100644 --- a/at_client/src/test/java/org/atsign/common/ResponseTransformerTest.java +++ b/at_client/src/test/java/org/atsign/common/ResponseTransformerTest.java @@ -1,28 +1,20 @@ package org.atsign.common; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; - import java.time.format.DateTimeFormatter; import org.atsign.client.api.Secondary; import org.atsign.common.response_models.LookupResponse; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; public class ResponseTransformerTest { final ObjectMapper mapper = new ObjectMapper(); final DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS'Z'"); - - @Before - public void setUp() {} - @Test public void scanResponseTransformerTest() { @@ -88,8 +80,4 @@ public void llookupAllResponseTransformerTest() throws JsonProcessingException { assertNull(model.metaData.pubKeyCS); assertNull(model.metaData.encoding); } - - @After - public void tearDown() {} - } diff --git a/at_client/src/test/java/org/atsign/common/VerbBuildersTest.java b/at_client/src/test/java/org/atsign/common/VerbBuildersTest.java index 27795fd3..a690603f 100644 --- a/at_client/src/test/java/org/atsign/common/VerbBuildersTest.java +++ b/at_client/src/test/java/org/atsign/common/VerbBuildersTest.java @@ -2,23 +2,18 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThrows; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import org.atsign.common.Keys.PublicKey; import org.atsign.common.Keys.SelfKey; import org.atsign.common.Keys.SharedKey; import org.atsign.common.VerbBuilders.PlookupVerbBuilder.Type; import org.atsign.common.VerbBuilders.*; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class VerbBuildersTest { - @Before - public void setUp() {} - @Test public void fromVerbBuilderTest() { FromVerbBuilder builder; @@ -625,46 +620,46 @@ public void scanVerbBuilderTest() { // Test not setting any parameters ScanVerbBuilder scanVerbBuilder = new ScanVerbBuilder(); String command = scanVerbBuilder.build(); - assertEquals("Just scan test", "scan", command); + assertEquals("scan", command); // Test setting just regex scanVerbBuilder = new ScanVerbBuilder(); scanVerbBuilder.setRegex("*.public"); command = scanVerbBuilder.build(); - assertEquals("Scan with regex", "scan *.public", command); + assertEquals("scan *.public", command); // Test setting just fromAtSign scanVerbBuilder = new ScanVerbBuilder(); scanVerbBuilder.setFromAtSign("@other"); command = scanVerbBuilder.build(); - assertEquals("Scan from another @sign", "scan:@other", command); + assertEquals("scan:@other", command); // Test seting just showHidden scanVerbBuilder = new ScanVerbBuilder(); scanVerbBuilder.setShowHidden(true); command = scanVerbBuilder.build(); - assertEquals("Scan with showHidden", "scan:showHidden:true", command); + assertEquals("scan:showHidden:true", command); // Test setting regex & fromAtSign scanVerbBuilder = new ScanVerbBuilder(); scanVerbBuilder.setRegex("*.public"); scanVerbBuilder.setFromAtSign("@other"); command = scanVerbBuilder.build(); - assertEquals("Scan with regex from another @sign", "scan:@other *.public", command); + assertEquals("scan:@other *.public", command); // Test setting regex & showHidden scanVerbBuilder = new ScanVerbBuilder(); scanVerbBuilder.setRegex("*.public"); scanVerbBuilder.setShowHidden(true); command = scanVerbBuilder.build(); - assertEquals("Scan with regex & showHidden", "scan:showHidden:true *.public", command); + assertEquals("scan:showHidden:true *.public", command); // Test setting fromAtSign & showHidden scanVerbBuilder = new ScanVerbBuilder(); scanVerbBuilder.setFromAtSign("@other"); scanVerbBuilder.setShowHidden(true); command = scanVerbBuilder.build(); - assertEquals("Scan with fromAtSign & showHidden", "scan:showHidden:true:@other", command); + assertEquals("scan:showHidden:true:@other", command); // Test setting regex & fromAtSign & showHidden scanVerbBuilder = new ScanVerbBuilder(); @@ -672,33 +667,27 @@ public void scanVerbBuilderTest() { scanVerbBuilder.setFromAtSign("@other"); scanVerbBuilder.setShowHidden(true); command = scanVerbBuilder.build(); - assertEquals("Scan with regex, fromAtSign & showHidden", "scan:showHidden:true:@other *.public", command); + assertEquals("scan:showHidden:true:@other *.public", command); } @Test public void notifyTextBuilderTest() { // Test not setting any parameters - assertThrows("Recipient @sign and text are mandatory. Expecting a IllegalArgumentException being thrown.", - IllegalArgumentException.class, () -> { - final NotifyTextVerbBuilder notifyTextBuilder = new NotifyTextVerbBuilder(); - // Expect build to throw Illegal argument exception for not setting the text - notifyTextBuilder.build(); - }); + final NotifyTextVerbBuilder builderWithNoFieldsSet = new NotifyTextVerbBuilder(); + assertThrows(IllegalArgumentException.class, builderWithNoFieldsSet::build, + "Recipient @sign and text are mandatory. Expecting a IllegalArgumentException being thrown."); // Test not setting the text - assertThrows("Text is mandatory. Expecting a IllegalArgumentException being thrown.", - IllegalArgumentException.class, () -> { - final NotifyTextVerbBuilder notifyTextBuilder = new NotifyTextVerbBuilder(); - notifyTextBuilder.setRecipientAtSign("@test"); - // Expect build to throw Illegal argument exception for not setting the text - notifyTextBuilder.build(); - }); + final NotifyTextVerbBuilder builderWithTextFieldUnset = new NotifyTextVerbBuilder(); + builderWithTextFieldUnset.setRecipientAtSign("@test"); + assertThrows(IllegalArgumentException.class, builderWithTextFieldUnset::build, + "Text is mandatory. Expecting a IllegalArgumentException being thrown."); NotifyTextVerbBuilder notifyTextBuilder = new NotifyTextVerbBuilder(); notifyTextBuilder.setText("Hi"); notifyTextBuilder.setRecipientAtSign("@test"); String expectedResult = "notify:messageType:text:@test:Hi"; - assertEquals("Notify text to an @sign", expectedResult, notifyTextBuilder.build()); + assertEquals(expectedResult, notifyTextBuilder.build()); // test not setting an '@' sign to the recipients at sign and expect it to be // appended properly @@ -706,68 +695,44 @@ public void notifyTextBuilderTest() { notifyTextBuilder.setText("Hello"); notifyTextBuilder.setRecipientAtSign("test"); expectedResult = "notify:messageType:text:@test:Hello"; - assertEquals("Notify text to an @sign", expectedResult, notifyTextBuilder.build()); + assertEquals(expectedResult, notifyTextBuilder.build()); } @Test public void notifyKeyChangeBuilderTest() { // Test not setting any parameters - assertThrows("Mandatory fields are not set. Expecting a IllegalArgumentException being thrown.", - IllegalArgumentException.class, () -> { - final NotifyKeyChangeBuilder notifyKeyChangeBuilder = new NotifyKeyChangeBuilder(); - // Expect build to throw Illegal argument exception for not setting key and - // other mandatory parameters - notifyKeyChangeBuilder.build(); - }); - - // Test not setting the key - assertThrows("Key is mandatory. Expecting a IllegalArgumentException being thrown.", - IllegalArgumentException.class, () -> { - final NotifyKeyChangeBuilder notifyKeyChangeBuilder = new NotifyKeyChangeBuilder(); - notifyKeyChangeBuilder.setOperation("update"); - notifyKeyChangeBuilder.setSenderAtSign("@sender"); - notifyKeyChangeBuilder.setRecipientAtSign("@recipient"); - // Expect build to throw Illegal argument exception for not setting the text - notifyKeyChangeBuilder.build(); - }); + final NotifyKeyChangeBuilder builderWithNoArgsSet = new NotifyKeyChangeBuilder(); + assertThrows(IllegalArgumentException.class, builderWithNoArgsSet::build, + "Mandatory fields are not set. Expecting a IllegalArgumentException being thrown."); // Test not setting the key - assertThrows("Key is mandatory. Expecting a IllegalArgumentException being thrown.", - IllegalArgumentException.class, () -> { - final NotifyKeyChangeBuilder notifyKeyChangeBuilder = new NotifyKeyChangeBuilder(); - notifyKeyChangeBuilder.setOperation("update"); - notifyKeyChangeBuilder.setSenderAtSign("@sender"); - notifyKeyChangeBuilder.setRecipientAtSign("@recipient"); - // Expect build to throw Illegal argument exception for not setting the text - notifyKeyChangeBuilder.build(); - }); + final NotifyKeyChangeBuilder builderWithNoKeySet = new NotifyKeyChangeBuilder(); + builderWithNoKeySet.setOperation("update"); + builderWithNoKeySet.setSenderAtSign("@sender"); + builderWithNoKeySet.setRecipientAtSign("@recipient"); + assertThrows(IllegalArgumentException.class, builderWithNoKeySet::build, + "Key is mandatory. Expecting a IllegalArgumentException being thrown."); // Test setting the value when ttr has been set - assertThrows("Value is mandatory if ttr has been set. Expecting a IllegalArgumentException being thrown.", - IllegalArgumentException.class, () -> { - final NotifyKeyChangeBuilder notifyKeyChangeBuilder = new NotifyKeyChangeBuilder(); - notifyKeyChangeBuilder.setOperation("update"); - notifyKeyChangeBuilder.setSenderAtSign("@sender"); - notifyKeyChangeBuilder.setRecipientAtSign("@recipient"); - notifyKeyChangeBuilder.setKey("phone"); - notifyKeyChangeBuilder.setTtr(10000); - // Expect build to throw Illegal argument exception for not setting the text - notifyKeyChangeBuilder.build(); - }); + final NotifyKeyChangeBuilder builderWithTrrSetButNoValue = new NotifyKeyChangeBuilder(); + builderWithTrrSetButNoValue.setOperation("update"); + builderWithTrrSetButNoValue.setSenderAtSign("@sender"); + builderWithTrrSetButNoValue.setRecipientAtSign("@recipient"); + builderWithTrrSetButNoValue.setKey("phone"); + builderWithTrrSetButNoValue.setTtr(10000); + assertThrows(IllegalArgumentException.class, builderWithTrrSetButNoValue::build, + "Value is mandatory if ttr has been set. Expecting a IllegalArgumentException being thrown."); // Test setting invalid ttr - assertThrows("Value is mandatory if ttr has been set. Expecting a IllegalArgumentException being thrown.", - IllegalArgumentException.class, () -> { - final NotifyKeyChangeBuilder notifyKeyChangeBuilder = new NotifyKeyChangeBuilder(); - notifyKeyChangeBuilder.setOperation("update"); - notifyKeyChangeBuilder.setSenderAtSign("@sender"); - notifyKeyChangeBuilder.setRecipientAtSign("@recipient"); - notifyKeyChangeBuilder.setKey("phone"); - notifyKeyChangeBuilder.setTtr(-100); - // Expect build to throw Illegal argument exception for not setting the text - notifyKeyChangeBuilder.build(); - }); + final NotifyKeyChangeBuilder builderWithNegativeTrrSetButNoValue = new NotifyKeyChangeBuilder(); + builderWithNegativeTrrSetButNoValue.setOperation("update"); + builderWithNegativeTrrSetButNoValue.setSenderAtSign("@sender"); + builderWithNegativeTrrSetButNoValue.setRecipientAtSign("@recipient"); + builderWithNegativeTrrSetButNoValue.setKey("phone"); + builderWithNegativeTrrSetButNoValue.setTtr(-100); + assertThrows(IllegalArgumentException.class, builderWithNegativeTrrSetButNoValue::build, + "Value is mandatory if ttr has been set. Expecting a IllegalArgumentException being thrown."); // test command NotifyKeyChangeBuilder notifyKeyChangeBuilder = new NotifyKeyChangeBuilder(); @@ -806,14 +771,9 @@ public void notifyKeyChangeBuilderTest() { public void notificationStatusVerbBuilderTest() { // Test not setting any parameters - assertThrows("Mandatory fields are not set. Expecting a IllegalArgumentException being thrown.", - IllegalArgumentException.class, () -> { - final NotificationStatusVerbBuilder notificationStatusVerbBuilder = - new NotificationStatusVerbBuilder(); - // Expect build to throw Illegal argument exception for not setting mandatory - // parameters - notificationStatusVerbBuilder.build(); - }); + final NotificationStatusVerbBuilder builderWithNoFieldsSet = new NotificationStatusVerbBuilder(); + assertThrows(IllegalArgumentException.class, builderWithNoFieldsSet::build, + "Mandatory fields are not set. Expecting a IllegalArgumentException being thrown."); final NotificationStatusVerbBuilder notificationStatusVerbBuilder = new NotificationStatusVerbBuilder(); notificationStatusVerbBuilder.setNotificationId("n1234"); @@ -822,6 +782,4 @@ public void notificationStatusVerbBuilderTest() { } - @After - public void tearDown() {} } diff --git a/at_client/src/test/java/org/atsign/cucumber/CucumberIT.java b/at_client/src/test/java/org/atsign/cucumber/CucumberIT.java index c3584326..eae90502 100644 --- a/at_client/src/test/java/org/atsign/cucumber/CucumberIT.java +++ b/at_client/src/test/java/org/atsign/cucumber/CucumberIT.java @@ -1,28 +1,18 @@ package org.atsign.cucumber; -import static java.util.concurrent.TimeUnit.SECONDS; +import static io.cucumber.junit.platform.engine.Constants.GLUE_PROPERTY_NAME; +import static io.cucumber.junit.platform.engine.Constants.PLUGIN_PROPERTY_NAME; -import org.atsign.cucumber.helpers.Helpers; -import org.atsign.virtualenv.VirtualEnv; -import org.junit.runner.RunWith; +import org.junit.platform.suite.api.ConfigurationParameter; +import org.junit.platform.suite.api.IncludeEngines; +import org.junit.platform.suite.api.SelectClasspathResource; +import org.junit.platform.suite.api.Suite; -import io.cucumber.junit.Cucumber; -import io.cucumber.junit.CucumberOptions; -import io.cucumber.plugin.EventListener; -import io.cucumber.plugin.event.EventPublisher; -import io.cucumber.plugin.event.TestRunStarted; +@Suite +@IncludeEngines("cucumber") +@SelectClasspathResource("features") +@ConfigurationParameter(key = GLUE_PROPERTY_NAME, value = "org.atsign.cucumber.steps") +@ConfigurationParameter(key = PLUGIN_PROPERTY_NAME, value = "pretty,org.atsign.cucumber.CucumberVirtualEnvPlugin") -@RunWith(Cucumber.class) -@CucumberOptions( - features = "src/test/resources/features", - glue = {"org.atsign.cucumber.steps"}, - plugin = {"pretty", "org.atsign.cucumber.CucumberIT"}) -public class CucumberIT implements EventListener { - - @Override - public void setEventPublisher(EventPublisher publisher) { - if (!Helpers.isHostPortReachable("vip.ve.atsign.zone:64", SECONDS.toMillis(2))) { - publisher.registerHandlerFor(TestRunStarted.class, e -> VirtualEnv.setUp()); - } - } +public class CucumberIT { } diff --git a/at_client/src/test/java/org/atsign/cucumber/CucumberVirtualEnvPlugin.java b/at_client/src/test/java/org/atsign/cucumber/CucumberVirtualEnvPlugin.java new file mode 100644 index 00000000..013331be --- /dev/null +++ b/at_client/src/test/java/org/atsign/cucumber/CucumberVirtualEnvPlugin.java @@ -0,0 +1,20 @@ +package org.atsign.cucumber; + +import static java.util.concurrent.TimeUnit.SECONDS; + +import org.atsign.cucumber.helpers.Helpers; +import org.atsign.virtualenv.VirtualEnv; + +import io.cucumber.plugin.EventListener; +import io.cucumber.plugin.event.EventPublisher; +import io.cucumber.plugin.event.TestRunStarted; + +public class CucumberVirtualEnvPlugin implements EventListener { + + @Override + public void setEventPublisher(EventPublisher publisher) { + if (!Helpers.isHostPortReachable("vip.ve.atsign.zone:64", SECONDS.toMillis(2))) { + publisher.registerHandlerFor(TestRunStarted.class, e -> VirtualEnv.setUp()); + } + } +} diff --git a/at_client/src/test/java/org/atsign/cucumber/steps/AtClientContext.java b/at_client/src/test/java/org/atsign/cucumber/steps/AtClientContext.java index 0f45fab4..2d7d6c0a 100644 --- a/at_client/src/test/java/org/atsign/cucumber/steps/AtClientContext.java +++ b/at_client/src/test/java/org/atsign/cucumber/steps/AtClientContext.java @@ -29,8 +29,8 @@ import org.atsign.common.AtSign; import org.atsign.cucumber.helpers.AtDemoData; import org.atsign.virtualenv.VirtualEnv; -import org.junit.AssumptionViolatedException; import org.junit.jupiter.api.function.Executable; +import org.opentest4j.TestAbortedException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -413,12 +413,12 @@ Map asMapOfStrings() { } } - private static AssumptionViolatedException createRootServerNotReachableAssumptionFailure(String rootHostAndPort) { + private static TestAbortedException createRootServerNotReachableAssumptionFailure(String rootHostAndPort) { String message = String.format("%s not reachable", rootHostAndPort); if (rootHostAndPort.contains("vip.ve")) { message = message + String.format(" (are you running the virtualenv? see test class %s)", VirtualEnv.class); } - return new AssumptionViolatedException(message); + return new TestAbortedException(message); } private void checkKeysPathExists(File path) { @@ -433,7 +433,7 @@ private void checkKeysPathExists(File path) { message = message + " (have you run mvn test-compile? this should download at_demo_data"; } if (message != null) { - throw new AssumptionViolatedException(message); + throw new TestAbortedException(message); } } diff --git a/at_shell/pom.xml b/at_shell/pom.xml index 77e22b2a..14893c6f 100644 --- a/at_shell/pom.xml +++ b/at_shell/pom.xml @@ -15,6 +15,8 @@ ../config/java-format.xml ../config/checkstyle.xml + + 2.4.0 @@ -28,7 +30,7 @@ org.fusesource.jansi jansi - 2.4.0 + ${version.jansi} @@ -89,7 +91,7 @@ - *:* + *:* META-INF/*.SF META-INF/*.DSA diff --git a/at_utils/pom.xml b/at_utils/pom.xml index 65455835..271c61d5 100644 --- a/at_utils/pom.xml +++ b/at_utils/pom.xml @@ -15,6 +15,8 @@ ../config/java-format.xml ../config/checkstyle.xml + + 0.3.12 @@ -28,13 +30,7 @@ com.github.sarxos webcam-capture - 0.3.12 - - - - org.apache.commons - commons-lang3 - 3.18.0 + ${version.webcam-capture} diff --git a/at_utils/src/main/java/org/atsign/client/util/CameraUtil.java b/at_utils/src/main/java/org/atsign/client/util/CameraUtil.java index e788aba1..d7bf3576 100644 --- a/at_utils/src/main/java/org/atsign/client/util/CameraUtil.java +++ b/at_utils/src/main/java/org/atsign/client/util/CameraUtil.java @@ -6,7 +6,6 @@ import java.util.List; import java.util.stream.Collectors; -import org.apache.commons.lang3.StringUtils; import org.atsign.common.AtException; import org.atsign.common.exceptions.AtClientConfigException; @@ -39,7 +38,7 @@ public class CameraUtil { * captures a single image from default camera */ public static BufferedImage getSingleImage() { - webcam = getWebcam(StringUtils.EMPTY); + webcam = Webcam.getDefault(); if (!webcam.isOpen()) { webcam.open(); } @@ -50,7 +49,7 @@ public static BufferedImage getSingleImage() { * captures a single image from default camera */ public static BufferedImage getSingleImage(String cameraName) { - webcam = getWebcam(cameraName); + webcam = Webcam.getWebcamByName(cameraName); if (!webcam.isOpen()) { webcam.open(); } @@ -79,7 +78,7 @@ public static void closeCamera() { * return the camera stream as list of byte[] from a specific camera */ public static List getCameraStream(String cameraName) throws AtException, IOException { - webcam = getWebcam(cameraName); + webcam = Webcam.getWebcamByName(cameraName); validateCamera(webcam); webcam.open(); List stream = captureStream(webcam); @@ -105,7 +104,7 @@ private static List captureStream(Webcam webcam) throws IOException { * return the camera stream into list of byte[] from a default camera */ public static List getCameraStream() throws AtException, IOException { - webcam = getWebcam(StringUtils.EMPTY); + webcam = Webcam.getDefault(); validateCamera(webcam); webcam.open(); List stream = captureStream(webcam); @@ -119,13 +118,4 @@ private static void validateCamera(Webcam webcam) throws AtException { } } - private static Webcam getWebcam(String name) { - Webcam webcam; - if (StringUtils.isEmpty(name)) { - webcam = Webcam.getDefault(); - } else { - webcam = Webcam.getWebcamByName(name); - } - return webcam; - } } diff --git a/pom.xml b/pom.xml index 822fefdb..5bc7fd1c 100644 --- a/pom.xml +++ b/pom.xml @@ -46,18 +46,15 @@ config/checkstyle.xml - 2.14.0 - 2.15.0 - 1.78 - 3.18.0 - 4.7.0 - - 4.13.2 - 5.10.2 + 2.15.4 + 1.78.1 + 4.7.6 + 2.0.9 + + 5.10.2 1.10.2 - 4.8.0 + 5.5.0 2.2 - 2.0.7 7.14.0 1.2.0 1.21.3 @@ -75,24 +72,11 @@ - com.fasterxml.jackson.core - jackson-core - ${version.jackson-core} - - - com.fasterxml.jackson.core - jackson-annotations - ${version.jackson} - - - com.fasterxml.jackson.core - jackson-databind - ${version.jackson} - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml + com.fasterxml.jackson + jackson-bom ${version.jackson} + pom + import @@ -107,12 +91,6 @@ ${version.picocli} - - org.apache.commons - commons-lang3 - ${version.commons} - - org.slf4j slf4j-api @@ -124,21 +102,10 @@ ${version.slf4j} - - junit - junit - ${version.junit4} - - - - org.junit.jupiter - junit-jupiter-api - ${version.junit} - org.junit.jupiter - junit-jupiter-engine - ${version.junit} + junit-jupiter + ${version.junit-jupiter} org.junit.platform @@ -187,7 +154,7 @@ io.cucumber - cucumber-junit + cucumber-junit-platform-engine ${version.cucumber} @@ -302,7 +269,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.30.0 + 2.43.0 From 6f32a61a27a0bc74853c406619217d6c4e5060ee Mon Sep 17 00:00:00 2001 From: akafredperry Date: Wed, 4 Feb 2026 16:13:47 +0000 Subject: [PATCH 2/2] revert spotless plugin --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5bc7fd1c..abc042e2 100644 --- a/pom.xml +++ b/pom.xml @@ -269,7 +269,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.43.0 + 2.30.0