* Adds --add-opens to the surefire-maven-plugin config required for deserialization using Gson/XStream
* Upgrades plugin dependencies to JDK 17 compatible versions
* Replaces some reflection that no longer works on JDK 17
* Fixes issues when mocking Random
* Run Nashorn dependant tests only on JDK < 15
Signed-off-by: Wouter Born <github@maindrain.net>
private static final String DEFAULT_LOCALE = "en";
- private static final long ONLINE_WAIT_TIMEOUT_IN_MILLISECONDS = 5000;
private static final long DISCOVERY_COMPLETION_TIMEOUT_IN_MILLISECONDS = 5000;
private static final long CHECK_INTERVAL_IN_MILLISECONDS = 100;
private final Inbox inbox;
private final ThingRegistry thingRegistry;
+ private long onlineWaitTimeoutInMilliseconds = 5000;
+
/**
* Creates a new {@link CreateBridgeServlet}.
*
this.thingRegistry = thingRegistry;
}
+ public void setOnlineWaitTimeoutInMilliseconds(long onlineWaitTimeoutInMilliseconds) {
+ this.onlineWaitTimeoutInMilliseconds = onlineWaitTimeoutInMilliseconds;
+ }
+
@Override
protected String getRedirectionDestination(HttpServletRequest request) {
String bridgeUidString = request.getParameter(BRIDGE_UID_PARAMETER_NAME);
private void waitForBridgeToComeOnline(Thing bridge) {
try {
waitForConditionWithTimeout(() -> bridge.getStatus() == ThingStatus.ONLINE,
- ONLINE_WAIT_TIMEOUT_IN_MILLISECONDS);
+ onlineWaitTimeoutInMilliseconds);
waitForConditionWithTimeout(new DiscoveryResultCountDoesNotChangeCondition(),
DISCOVERY_COMPLETION_TIMEOUT_IN_MILLISECONDS);
} catch (InterruptedException e) {
@Test
public void whenTheNumberOfFailedAttemptsIsNegativeThenZeroIsAssumedInstead() {
// given:
- Random random = mock(Random.class);
+ Random random = mock(Random.class, withSettings().withoutAnnotations());
when(random.nextLong()).thenReturn(RETRY_INTERVAL);
ExponentialBackoffWithJitter backoffStrategy = new ExponentialBackoffWithJitter(MINIMUM_WAIT_TIME,
@Test
public void whenThereIsNoFailedAttemptThenTheMaximalResultIsMinimumWaitTimePlusRetryInterval() {
// given:
- Random random = mock(Random.class);
+ Random random = mock(Random.class, withSettings().withoutAnnotations());
when(random.nextLong()).thenReturn(RETRY_INTERVAL);
ExponentialBackoffWithJitter backoffStrategy = new ExponentialBackoffWithJitter(MINIMUM_WAIT_TIME,
@Test
public void whenThereIsOneFailedAttemptThenTheMaximalResultIsMinimumWaitTimePlusTwiceTheRetryInterval() {
// given:
- Random random = mock(Random.class);
+ Random random = mock(Random.class, withSettings().withoutAnnotations());
when(random.nextLong()).thenReturn(RETRY_INTERVAL * 2);
ExponentialBackoffWithJitter backoffStrategy = new ExponentialBackoffWithJitter(MINIMUM_WAIT_TIME,
@Test
public void whenThereAreTwoFailedAttemptsThenTheMaximalResultIsMinimumWaitTimePlusFourTimesTheRetryInterval() {
// given:
- Random random = mock(Random.class);
+ Random random = mock(Random.class, withSettings().withoutAnnotations());
when(random.nextLong()).thenReturn(RETRY_INTERVAL * 4);
ExponentialBackoffWithJitter backoffStrategy = new ExponentialBackoffWithJitter(MINIMUM_WAIT_TIME,
@Test
public void whenThereAreTwoFailedAttemptsThenTheMinimalResultIsTheMinimumWaitTime() {
// given:
- Random random = mock(Random.class);
+ Random random = mock(Random.class, withSettings().withoutAnnotations());
when(random.nextLong()).thenReturn(0L);
ExponentialBackoffWithJitter backoffStrategy = new ExponentialBackoffWithJitter(MINIMUM_WAIT_TIME,
@Test
public void whenTheDrawnRandomValueIsNegativeThenItIsProjectedToAPositiveValue() {
// given:
- Random random = mock(Random.class);
+ Random random = mock(Random.class, withSettings().withoutAnnotations());
when(random.nextLong()).thenReturn(-RETRY_INTERVAL * 4 - 1);
ExponentialBackoffWithJitter backoffStrategy = new ExponentialBackoffWithJitter(MINIMUM_WAIT_TIME,
@Test
public void whenTheResultWouldBeLargerThanTheMaximumThenItIsCappedToTheMaximum() {
// given:
- Random random = mock(Random.class);
+ Random random = mock(Random.class, withSettings().withoutAnnotations());
when(random.nextLong()).thenReturn(MAXIMUM_WAIT_TIME - ALTERNATIVE_MINIMUM_WAIT_TIME);
ExponentialBackoffWithJitter backoffStrategy = new ExponentialBackoffWithJitter(ALTERNATIVE_MINIMUM_WAIT_TIME,
@Test
public void whenTheResultWouldBeLargerThanTheAlternativeMaximumThenItIsCappedToTheAlternativeMaximum() {
// given:
- Random random = mock(Random.class);
+ Random random = mock(Random.class, withSettings().withoutAnnotations());
when(random.nextLong()).thenReturn(ALTERNATIVE_MAXIMUM_WAIT_TIME - ALTERNATIVE_MINIMUM_WAIT_TIME);
ExponentialBackoffWithJitter backoffStrategy = new ExponentialBackoffWithJitter(ALTERNATIVE_MINIMUM_WAIT_TIME,
</configuration>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <!-- Required for JDK 17 compatibility, see: https://github.com/swagger-api/swagger-codegen/issues/11253 -->
+ <groupId>com.github.jknack</groupId>
+ <artifactId>handlebars</artifactId>
+ <version>4.3.0</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
</plugin>
</plugins>
</configuration>
+ <dependencies>
+ <dependency>
+ <!-- Required for JDK 17 compatibility, see: https://github.com/highsource/maven-jaxb2-plugin/issues/207 -->
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.3.6</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
commonSetup.start(new ResourceConfig().registerInstances(subject));
// Mock random -> always return int=10 or the highest possible int if bounded
- Random random = mock(Random.class);
+ Random random = mock(Random.class, withSettings().withoutAnnotations());
doReturn(10).when(random).nextInt();
doAnswer(a -> {
Integer bound = a.getArgument(0);
package org.openhab.transform.javascript.internal;
import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import java.io.File;
import java.io.IOException;
@MockitoSettings(strictness = Strictness.WARN)
public class JavaScriptTransformationServiceTest {
+ private static final boolean NASHORN_AVAILABLE = isNashornAvailable();
+
private static final String BASE_FOLDER = "target";
private static final String SRC_FOLDER = "conf";
private static final String CONFIG_FOLDER = BASE_FOLDER + File.separator + SRC_FOLDER;
}
};
+ /**
+ * Returns if the Nashorn JavaScript engine is available based on the Java specification version property.
+ * Nashorn has been removed from JDK 15 and onwards.
+ *
+ * @return {@code true} if Nashorn is available, {@code false} otherwise
+ */
+ private static boolean isNashornAvailable() {
+ try {
+ String javaVersion = System.getProperty("java.specification.version");
+ return javaVersion == null ? false : Long.parseLong(javaVersion) < 15;
+ } catch (NumberFormatException e) {
+ return false;
+ }
+ }
+
@BeforeEach
public void setUp() throws IOException {
+ assumeTrue(NASHORN_AVAILABLE);
+
JavaScriptEngineManager manager = new JavaScriptEngineManager();
processor = new TestableJavaScriptTransformationService(manager);
copyDirectory(SRC_FOLDER, CONFIG_FOLDER);
@AfterEach
public void tearDown() throws IOException {
- try (Stream<Path> walk = Files.walk(Path.of(CONFIG_FOLDER))) {
- walk.sorted(Comparator.reverseOrder()).map(Path::toFile).forEach(File::delete);
+ Path path = Path.of(CONFIG_FOLDER);
+ if (Files.exists(path)) {
+ try (Stream<Path> walk = Files.walk(path)) {
+ walk.sorted(Comparator.reverseOrder()).map(Path::toFile).forEach(File::delete);
+ }
}
}
import org.openhab.binding.mielecloud.internal.handler.MieleHandlerFactory;
import org.openhab.binding.mielecloud.internal.util.AbstractConfigFlowTest;
import org.openhab.binding.mielecloud.internal.util.MieleCloudBindingIntegrationTestConstants;
-import org.openhab.binding.mielecloud.internal.util.ReflectionUtil;
import org.openhab.binding.mielecloud.internal.util.Website;
import org.openhab.binding.mielecloud.internal.util.WebsiteCrawler;
import org.openhab.binding.mielecloud.internal.webservice.MieleWebservice;
public void configFlowWaitTimeoutExpiresWhenBridgeDoesNotComeOnline() throws Exception {
// given:
setUpAuthorizationHandler();
- ReflectionUtil.setPrivateStaticFinal(CreateBridgeServlet.class, "ONLINE_WAIT_TIMEOUT_IN_MILLISECONDS", 0);
+ getCreateBridgeServlet().setOnlineWaitTimeoutInMilliseconds(0);
// when:
configureBridgeWithConfigFlow();
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
field.set(object, value);
}
- /**
- * Sets an attribute declared as {@code private static final}.
- *
- * @param clazz The class owning the static attribute.
- * @param fieldName The name of the attribute.
- * @param value The new value.
- * @throws NoSuchFieldException if no field with the given name exists.
- * @throws SecurityException if the operation is not allowed.
- * @throws IllegalArgumentException if one of the passed parameters is invalid.
- * @throws IllegalAccessException if the field is enforcing Java language access control and is inaccessible.
- */
- public static void setPrivateStaticFinal(Class<?> clazz, String fieldName, @Nullable Object value)
- throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException {
- Field field = clazz.getDeclaredField(fieldName);
- field.setAccessible(true);
-
- Field modifiersField = Field.class.getDeclaredField("modifiers");
- modifiersField.setAccessible(true);
- modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-
- field.set(null, value);
- }
-
/**
* Invokes a private method on an object.
*
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<configuration>
+ <argLine>
+ --add-opens java.base/java.lang=ALL-UNNAMED
+ --add-opens java.base/java.util=ALL-UNNAMED
+ </argLine>
<systemPropertyVariables>
<junit.jupiter.execution.timeout.default>15 m</junit.jupiter.execution.timeout.default>
</systemPropertyVariables>
projects / openhab-addons.git / commitdiff