This is an automated email from the ASF dual-hosted git repository.
pepness pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new c2345a67ee Add support for GlassFish 7.0.10
new b8f586c597 Merge pull request #6747 from pepness/glassfish-7.0.10
c2345a67ee is described below
commit c2345a67ee0271a71b5863cedefa1a4e8cfeec48
Author: José Contreras <[email protected]>
AuthorDate: Mon Nov 27 16:26:19 2023 -0600
Add support for GlassFish 7.0.10
- Update maven central repo URL and test every link.
---
.../modules/glassfish/common/Bundle.properties | 1 +
.../modules/glassfish/common/ServerDetails.java | 53 ++++++++++++++--------
.../glassfish/common/wizards/Bundle.properties | 12 ++++-
.../glassfish/tooling/data/GlassFishVersion.java | 10 +++-
.../server/config/ConfigBuilderProvider.java | 7 ++-
.../glassfish/tooling/admin/AdminFactoryTest.java | 4 +-
.../tooling/data/GlassFishVersionTest.java | 8 +++-
.../glassfish/tooling/utils/EnumUtilsTest.java | 26 +++++------
8 files changed, 83 insertions(+), 38 deletions(-)
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 179f5da054..e5ad98c3b4 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
@@ -176,6 +176,7 @@ STR_706_SERVER_NAME=GlassFish Server 7.0.6
STR_707_SERVER_NAME=GlassFish Server 7.0.7
STR_708_SERVER_NAME=GlassFish Server 7.0.8
STR_709_SERVER_NAME=GlassFish Server 7.0.9
+STR_7010_SERVER_NAME=GlassFish Server 7.0.10
# CommonServerSupport.java
MSG_FLAKEY_NETWORK=<html>Network communication problem<br/>Could not establish
\
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 9a770188af..feb1f9760c 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
@@ -83,8 +83,8 @@ public enum ServerDetails {
GLASSFISH_SERVER_3_1_2(NbBundle.getMessage(ServerDetails.class,
"STR_312_SERVER_NAME", new Object[]{}), // NOI18N
GlassfishInstanceProvider.EE6WC_DEPLOYER_FRAGMENT,
GlassFishVersion.GF_3_1_2,
-
"https://download.oracle.com/glassfish/3.1.2/release/glassfish-3.1.2-ml.zip";,
// NOI18N
-
"https://download.oracle.com/glassfish/3.1.2/release/glassfish-3.1.2-ml.zip";,
// NOI18N
+
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/3.1.2/glassfish-3.1.2.zip";,
// NOI18N
+
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/3.1.2/glassfish-3.1.2.zip";,
// NOI18N
"https://javaee.github.io/glassfish/LICENSE"; //NOI18N
),
@@ -94,8 +94,8 @@ public enum ServerDetails {
GLASSFISH_SERVER_3_1_2_2(NbBundle.getMessage(ServerDetails.class,
"STR_3122_SERVER_NAME", new Object[]{}), // NOI18N
GlassfishInstanceProvider.EE6WC_DEPLOYER_FRAGMENT,
GlassFishVersion.GF_3_1_2_2,
-
"https://download.oracle.com/glassfish/3.1.2.2/release/glassfish-3.1.2.2-ml.zip";,
// NOI18N
-
"https://download.oracle.com/glassfish/3.1.2.2/release/glassfish-3.1.2.2-ml.zip";,
// NOI18N
+
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/3.1.2.2/glassfish-3.1.2.2.zip";,
// NOI18N
+
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/3.1.2.2/glassfish-3.1.2.2.zip";,
// NOI18N
"https://javaee.github.io/glassfish/LICENSE"; //NOI18N
),
@@ -105,13 +105,19 @@ public enum ServerDetails {
GLASSFISH_SERVER_4_0(NbBundle.getMessage(ServerDetails.class,
"STR_40_SERVER_NAME", new Object[]{}), // NOI18N
GlassfishInstanceProvider.EE7_DEPLOYER_FRAGMENT,
GlassFishVersion.GF_4,
-
"https://download.oracle.com/glassfish/4.0/release/glassfish-4.0-ml.zip";, //
NOI18N
-
"https://download.oracle.com/glassfish/4.0/release/glassfish-4.0-ml.zip";, //
NOI18N
+
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/4.0/glassfish-4.0.zip";,
// NOI18N
+
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/4.0/glassfish-4.0.zip";,
// NOI18N
"https://javaee.github.io/glassfish/LICENSE"; //NOI18N
),
- /**
- * details for an instance of GlassFish Server 4.0.1
+ /**
+ * Neither repos have this release:
+ * <pre>
+ * -{@code https://download.oracle.com/glassfish}
+ * -{@code
https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/}
+ *
+ * Details for an instance of GlassFish Server 4.0.1
+ * </pre>
*/
GLASSFISH_SERVER_4_0_1(NbBundle.getMessage(ServerDetails.class,
"STR_401_SERVER_NAME", new Object[]{}), // NOI18N
GlassfishInstanceProvider.EE7_DEPLOYER_FRAGMENT,
@@ -127,8 +133,8 @@ public enum ServerDetails {
GLASSFISH_SERVER_4_1(NbBundle.getMessage(ServerDetails.class,
"STR_41_SERVER_NAME", new Object[]{}), // NOI18N
GlassfishInstanceProvider.EE7_DEPLOYER_FRAGMENT,
GlassFishVersion.GF_4_1,
- "https://download.oracle.com/glassfish/4.1/release/glassfish-4.1.zip";,
// NOI18N
- "https://download.oracle.com/glassfish/4.1/release/glassfish-4.1.zip";,
// NOI18N
+
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/4.1/glassfish-4.1.zip";,
// NOI18N
+
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/4.1/glassfish-4.1.zip";,
// NOI18N
"https://javaee.github.io/glassfish/LICENSE"; //NOI18N
),
@@ -138,8 +144,8 @@ public enum ServerDetails {
GLASSFISH_SERVER_4_1_1(NbBundle.getMessage(ServerDetails.class,
"STR_411_SERVER_NAME", new Object[]{}), // NOI18N
GlassfishInstanceProvider.EE7_DEPLOYER_FRAGMENT,
GlassFishVersion.GF_4_1_1,
-
"https://download.oracle.com/glassfish/4.1.1/release/glassfish-4.1.1.zip";, //
NOI18N
-
"https://download.oracle.com/glassfish/4.1.1/release/glassfish-4.1.1.zip";, //
NOI18N
+
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/4.1.1/glassfish-4.1.1.zip";,
// NOI18N
+
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/4.1.1/glassfish-4.1.1.zip";,
// NOI18N
"https://javaee.github.io/glassfish/LICENSE"; //NOI18N
),
@@ -149,8 +155,8 @@ public enum ServerDetails {
GLASSFISH_SERVER_4_1_2(NbBundle.getMessage(ServerDetails.class,
"STR_412_SERVER_NAME", new Object[]{}), // NOI18N
GlassfishInstanceProvider.EE7_DEPLOYER_FRAGMENT,
GlassFishVersion.GF_4_1_2,
-
"https://download.oracle.com/glassfish/4.1.2/release/glassfish-4.1.2.zip";, //
NOI18N
-
"https://download.oracle.com/glassfish/4.1.2/release/glassfish-4.1.2.zip";, //
NOI18N
+
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/4.1.2/glassfish-4.1.2.zip";,
// NOI18N
+
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/4.1.2/glassfish-4.1.2.zip";,
// NOI18N
"https://javaee.github.io/glassfish/LICENSE"; //NOI18N
),
@@ -160,8 +166,8 @@ public enum ServerDetails {
GLASSFISH_SERVER_5_0(NbBundle.getMessage(ServerDetails.class,
"STR_50_SERVER_NAME", new Object[]{}), // NOI18N
GlassfishInstanceProvider.EE8_DEPLOYER_FRAGMENT,
GlassFishVersion.GF_5,
- "https://download.oracle.com/glassfish/5.0/release/glassfish-5.0.zip";,
// NOI18N
- "https://download.oracle.com/glassfish/5.0/release/glassfish-5.0.zip";,
// NOI18N
+
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/5.0/glassfish-5.0.zip";,
// NOI18N
+
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/5.0/glassfish-5.0.zip";,
// NOI18N
"https://javaee.github.io/glassfish/LICENSE"; //NOI18N
),
@@ -171,8 +177,8 @@ public enum ServerDetails {
GLASSFISH_SERVER_5_0_1(NbBundle.getMessage(ServerDetails.class,
"STR_501_SERVER_NAME", new Object[]{}), // NOI18N
GlassfishInstanceProvider.EE8_DEPLOYER_FRAGMENT,
GlassFishVersion.GF_5_0_1,
-
"https://download.oracle.com/glassfish/5.0.1/release/glassfish-5.0.1.zip";, //
NOI18N
-
"https://download.oracle.com/glassfish/5.0.1/release/glassfish-5.0.1.zip";, //
NOI18N
+
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/5.0.1/glassfish-5.0.1.zip";,
// NOI18N
+
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/5.0.1/glassfish-5.0.1.zip";,
// NOI18N
"https://javaee.github.io/glassfish/LICENSE"; //NOI18N
),
@@ -383,6 +389,17 @@ public enum ServerDetails {
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.9/glassfish-7.0.9.zip";,
// NOI18N
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.9/glassfish-7.0.9.zip";,
// NOI18N
"http://www.eclipse.org/legal/epl-2.0"; //NOI18N
+ ),
+
+ /**
+ * details for an instance of GlassFish Server 7.0.10
+ */
+ GLASSFISH_SERVER_7_0_10(NbBundle.getMessage(ServerDetails.class,
"STR_7010_SERVER_NAME", new Object[]{}), // NOI18N
+ GlassfishInstanceProvider.JAKARTAEE10_DEPLOYER_FRAGMENT,
+ GlassFishVersion.GF_7_0_10,
+
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.10/glassfish-7.0.10.zip";,
// NOI18N
+
"https://repo.maven.apache.org/maven2/org/glassfish/main/distributions/glassfish/7.0.10/glassfish-7.0.10.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 8ae5fc1e80..655d0815a8 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
@@ -167,7 +167,17 @@ STR_624_SERVER_NAME=GlassFish Server 6.2.4
STR_625_SERVER_NAME=GlassFish Server 6.2.5
STR_V7_FAMILY_NAME=GlassFish Server
-STR_7_SERVER_NAME=GlassFish Server 7.0.0
+STR_700_SERVER_NAME=GlassFish Server 7.0.0
+STR_701_SERVER_NAME=GlassFish Server 7.0.1
+STR_702_SERVER_NAME=GlassFish Server 7.0.2
+STR_703_SERVER_NAME=GlassFish Server 7.0.3
+STR_704_SERVER_NAME=GlassFish Server 7.0.4
+STR_705_SERVER_NAME=GlassFish Server 7.0.5
+STR_706_SERVER_NAME=GlassFish Server 7.0.6
+STR_707_SERVER_NAME=GlassFish Server 7.0.7
+STR_708_SERVER_NAME=GlassFish Server 7.0.8
+STR_709_SERVER_NAME=GlassFish Server 7.0.9
+STR_7010_SERVER_NAME=GlassFish Server 7.0.10
LBL_SELECT_BITS=Select
LBL_ChooseOne=Choose server to download:
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 382d352ad7..aaf61192f7 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
@@ -116,7 +116,9 @@ public enum GlassFishVersion {
/** GlassFish 7.0.8 */
GF_7_0_8 ((short) 7, (short) 0, (short) 8, (short) 0,
GlassFishVersion.GF_7_0_8_STR),
/** GlassFish 7.0.9 */
- GF_7_0_9 ((short) 7, (short) 0, (short) 9, (short) 0,
GlassFishVersion.GF_7_0_9_STR);
+ GF_7_0_9 ((short) 7, (short) 0, (short) 9, (short) 0,
GlassFishVersion.GF_7_0_9_STR),
+ /** GlassFish 7.0.10 */
+ GF_7_0_10 ((short) 7, (short) 0, (short) 10, (short) 0,
GlassFishVersion.GF_7_0_10_STR);
////////////////////////////////////////////////////////////////////////////
// Class attributes
//
////////////////////////////////////////////////////////////////////////////
@@ -316,6 +318,11 @@ public enum GlassFishVersion {
static final String GF_7_0_9_STR = "7.0.9";
/** Additional {@code String} representations of GF_7_0_9 value. */
static final String GF_7_0_9_STR_NEXT[] = {"7.0.9", "7.0.9.0"};
+
+ /** A {@code String} representation of GF_7_0_10 value. */
+ static final String GF_7_0_10_STR = "7.0.10";
+ /** Additional {@code String} representations of GF_7_0_10 value. */
+ static final String GF_7_0_10_STR_NEXT[] = {"7.0.10", "7.0.10.0"};
/**
* Stored <code>String</code> values for backward <code>String</code>
@@ -363,6 +370,7 @@ public enum GlassFishVersion {
initStringValuesMapFromArray(GF_7_0_7, GF_7_0_7_STR_NEXT);
initStringValuesMapFromArray(GF_7_0_8, GF_7_0_8_STR_NEXT);
initStringValuesMapFromArray(GF_7_0_9, GF_7_0_9_STR_NEXT);
+ initStringValuesMapFromArray(GF_7_0_10, GF_7_0_10_STR_NEXT);
}
////////////////////////////////////////////////////////////////////////////
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 b88efa20da..f639d2610e 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
@@ -163,6 +163,11 @@ public class ConfigBuilderProvider {
private static final Config.Next CONFIG_V7_0_9
= new Config.Next(GlassFishVersion.GF_7_0_9,
ConfigBuilderProvider.class.getResource("GlassFishV7_0_9.xml"));
+
+ /** Library builder configuration since GlassFish 7.0.10. */
+ private static final Config.Next CONFIG_V7_0_10
+ = new Config.Next(GlassFishVersion.GF_7_0_10,
+
ConfigBuilderProvider.class.getResource("GlassFishV7_0_9.xml"));
/** Library builder configuration for GlassFish cloud. */
private static final Config config
@@ -173,7 +178,7 @@ public class ConfigBuilderProvider {
CONFIG_V7_0_0, CONFIG_V7_0_1, CONFIG_V7_0_2,
CONFIG_V7_0_3, CONFIG_V7_0_4, CONFIG_V7_0_5,
CONFIG_V7_0_6, CONFIG_V7_0_7, CONFIG_V7_0_8,
- CONFIG_V7_0_9);
+ CONFIG_V7_0_9, CONFIG_V7_0_10);
/** Builders array for each server instance. */
private static final ConcurrentMap<GlassFishServer, ConfigBuilder> builders
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 b58d309303..fb7d6c3d55 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
@@ -168,7 +168,7 @@ public class AdminFactoryTest extends CommandTest {
}
/**
- * Test factory functionality for GlassFish v. 7.0.6
+ * Test factory functionality for GlassFish v. 7.0.10
* <p/>
* Factory should initialize REST {@code Runner} and point it to
* provided {@code Command} instance.
@@ -176,7 +176,7 @@ public class AdminFactoryTest extends CommandTest {
@Test
public void testGetInstanceforVersionGF7() {
GlassFishServerEntity srv = new GlassFishServerEntity();
- srv.setVersion(GlassFishVersion.GF_7_0_9);
+ srv.setVersion(GlassFishVersion.GF_7_0_10);
AdminFactory af = AdminFactory.getInstance(srv.getVersion());
assertTrue(af instanceof AdminFactoryRest);
Command cmd = new CommandVersion();
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 097c4575c1..39d38fdf45 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
@@ -117,6 +117,8 @@ public class GlassFishVersionTest {
GlassFishVersion.GF_7_0_8_STR_NEXT);
verifyToValueFromAdditionalArray(GlassFishVersion.GF_7_0_9,
GlassFishVersion.GF_7_0_9_STR_NEXT);
+ verifyToValueFromAdditionalArray(GlassFishVersion.GF_7_0_10,
+ GlassFishVersion.GF_7_0_10_STR_NEXT);
}
/**
@@ -142,7 +144,8 @@ public class GlassFishVersionTest {
GlassFishVersion.GF_7_0_2, GlassFishVersion.GF_7_0_3,
GlassFishVersion.GF_7_0_4, GlassFishVersion.GF_7_0_5,
GlassFishVersion.GF_7_0_6, GlassFishVersion.GF_7_0_7,
- GlassFishVersion.GF_7_0_8, GlassFishVersion.GF_7_0_9
+ GlassFishVersion.GF_7_0_8, GlassFishVersion.GF_7_0_9,
+ GlassFishVersion.GF_7_0_10
};
String strings[] = {
"1.0.1.4", "2.0.1.5", "2.1.0.3", "2.1.1.7",
@@ -153,7 +156,8 @@ public class GlassFishVersionTest {
"6.2.0.0", "6.2.1.0", "6.2.2.0", "6.2.3.0",
"6.2.4.0", "6.2.5.0", "7.0.0.0", "7.0.1.0",
"7.0.2.0", "7.0.3.0", "7.0.4.0", "7.0.5.0",
- "7.0.6.0", "7.0.7.0", "7.0.8.0", "7.0.9.0"
+ "7.0.6.0", "7.0.7.0", "7.0.8.0", "7.0.9.0",
+ "7.0.10.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 c3be362958..e655495613 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 @@ package org.netbeans.modules.glassfish.tooling.utils;
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_9;
+import static
org.netbeans.modules.glassfish.tooling.data.GlassFishVersion.GF_7_0_10;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
import org.testng.annotations.Test;
@@ -47,8 +47,8 @@ public class EnumUtilsTest {
*/
@Test
public void testEq() {
- assertFalse(EnumUtils.eq(GF_7_0_9, GF_6_2_5), "Equals for a > b shall
be false.");
- assertTrue(EnumUtils.eq(GF_7_0_9, GF_7_0_9), "Equals for a == b shall
be true.");
+ assertFalse(EnumUtils.eq(GF_7_0_10, GF_6_2_5), "Equals for a > b shall
be false.");
+ assertTrue(EnumUtils.eq(GF_7_0_10, GF_7_0_10), "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.");
@@ -69,8 +69,8 @@ public class EnumUtilsTest {
*/
@Test
public void testNe() {
- assertTrue(EnumUtils.ne(GF_7_0_9, GF_6_2_5), "Not equals for a > b
shall be true.");
- assertFalse(EnumUtils.ne(GF_7_0_9, GF_7_0_9), "Not equals for a == b
shall be false.");
+ assertTrue(EnumUtils.ne(GF_7_0_10, GF_6_2_5), "Not equals for a > b
shall be true.");
+ assertFalse(EnumUtils.ne(GF_7_0_10, GF_7_0_10), "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.");
@@ -91,8 +91,8 @@ public class EnumUtilsTest {
*/
@Test
public void testLt() {
- assertFalse(EnumUtils.lt(GF_7_0_9, GF_6_2_5), "Less than for a > b
shall be false.");
- assertFalse(EnumUtils.lt(GF_7_0_9, GF_7_0_9), "Less than for a == b
shall be false.");
+ assertFalse(EnumUtils.lt(GF_7_0_10, GF_6_2_5), "Less than for a > b
shall be false.");
+ assertFalse(EnumUtils.lt(GF_7_0_10, GF_7_0_10), "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.");
@@ -113,8 +113,8 @@ public class EnumUtilsTest {
*/
@Test
public void testLe() {
- assertFalse(EnumUtils.le(GF_7_0_9, GF_6_2_5), "Less than or equal for
a > b shall be false.");
- assertTrue(EnumUtils.le(GF_7_0_9, GF_7_0_9), "Less than or equal for a
== b shall be true.");
+ assertFalse(EnumUtils.le(GF_7_0_10, GF_6_2_5), "Less than or equal for
a > b shall be false.");
+ assertTrue(EnumUtils.le(GF_7_0_10, GF_7_0_10), "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.");
@@ -135,8 +135,8 @@ public class EnumUtilsTest {
*/
@Test
public void testGt() {
- assertTrue(EnumUtils.gt(GF_7_0_9, GF_6_2_5), "Greater than for a > b
shall be true.");
- assertFalse(EnumUtils.gt(GF_7_0_9, GF_7_0_9), "Greater than for a == b
shall be false.");
+ assertTrue(EnumUtils.gt(GF_7_0_10, GF_6_2_5), "Greater than for a > b
shall be true.");
+ assertFalse(EnumUtils.gt(GF_7_0_10, GF_7_0_10), "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.");
@@ -157,8 +157,8 @@ public class EnumUtilsTest {
*/
@Test
public void testGe() {
- assertTrue(EnumUtils.ge(GF_7_0_9, GF_6_2_5), "Greater than or equal
for a > b shall be true.");
- assertTrue(EnumUtils.ge(GF_7_0_9, GF_7_0_9), "Greater than or equal
for a == b shall be true.");
+ assertTrue(EnumUtils.ge(GF_7_0_10, GF_6_2_5), "Greater than or equal
for a > b shall be true.");
+ assertTrue(EnumUtils.ge(GF_7_0_10, GF_7_0_10), "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.");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
