diff --git a/nucleus/core/kernel/pom.xml b/nucleus/core/kernel/pom.xml index e6c49771469..faa6587e630 100755 --- a/nucleus/core/kernel/pom.xml +++ b/nucleus/core/kernel/pom.xml @@ -175,6 +175,10 @@ org.junit.jupiter junit-jupiter-engine + + org.junit.jupiter + junit-jupiter-params + org.easymock easymock diff --git a/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/admin/ConfigAttributeSetTest.java b/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/admin/ConfigAttributeSetTest.java index 641044b6ca9..92e2c3bfb1b 100644 --- a/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/admin/ConfigAttributeSetTest.java +++ b/nucleus/core/kernel/src/test/java/com/sun/enterprise/v3/admin/ConfigAttributeSetTest.java @@ -32,7 +32,6 @@ import org.glassfish.main.core.kernel.test.KernelJUnitExtension; import org.glassfish.tests.utils.mock.MockGenerator; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.jvnet.hk2.config.ConfigListener; import org.jvnet.hk2.config.ConfigSupport; @@ -46,6 +45,9 @@ import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; +import org.junit.jupiter.params.provider.ValueSource; /** * test the set command @@ -66,8 +68,17 @@ public void addMissingServices() { adminSubject = mockGenerator.createAsadminSubject(); } - @Test - public void simpleAttributeSetTest() { + @ParameterizedTest(name = "{index}: Test setting {0}") + @CsvSource({ + "a direct property," + + "configs.config.server-config.network-config.network-listeners.network-listener.http-listener-1.port," + + "8090", + "an aliased property," + + "server.network-config.network-listeners.network-listener.http-listener-1.port," + + "8090" + + }) + public void setListenerPortNumber(String testDescription, String propertyName, String propertyValue) { CommandRunnerImpl runner = locator.getService(CommandRunnerImpl.class); assertNotNull(runner); @@ -81,6 +92,8 @@ public void simpleAttributeSetTest() { } } assertNotNull(listener); + + String oldPortValue = listener.getPort(); // Let's register a listener ObservableBean bean = (ObservableBean) ConfigSupport.getImpl(listener); @@ -88,8 +101,7 @@ public void simpleAttributeSetTest() { // parameters to the command ParameterMap parameters = new ParameterMap(); - parameters.set("DEFAULT", - "configs.config.server-config.network-config.network-listeners.network-listener.http-listener-1.port=8090"); + parameters.set("DEFAULT", propertyName + "=" + propertyValue); // execute the set command. PlainTextActionReporter reporter = new PlainTextActionReporter(); CommandInvocation invocation = runner.getCommandInvocation("set", reporter, adminSubject).parameters(parameters); @@ -103,13 +115,13 @@ public void simpleAttributeSetTest() { // check the result. String port = listener.getPort(); - assertEquals("8090", port); + assertEquals(propertyValue, port); // check we recevied the event assertNotNull(event); assertAll( - () -> assertEquals("8080", event.getOldValue()), - () -> assertEquals("8090", event.getNewValue()), + () -> assertEquals(oldPortValue, event.getOldValue()), + () -> assertEquals(propertyValue, event.getNewValue()), () -> assertEquals("port", event.getPropertyName()) );