diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties index a135021e5c38..a83f6d4bcdd6 100644 --- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties +++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties @@ -192,6 +192,7 @@ STR_7022_SERVER_NAME=GlassFish Server 7.0.22 STR_7023_SERVER_NAME=GlassFish Server 7.0.23 STR_7024_SERVER_NAME=GlassFish Server 7.0.24 STR_7025_SERVER_NAME=GlassFish Server 7.0.25 +STR_710_SERVER_NAME=GlassFish Server 7.1.0 STR_800_SERVER_NAME=GlassFish Server 8.0.0 # CommonServerSupport.java diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java index 2d955f5fe9a2..6fc1b63b413c 100644 --- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java +++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java @@ -557,7 +557,7 @@ public enum ServerDetails { ), /** - * details for an instance of GlassFish Server 7.0.24 + * details for an instance of GlassFish Server 7.0.25 */ GLASSFISH_SERVER_7_0_25(NbBundle.getMessage(ServerDetails.class, "STR_7025_SERVER_NAME", new Object[]{}), // NOI18N GlassfishInstanceProvider.JAKARTAEE10_DEPLOYER_FRAGMENT, @@ -566,6 +566,17 @@ public enum ServerDetails { "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.25/glassfish-7.0.25.zip", // NOI18N "http://www.eclipse.org/legal/epl-2.0" //NOI18N ), + + /** + * details for an instance of GlassFish Server 7.1.0 + */ + GLASSFISH_SERVER_7_1_0(NbBundle.getMessage(ServerDetails.class, "STR_710_SERVER_NAME", new Object[]{}), // NOI18N + GlassfishInstanceProvider.JAKARTAEE10_DEPLOYER_FRAGMENT, + GlassFishVersion.GF_7_1_0, + "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.1.0/glassfish-7.1.0.zip", // NOI18N + "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.1.0/glassfish-7.1.0.zip", // NOI18N + "http://www.eclipse.org/legal/epl-2.0" //NOI18N + ), /** * details for an instance of GlassFish Server 8.0.0 @@ -573,8 +584,8 @@ public enum ServerDetails { GLASSFISH_SERVER_8_0_0(NbBundle.getMessage(ServerDetails.class, "STR_800_SERVER_NAME", new Object[]{}), // NOI18N GlassfishInstanceProvider.JAKARTAEE11_DEPLOYER_FRAGMENT, GlassFishVersion.GF_8_0_0, - "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/8.0.0-M12/glassfish-8.0.0-M12.zip", // NOI18N - "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/8.0.0-M12/glassfish-8.0.0-M12.zip", // NOI18N + "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/8.0.0-M15/glassfish-8.0.0-M15.zip", // NOI18N + "https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/8.0.0-M15/glassfish-8.0.0-M15.zip", // NOI18N "http://www.eclipse.org/legal/epl-2.0" //NOI18N ); diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Bundle.properties b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Bundle.properties index 8cfeab56094b..a7f84f8b939e 100644 --- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Bundle.properties +++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/Bundle.properties @@ -193,6 +193,7 @@ STR_7022_SERVER_NAME=GlassFish Server 7.0.22 STR_7023_SERVER_NAME=GlassFish Server 7.0.23 STR_7024_SERVER_NAME=GlassFish Server 7.0.24 STR_7025_SERVER_NAME=GlassFish Server 7.0.25 +STR_710_SERVER_NAME=GlassFish Server 7.1.0 STR_V8_FAMILY_NAME=GlassFish Server STR_800_SERVER_NAME=GlassFish Server 8.0.0 diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersion.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersion.java index 2b3a5e5557c3..93b3b2488500 100644 --- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersion.java +++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersion.java @@ -146,6 +146,8 @@ public enum GlassFishVersion { GF_7_0_24 ((short) 7, (short) 0, (short) 24, (short) 0, GlassFishVersion.GF_7_0_24_STR), /** GlassFish 7.0.25 */ GF_7_0_25 ((short) 7, (short) 0, (short) 25, (short) 0, GlassFishVersion.GF_7_0_25_STR), + /** GlassFish 7.1.0 */ + GF_7_1_0 ((short) 7, (short) 1, (short) 0, (short) 0, GlassFishVersion.GF_7_1_0_STR), /** GlassFish 8.0.0 */ GF_8_0_0 ((short) 8, (short) 0, (short) 0, (short) 0, GlassFishVersion.GF_8_0_0_STR); // Class attributes // @@ -424,6 +426,11 @@ public enum GlassFishVersion { static final String GF_7_0_25_STR = "7.0.25"; /** Additional {@code String} representations of GF_7_0_25 value. */ static final String GF_7_0_25_STR_NEXT[] = {"7.0.25", "7.0.25.0"}; + + /** A {@code String} representation of GF_7_1_0 value. */ + static final String GF_7_1_0_STR = "7.1.0"; + /** Additional {@code String} representations of GF_7_1_0 value. */ + static final String GF_7_1_0_STR_NEXT[] = {"7.1.0", "7.1.0.0"}; /** A {@code String} representation of GF_8_0_0 value. */ static final String GF_8_0_0_STR = "8.0.0"; @@ -492,6 +499,7 @@ public enum GlassFishVersion { initStringValuesMapFromArray(GF_7_0_23, GF_7_0_23_STR_NEXT); initStringValuesMapFromArray(GF_7_0_24, GF_7_0_24_STR_NEXT); initStringValuesMapFromArray(GF_7_0_25, GF_7_0_25_STR_NEXT); + initStringValuesMapFromArray(GF_7_1_0, GF_7_1_0_STR_NEXT); initStringValuesMapFromArray(GF_8_0_0, GF_8_0_0_STR_NEXT); } diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/ServerTasks.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/ServerTasks.java index 9289b989e174..f89e9be8b368 100644 --- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/ServerTasks.java +++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/ServerTasks.java @@ -103,6 +103,37 @@ private static void addJavaAgent(GlassFishServer server, } } } + + /** + * Append module path and add modules to java options when there is at least + * one '--add-opens' without 'ALL-UNNAMED'. + *

