JavaVersionUtil refactor

newrelic · Feb 2, 2022 · 483dc20 · 483dc20
1 parent b7859e2
commit 483dc20
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/newrelic-agent/src/main/java/com/newrelic/agent/config/JavaVersionUtils.java b/newrelic-agent/src/main/java/com/newrelic/agent/config/JavaVersionUtils.java
@@ -58,7 +58,9 @@ public static String getUnsupportedAgentJavaSpecVersionMessage(String javaSpecif
                     .append("Please use a 6.5.3 New Relic agent or a later version of Java.");
         } else if (EXCLUSIVE_MAX_JAVA_VERSION_PATTERN.matcher(javaSpecificationVersion).matches()) {
             message.append("Java version is: ").append(javaSpecificationVersion).append(". ");
-            message.append("This version of the New Relic Agent does not support versions of Java greater than 17.");
+            message.append("This version of the New Relic Agent does not support versions of Java greater than ");
+            message.append(MAX_SUPPORTED_VERSION);
+            message.append(".");
         }
         return message.toString();
     }

diff --git a/newrelic-agent/src/test/java/com/newrelic/agent/config/JavaVersionUtilsTest.java b/newrelic-agent/src/test/java/com/newrelic/agent/config/JavaVersionUtilsTest.java
@@ -52,7 +52,7 @@ public void unsupportedAgentVersionsLessThanJava8() {
     }
 
     @Test
-    public void unsupportedAgentVersionsExceedingJava16() {
+    public void javaVersionHigherThanSupported() {
         assertFalse(JavaVersionUtils.isAgentSupportedJavaSpecVersion("18.0"));
         assertFalse(JavaVersionUtils.isAgentSupportedJavaSpecVersion("18+181"));
         assertFalse(JavaVersionUtils.isAgentSupportedJavaSpecVersion("18.0+181"));
@@ -79,14 +79,14 @@ public void otherUnsupportedVersionStrings() {
     }
 
     @Test
-    public void unsupportedJavaVersionMessageWhenLessThanJava8() {
+    public void unsupportedJavaVersionMessageWhenLessThanMinimalSupportedVersion() {
         String msg = JavaVersionUtils.getUnsupportedAgentJavaSpecVersionMessage(JavaVersionUtils.JAVA_7);
         assertThat(msg, containsString(JavaVersionUtils.JAVA_7));
         assertThat(msg, containsString("6.5.3 New Relic agent"));
     }
 
     @Test
-    public void unsupportedJavaVersionMessageWhenGreaterThanJava17() {
+    public void unsupportedJavaVersionMessageWhenGreaterThanMaxSupportedVersion() {
         String msg = JavaVersionUtils.getUnsupportedAgentJavaSpecVersionMessage(JavaVersionUtils.JAVA_18);
         assertThat(msg, containsString(JavaVersionUtils.JAVA_18));
         assertThat(msg, containsString("Java greater than 17."));