Use SystemProperties in tests instead of a magic string lookup

apache · May 1, 2024 · c11d6d9 · c11d6d9
1 parent 450e80f
commit c11d6d9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -662,6 +662,12 @@ The following provides more details on the included cryptographic software:
       <version>2.2</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.14.0</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <developers>

diff --git a/src/test/java/org/apache/commons/crypto/random/CryptoRandomFactoryTest.java b/src/test/java/org/apache/commons/crypto/random/CryptoRandomFactoryTest.java
@@ -27,6 +27,7 @@
 import java.security.GeneralSecurityException;
 import java.util.Properties;
 
+import org.apache.commons.lang3.SystemProperties;
 import org.junit.jupiter.api.Test;
 
 public class CryptoRandomFactoryTest {
@@ -116,7 +117,7 @@ public void testFullClassName() throws GeneralSecurityException, IOException {
     @Test
     public void testGetOSRandom() throws GeneralSecurityException, IOException {
         // Windows does not have a /dev/random device
-        assumeTrue(!System.getProperty("os.name").contains("Windows"));
+        assumeTrue(!SystemProperties.getOsName().contains("Windows"));
         final Properties properties = new Properties();
         properties.setProperty(CryptoRandomFactory.CLASSES_KEY, CryptoRandomFactory.RandomProvider.OS.getClassName());
         try (final CryptoRandom random = CryptoRandomFactory.getCryptoRandom(properties)) {

diff --git a/src/test/java/org/apache/commons/crypto/random/OsCryptoRandomTest.java b/src/test/java/org/apache/commons/crypto/random/OsCryptoRandomTest.java
@@ -27,14 +27,15 @@
 import java.security.GeneralSecurityException;
 import java.util.Properties;
 
+import org.apache.commons.lang3.SystemProperties;
 import org.junit.jupiter.api.Test;
 
 public class OsCryptoRandomTest extends AbstractRandomTest {
 
     @Override
     public CryptoRandom getCryptoRandom() throws GeneralSecurityException {
         // Windows does not have a /dev/random device
-        assumeTrue(!System.getProperty("os.name").contains("Windows"));
+        assumeTrue(!SystemProperties.getOsName().contains("Windows"));
         final Properties props = new Properties();
         props.setProperty(CryptoRandomFactory.CLASSES_KEY, OsCryptoRandom.class.getName());
         final CryptoRandom random = CryptoRandomFactory.getCryptoRandom(props);