+ * @param server GlassFish server entity. + * @param optList Returned list of java options. + */ + private static void appendModulePath(GlassFishServer server, + List optList) { + boolean needed = optList + .stream() + .filter( + opt -> + opt.contains("--add-opens") + && + !opt.contains("ALL-UNNAMED") + ) + .findAny() + .isPresent(); + if (needed) { + // appending module path and all modules in order to use + // '--add-opens' without 'ALL-UNNAMED'. + // See https://github.com/eclipse-ee4j/glassfish/pull/25537 + String modulePath = server.getServerHome() + File.separator + + ServerUtils.GF_LIB_DIR_NAME + File.separator + + "bootstrap"; + optList.add("--module-path=" + modulePath); + optList.add("--add-modules=ALL-MODULE-PATH"); + } + } /** * Adds server variables from variables map into Java VM options @@ -142,8 +173,9 @@ public static ResultProcess startServer(GlassFishServer server, JvmConfigReader jvmConfigReader = new JvmConfigReader(DAS_NAME); String domainAbsolutePath = server.getDomainsFolder() + File.separator + server.getDomainName(); - String domainXmlPath = domainAbsolutePath + File.separator + "config" - + File.separator + "domain.xml"; + String domainXmlPath = domainAbsolutePath + File.separator + + ServerUtils.GF_DOMAIN_CONFIG_DIR_NAME + File.separator + + ServerUtils.GF_DOMAIN_CONFIG_FILE_NAME; if (!TreeParser.readXml(new File(domainXmlPath), jvmConfigReader)) { // retry with platform default LOGGER.log(Level.INFO, "Retrying with {0} encoding", Charset.defaultCharset()); @@ -154,6 +186,7 @@ public static ResultProcess startServer(GlassFishServer server, } } List optList = jvmConfigReader.getOptList(); + appendModulePath(server, optList); Map propMap = jvmConfigReader.getPropMap(); addJavaAgent(server, jvmConfigReader); // try to find bootstraping jar - usually glassfish.jar diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderProvider.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderProvider.java index 4870dd20f690..c0f8cafe85a6 100644 --- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderProvider.java +++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/ConfigBuilderProvider.java @@ -240,6 +240,11 @@ public class ConfigBuilderProvider { private static final Config.Next CONFIG_V7_0_25 = new Config.Next(GlassFishVersion.GF_7_0_25, ConfigBuilderProvider.class.getResource("GlassFishV7_0_24.xml")); + + /** Library builder configuration since GlassFish 7.1.0. */ + private static final Config.Next CONFIG_V7_1_0 + = new Config.Next(GlassFishVersion.GF_7_1_0, + ConfigBuilderProvider.class.getResource("GlassFishV7_1_0.xml")); /** Library builder configuration since GlassFish 8.0.0. */ private static final Config.Next CONFIG_V8_0_0 @@ -260,7 +265,8 @@ public class ConfigBuilderProvider { CONFIG_V7_0_15, CONFIG_V7_0_16, CONFIG_V7_0_17, CONFIG_V7_0_18, CONFIG_V7_0_19, CONFIG_V7_0_20, CONFIG_V7_0_21, CONFIG_V7_0_22, CONFIG_V7_0_23, - CONFIG_V7_0_24, CONFIG_V7_0_24, CONFIG_V8_0_0); + CONFIG_V7_0_24, CONFIG_V7_0_25, CONFIG_V7_1_0, + CONFIG_V8_0_0); /** Builders array for each server instance. */ private static final ConcurrentMap builders diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV7_1_0.xml b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV7_1_0.xml new file mode 100644 index 000000000000..ee23801075cd --- /dev/null +++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV7_1_0.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV8_0_0.xml b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV8_0_0.xml index 553de53e5e5b..9dc54042d4ec 100644 --- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV8_0_0.xml +++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/config/GlassFishV8_0_0.xml @@ -28,6 +28,7 @@ + @@ -70,7 +71,7 @@ - + diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/ServerUtils.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/ServerUtils.java index c5a639e49857..e73391ffc10f 100644 --- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/ServerUtils.java +++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/utils/ServerUtils.java @@ -557,37 +557,38 @@ public static GlassFishVersion getServerVersion(final String serverHome) { ClassLoader cl = new URLClassLoader(new URL[] {commonUtilJar. toURI().toURL()}); Class c = cl.loadClass(VERSION_CLASS); - // Try to get version from com.sun.appserv.server.util.Version. - try { - Method mGetFullVersion = c.getMethod(VERSION_METHOD); - System.getProperties().put(GF_HOME_PROPERTY, serverHome); - String fullVersionString - = (String)mGetFullVersion.invoke(c); - System.getProperties().remove(GF_HOME_PROPERTY); - String versionString - = getVersionString(fullVersionString); + + // Use Manifest Bundle-Version. + try (JarFile jar = new JarFile(commonUtilJar)) { + Manifest manifest = jar.getManifest(); + String versionString = getVersionString(manifest + .getMainAttributes().getValue(BUNDLE_VERSION)); if (versionString != null) { version = GlassFishVersion.toValue(versionString); } - } catch (IllegalAccessException | IllegalArgumentException - | InvocationTargetException | NoSuchMethodException - | SecurityException | NoClassDefFoundError ex) { - Logger.log(Level.WARNING, "Cannot retrieve Glassfish version from: " - + commonUtilJar.getAbsolutePath() + ". " - + "Using Manifest Bundle-Version as fallback option:", ex); + } catch (IOException ioe) { + Logger.log(Level.WARNING, "Cannot retrieve Glassfish version from Manifest: " + + commonUtilJar.getAbsolutePath() + ": ", ioe); } - // Use Manifest Bundle-Version as fallback option. + if (version == null) { - try (JarFile jar = new JarFile(commonUtilJar)) { - Manifest manifest = jar.getManifest(); - String versionString = getVersionString(manifest - .getMainAttributes().getValue(BUNDLE_VERSION)); + // Try to get version from com.sun.appserv.server.util.Version as fallback option. + try { + Method mGetFullVersion = c.getMethod(VERSION_METHOD); + System.getProperties().put(GF_HOME_PROPERTY, serverHome); + String fullVersionString = (String)mGetFullVersion.invoke(c); + System.getProperties().remove(GF_HOME_PROPERTY); + String versionString + = getVersionString(fullVersionString); if (versionString != null) { version = GlassFishVersion.toValue(versionString); } - } catch (IOException ioe) { - Logger.log(Level.WARNING, "Cannot retrieve Glassfish version from Manifest: " - + commonUtilJar.getAbsolutePath() + ": ", ioe); + } catch (IllegalAccessException | IllegalArgumentException + | InvocationTargetException | NoSuchMethodException + | SecurityException | NoClassDefFoundError ex) { + Logger.log(Level.WARNING, "Cannot retrieve Glassfish version from: " + + commonUtilJar.getAbsolutePath() + ". " + + "Using Manifest Bundle-Version as fallback option:", ex); } } } catch (MalformedURLException | ClassNotFoundException ex) { diff --git a/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactoryTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactoryTest.java index 00574543aef4..29f61da6c4ff 100644 --- a/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactoryTest.java +++ b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/admin/AdminFactoryTest.java @@ -190,6 +190,32 @@ public void testGetInstanceforVersionGF7() { assertTrue(cmd.equals(runner.getCommand())); } + /** + * Test factory functionality for GlassFish v. 7.1.0 + *

+ * Factory should initialize REST {@code Runner} and point it to + * provided {@code Command} instance. + */ + @Test + public void testGetInstanceforVersionGF71() { + GlassFishServerEntity srv = new GlassFishServerEntity(); + srv.setVersion(GlassFishVersion.GF_7_1_0); + AdminFactory af = AdminFactory.getInstance(srv.getVersion()); + assertTrue(af instanceof AdminFactoryRest); + Command cmd = new CommandVersion(); + Runner runner; + try { + runner = af.getRunner(srv, cmd); + } catch (GlassFishIdeException gfie) { + runner = null; + fail("Exception in Runner initialization: " + gfie.getMessage()); + } + // Returned runner should be REST interface. + assertTrue(runner instanceof RunnerRest); + // Stored command entity should be the one we supplied. + assertTrue(cmd.equals(runner.getCommand())); + } + /** * Test factory functionality for GlassFish v. 8.0.0 *

diff --git a/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersionTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersionTest.java index d4fb84497a1f..27573e844e8d 100644 --- a/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersionTest.java +++ b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/data/GlassFishVersionTest.java @@ -143,6 +143,8 @@ public void testToValue() { GlassFishVersion.GF_7_0_24_STR_NEXT); verifyToValueFromAdditionalArray(GlassFishVersion.GF_7_0_25, GlassFishVersion.GF_7_0_25_STR_NEXT); + verifyToValueFromAdditionalArray(GlassFishVersion.GF_7_1_0, + GlassFishVersion.GF_7_1_0_STR_NEXT); verifyToValueFromAdditionalArray(GlassFishVersion.GF_8_0_0, GlassFishVersion.GF_8_0_0_STR_NEXT); } @@ -179,7 +181,7 @@ public void testToValueIncomplete() { GlassFishVersion.GF_7_0_20, GlassFishVersion.GF_7_0_21, GlassFishVersion.GF_7_0_22, GlassFishVersion.GF_7_0_23, GlassFishVersion.GF_7_0_24, GlassFishVersion.GF_7_0_25, - GlassFishVersion.GF_8_0_0 + GlassFishVersion.GF_7_1_0, GlassFishVersion.GF_8_0_0 }; String strings[] = { "1.0.1.4", "2.0.1.5", "2.1.0.3", "2.1.1.7", @@ -195,7 +197,7 @@ public void testToValueIncomplete() { "7.0.14.0", "7.0.15.0", "7.0.16.0", "7.0.17.0", "7.0.18.0", "7.0.19.0", "7.0.20.0", "7.0.21.0", "7.0.22.0", "7.0.23.0", "7.0.24.0", "7.0.25.0", - "8.0.0.0" + "7.1.0.0", "8.0.0.0" }; for (int i = 0; i < versions.length; i++) { GlassFishVersion version = GlassFishVersion.toValue(strings[i]); diff --git a/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/EnumUtilsTest.java b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/EnumUtilsTest.java index 9c28fd65aaec..34a27b3ee9ca 100644 --- a/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/EnumUtilsTest.java +++ b/enterprise/glassfish.tooling/test/unit/src/org/netbeans/modules/glassfish/tooling/utils/EnumUtilsTest.java @@ -21,7 +21,7 @@ import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_3; import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_4; import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_6_2_5; -import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_7_0_25; +import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_7_1_0; import static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_8_0_0; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -48,10 +48,10 @@ public class EnumUtilsTest { */ @Test public void testEq() { - assertFalse(EnumUtils.eq(GF_8_0_0, GF_7_0_25), "Equals for a > b shall be false."); + assertFalse(EnumUtils.eq(GF_8_0_0, GF_7_1_0), "Equals for a > b shall be false."); assertTrue(EnumUtils.eq(GF_8_0_0, GF_8_0_0), "Equals for a == b shall be true."); - assertFalse(EnumUtils.eq(GF_7_0_25, GF_6_2_5), "Equals for a > b shall be false."); - assertTrue(EnumUtils.eq(GF_7_0_25, GF_7_0_25), "Equals for a == b shall be true."); + assertFalse(EnumUtils.eq(GF_7_1_0, GF_6_2_5), "Equals for a > b shall be false."); + assertTrue(EnumUtils.eq(GF_7_1_0, GF_7_1_0), "Equals for a == b shall be true."); assertFalse(EnumUtils.eq(GF_4, GF_3), "Equals for a > b shall be false."); assertTrue(EnumUtils.eq(GF_4, GF_4), "Equals for a == b shall be true."); assertFalse(EnumUtils.eq(GF_3, GF_4), "Equals for a < b shall be false."); @@ -72,10 +72,10 @@ public void testEq() { */ @Test public void testNe() { - assertTrue(EnumUtils.ne(GF_8_0_0, GF_7_0_25), "Not equals for a > b shall be true."); + assertTrue(EnumUtils.ne(GF_8_0_0, GF_7_1_0), "Not equals for a > b shall be true."); assertFalse(EnumUtils.ne(GF_8_0_0, GF_8_0_0), "Not equals for a == b shall be false."); - assertTrue(EnumUtils.ne(GF_7_0_25, GF_6_2_5), "Not equals for a > b shall be true."); - assertFalse(EnumUtils.ne(GF_7_0_25, GF_7_0_25), "Not equals for a == b shall be false."); + assertTrue(EnumUtils.ne(GF_7_1_0, GF_6_2_5), "Not equals for a > b shall be true."); + assertFalse(EnumUtils.ne(GF_7_1_0, GF_7_1_0), "Not equals for a == b shall be false."); assertTrue(EnumUtils.ne(GF_4, GF_3), "Not equals for a > b shall be true."); assertFalse(EnumUtils.ne(GF_4, GF_4), "Not equals for a == b shall be false."); assertTrue(EnumUtils.ne(GF_3, GF_4), "Not equals for a < b shall be true."); @@ -96,10 +96,10 @@ public void testNe() { */ @Test public void testLt() { - assertFalse(EnumUtils.lt(GF_8_0_0, GF_7_0_25), "Less than for a > b shall be false."); + assertFalse(EnumUtils.lt(GF_8_0_0, GF_7_1_0), "Less than for a > b shall be false."); assertFalse(EnumUtils.lt(GF_8_0_0, GF_8_0_0), "Less than for a == b shall be false."); - assertFalse(EnumUtils.lt(GF_7_0_25, GF_6_2_5), "Less than for a > b shall be false."); - assertFalse(EnumUtils.lt(GF_7_0_25, GF_7_0_25), "Less than for a == b shall be false."); + assertFalse(EnumUtils.lt(GF_7_1_0, GF_6_2_5), "Less than for a > b shall be false."); + assertFalse(EnumUtils.lt(GF_7_1_0, GF_7_1_0), "Less than for a == b shall be false."); assertFalse(EnumUtils.lt(GF_4, GF_3), "Less than for a > b shall be false."); assertFalse(EnumUtils.lt(GF_4, GF_4), "Less than for a == b shall be false."); assertTrue(EnumUtils.lt(GF_3, GF_4), "Less than for a < b shall be true."); @@ -120,10 +120,10 @@ public void testLt() { */ @Test public void testLe() { - assertFalse(EnumUtils.le(GF_8_0_0, GF_7_0_25), "Less than or equal for a > b shall be false."); + assertFalse(EnumUtils.le(GF_8_0_0, GF_7_1_0), "Less than or equal for a > b shall be false."); assertTrue(EnumUtils.le(GF_8_0_0, GF_8_0_0), "Less than or equal for a == b shall be true."); - assertFalse(EnumUtils.le(GF_7_0_25, GF_6_2_5), "Less than or equal for a > b shall be false."); - assertTrue(EnumUtils.le(GF_7_0_25, GF_7_0_25), "Less than or equal for a == b shall be true."); + assertFalse(EnumUtils.le(GF_7_1_0, GF_6_2_5), "Less than or equal for a > b shall be false."); + assertTrue(EnumUtils.le(GF_7_1_0, GF_7_1_0), "Less than or equal for a == b shall be true."); assertFalse(EnumUtils.le(GF_4, GF_3), "Less than or equal for a > b shall be false."); assertTrue(EnumUtils.le(GF_4, GF_4), "Less than or equal for a == b shall be true."); assertTrue(EnumUtils.le(GF_3, GF_4), "Less than or equal for a < b shall be true."); @@ -144,10 +144,10 @@ public void testLe() { */ @Test public void testGt() { - assertTrue(EnumUtils.gt(GF_8_0_0, GF_7_0_25), "Greater than for a > b shall be true."); + assertTrue(EnumUtils.gt(GF_8_0_0, GF_7_1_0), "Greater than for a > b shall be true."); assertFalse(EnumUtils.gt(GF_8_0_0, GF_8_0_0), "Greater than for a == b shall be false."); - assertTrue(EnumUtils.gt(GF_7_0_25, GF_6_2_5), "Greater than for a > b shall be true."); - assertFalse(EnumUtils.gt(GF_7_0_25, GF_7_0_25), "Greater than for a == b shall be false."); + assertTrue(EnumUtils.gt(GF_7_1_0, GF_6_2_5), "Greater than for a > b shall be true."); + assertFalse(EnumUtils.gt(GF_7_1_0, GF_7_1_0), "Greater than for a == b shall be false."); assertTrue(EnumUtils.gt(GF_4, GF_3), "Greater than for a > b shall be true."); assertFalse(EnumUtils.gt(GF_4, GF_4), "Greater than for a == b shall be false."); assertFalse(EnumUtils.gt(GF_3, GF_4), "Greater than for a < b shall be false."); @@ -168,10 +168,10 @@ public void testGt() { */ @Test public void testGe() { - assertTrue(EnumUtils.ge(GF_8_0_0, GF_7_0_25), "Greater than or equal for a > b shall be true."); + assertTrue(EnumUtils.ge(GF_8_0_0, GF_7_1_0), "Greater than or equal for a > b shall be true."); assertTrue(EnumUtils.ge(GF_8_0_0, GF_8_0_0), "Greater than or equal for a == b shall be true."); - assertTrue(EnumUtils.ge(GF_7_0_25, GF_6_2_5), "Greater than or equal for a > b shall be true."); - assertTrue(EnumUtils.ge(GF_7_0_25, GF_7_0_25), "Greater than or equal for a == b shall be true."); + assertTrue(EnumUtils.ge(GF_7_1_0, GF_6_2_5), "Greater than or equal for a > b shall be true."); + assertTrue(EnumUtils.ge(GF_7_1_0, GF_7_1_0), "Greater than or equal for a == b shall be true."); assertTrue(EnumUtils.ge(GF_4, GF_3), "Greater than or equal for a > b shall be true."); assertTrue(EnumUtils.ge(GF_4, GF_4), "Greater than or equal for a == b shall be true."); assertFalse(EnumUtils.ge(GF_3, GF_4), "Greater than or equal for a < b shall be false.");