This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 18b733a6590b4e41f034dbb3077967af6abc67fa
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Fri Mar 12 20:27:48 2021 +0100
Fix core tests locking for system properties
---
core/camel-core/src/test/java/org/apache/camel/TestSupport.java | 6 +++---
.../test/java/org/apache/camel/builder/xml/XPathFeatureTest.java | 3 +++
.../properties/PropertiesComponentConcatenatePropertiesTest.java | 3 +++
.../properties/PropertiesComponentDefaultFunctionsTest.java | 3 +++
.../src/test/java/org/apache/camel/language/simple/SimpleTest.java | 3 +++
.../src/test/java/org/apache/camel/util/FilePathResolverTest.java | 3 +++
.../org/apache/camel/main/MainPropertyPlaceholderWithEnvTest.java | 3 +++
.../apache/camel/main/MainPropertyPlaceholderWithSystemTest.java | 3 +++
.../org/apache/camel/management/DefaultManagementAgentMockTest.java | 5 ++---
.../camel/management/JmxInstrumentationUsingDefaultsTest.java | 5 ++---
.../camel/management/JmxInstrumentationUsingPlatformMBSTest.java | 5 ++---
.../camel/management/JmxInstrumentationUsingPropertiesTest.java | 5 ++---
.../camel/management/ManagedNamePatternJvmSystemPropertyTest.java | 5 ++---
13 files changed, 34 insertions(+), 18 deletions(-)
diff --git a/core/camel-core/src/test/java/org/apache/camel/TestSupport.java
b/core/camel-core/src/test/java/org/apache/camel/TestSupport.java
index 346d321..ed04871 100644
--- a/core/camel-core/src/test/java/org/apache/camel/TestSupport.java
+++ b/core/camel-core/src/test/java/org/apache/camel/TestSupport.java
@@ -39,7 +39,9 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.parallel.ResourceAccessMode;
import org.junit.jupiter.api.parallel.ResourceLock;
+import org.junit.jupiter.api.parallel.Resources;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,13 +49,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ;
-import static org.junit.jupiter.api.parallel.Resources.SYSTEM_PROPERTIES;
/**
* A bunch of useful testing methods
*/
-@ResourceLock(value = SYSTEM_PROPERTIES, mode = READ)
+@ResourceLock(value = Resources.SYSTEM_PROPERTIES, mode =
ResourceAccessMode.READ)
public abstract class TestSupport {
protected static final String LS = System.lineSeparator();
diff --git
a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathFeatureTest.java
b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathFeatureTest.java
index dfe6e81..19d231c 100644
---
a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathFeatureTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathFeatureTest.java
@@ -28,10 +28,13 @@ import org.apache.camel.TypeConversionException;
import org.apache.camel.converter.jaxp.XmlConverter;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.ResourceLock;
+import org.junit.jupiter.api.parallel.Resources;
import static org.apache.camel.language.xpath.XPathBuilder.xpath;
import static org.junit.jupiter.api.Assertions.*;
+@ResourceLock(Resources.SYSTEM_PROPERTIES)
public class XPathFeatureTest extends ContextTestSupport {
public static final String DOM_BUILDER_FACTORY_FEATURE =
XmlConverter.DOCUMENT_BUILDER_FACTORY_FEATURE;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentConcatenatePropertiesTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentConcatenatePropertiesTest.java
index 64eba8e..735e6ed 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentConcatenatePropertiesTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentConcatenatePropertiesTest.java
@@ -22,7 +22,10 @@ import org.apache.camel.builder.RouteBuilder;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.ResourceLock;
+import org.junit.jupiter.api.parallel.Resources;
+@ResourceLock(Resources.SYSTEM_PROPERTIES)
public class PropertiesComponentConcatenatePropertiesTest extends
ContextTestSupport {
@Override
protected CamelContext createCamelContext() throws Exception {
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentDefaultFunctionsTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentDefaultFunctionsTest.java
index ffe30be..0157ecc 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentDefaultFunctionsTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentDefaultFunctionsTest.java
@@ -21,7 +21,10 @@ import java.util.Map;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.ResourceLock;
+import org.junit.jupiter.api.parallel.Resources;
+@ResourceLock(Resources.SYSTEM_PROPERTIES)
public class PropertiesComponentDefaultFunctionsTest extends
ContextTestSupport {
@Override
diff --git
a/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
b/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
index d76bc59..a7e7b8c 100644
---
a/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
@@ -43,6 +43,8 @@ import org.apache.camel.spi.Language;
import org.apache.camel.spi.Registry;
import org.apache.camel.util.InetAddressUtil;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.ResourceLock;
+import org.junit.jupiter.api.parallel.Resources;
import static org.junit.jupiter.api.Assertions.*;
@@ -262,6 +264,7 @@ public class SimpleTest extends LanguageTestSupport {
}
@Test
+ @ResourceLock(Resources.SYSTEM_PROPERTIES)
public void testSimpleSystemPropertyExpressions() throws Exception {
System.setProperty("who", "I was here");
assertExpression("${sys.who}", "I was here");
diff --git
a/core/camel-core/src/test/java/org/apache/camel/util/FilePathResolverTest.java
b/core/camel-core/src/test/java/org/apache/camel/util/FilePathResolverTest.java
index 0672e0a..19b182a 100644
---
a/core/camel-core/src/test/java/org/apache/camel/util/FilePathResolverTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/util/FilePathResolverTest.java
@@ -17,12 +17,15 @@
package org.apache.camel.util;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.ResourceLock;
+import org.junit.jupiter.api.parallel.Resources;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class FilePathResolverTest {
@Test
+ @ResourceLock(Resources.SYSTEM_PROPERTIES)
public void testFilePathResolver() throws Exception {
assertEquals("/foo/bar", FilePathResolver.resolvePath("/foo/bar"));
diff --git
a/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderWithEnvTest.java
b/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderWithEnvTest.java
index cd2c093..c2a8211 100644
---
a/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderWithEnvTest.java
+++
b/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderWithEnvTest.java
@@ -24,10 +24,13 @@ import java.util.Properties;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.parallel.Isolated;
+import org.junit.jupiter.api.parallel.ResourceLock;
+import org.junit.jupiter.api.parallel.Resources;
import static org.junit.jupiter.api.Assertions.assertEquals;
@Isolated
+@ResourceLock(Resources.SYSTEM_PROPERTIES)
public class MainPropertyPlaceholderWithEnvTest {
public static final String ENV_PROPERTY_PLACEHOLDER_LOCATION =
MainHelper.toEnvVar(Main.PROPERTY_PLACEHOLDER_LOCATION);
diff --git
a/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderWithSystemTest.java
b/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderWithSystemTest.java
index 7e45fe5..709281f 100644
---
a/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderWithSystemTest.java
+++
b/core/camel-main/src/test/java/org/apache/camel/main/MainPropertyPlaceholderWithSystemTest.java
@@ -19,9 +19,12 @@ package org.apache.camel.main;
import java.util.Properties;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.ResourceLock;
+import org.junit.jupiter.api.parallel.Resources;
import static org.junit.jupiter.api.Assertions.assertEquals;
+@ResourceLock(Resources.SYSTEM_PROPERTIES)
public class MainPropertyPlaceholderWithSystemTest {
@Test
public void testCustomPropertyPlaceholderLocation() {
diff --git
a/core/camel-management/src/test/java/org/apache/camel/management/DefaultManagementAgentMockTest.java
b/core/camel-management/src/test/java/org/apache/camel/management/DefaultManagementAgentMockTest.java
index 54fa162..21e9082 100644
---
a/core/camel-management/src/test/java/org/apache/camel/management/DefaultManagementAgentMockTest.java
+++
b/core/camel-management/src/test/java/org/apache/camel/management/DefaultManagementAgentMockTest.java
@@ -27,11 +27,10 @@ import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.spi.ManagementAgent;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.parallel.ResourceLock;
+import org.junit.jupiter.api.parallel.Resources;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ_WRITE;
-import static org.junit.jupiter.api.parallel.Resources.SYSTEM_PROPERTIES;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.when;
@@ -40,7 +39,7 @@ import static org.mockito.Mockito.when;
* Tests proper behavior of DefaultManagementAgent when {@link
MBeanServer#registerMBean(Object, ObjectName)} returns an
* {@link ObjectInstance} with a different ObjectName
*/
-@ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE)
+@ResourceLock(Resources.SYSTEM_PROPERTIES)
public class DefaultManagementAgentMockTest {
@Test
diff --git
a/core/camel-management/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java
b/core/camel-management/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java
index 519b362..590550e 100644
---
a/core/camel-management/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java
+++
b/core/camel-management/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java
@@ -31,19 +31,18 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.parallel.ResourceLock;
+import org.junit.jupiter.api.parallel.Resources;
import static org.awaitility.Awaitility.await;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ_WRITE;
-import static org.junit.jupiter.api.parallel.Resources.SYSTEM_PROPERTIES;
/**
* This test verifies JMX is enabled by default and it uses local mbean server
to conduct the test as connector server
* is not enabled by default.
*/
-@ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE)
+@ResourceLock(Resources.SYSTEM_PROPERTIES)
public class JmxInstrumentationUsingDefaultsTest extends ManagementTestSupport
{
protected String domainName = DefaultManagementAgent.DEFAULT_DOMAIN;
diff --git
a/core/camel-management/src/test/java/org/apache/camel/management/JmxInstrumentationUsingPlatformMBSTest.java
b/core/camel-management/src/test/java/org/apache/camel/management/JmxInstrumentationUsingPlatformMBSTest.java
index 52dccc8..e28d55b 100644
---
a/core/camel-management/src/test/java/org/apache/camel/management/JmxInstrumentationUsingPlatformMBSTest.java
+++
b/core/camel-management/src/test/java/org/apache/camel/management/JmxInstrumentationUsingPlatformMBSTest.java
@@ -29,15 +29,14 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.parallel.ResourceLock;
+import org.junit.jupiter.api.parallel.Resources;
import static org.junit.jupiter.api.Assertions.fail;
-import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ_WRITE;
-import static org.junit.jupiter.api.parallel.Resources.SYSTEM_PROPERTIES;
/**
* This test verifies the system property to un-select platform mbean server.
*/
-@ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE)
+@ResourceLock(Resources.SYSTEM_PROPERTIES)
public class JmxInstrumentationUsingPlatformMBSTest extends
JmxInstrumentationUsingPropertiesTest {
@Override
diff --git
a/core/camel-management/src/test/java/org/apache/camel/management/JmxInstrumentationUsingPropertiesTest.java
b/core/camel-management/src/test/java/org/apache/camel/management/JmxInstrumentationUsingPropertiesTest.java
index a8755c2..60dca93 100644
---
a/core/camel-management/src/test/java/org/apache/camel/management/JmxInstrumentationUsingPropertiesTest.java
+++
b/core/camel-management/src/test/java/org/apache/camel/management/JmxInstrumentationUsingPropertiesTest.java
@@ -22,15 +22,14 @@ import
org.apache.camel.api.management.JmxSystemPropertyKeys;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.parallel.ResourceLock;
+import org.junit.jupiter.api.parallel.Resources;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ_WRITE;
-import static org.junit.jupiter.api.parallel.Resources.SYSTEM_PROPERTIES;
/**
* This module contains test cases that verifies jmx system property uses.
*/
-@ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE)
+@ResourceLock(Resources.SYSTEM_PROPERTIES)
public class JmxInstrumentationUsingPropertiesTest extends
JmxInstrumentationUsingDefaultsTest {
@Override
diff --git
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedNamePatternJvmSystemPropertyTest.java
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedNamePatternJvmSystemPropertyTest.java
index e361c9d..3cd8867 100644
---
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedNamePatternJvmSystemPropertyTest.java
+++
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedNamePatternJvmSystemPropertyTest.java
@@ -25,13 +25,12 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.parallel.ResourceLock;
+import org.junit.jupiter.api.parallel.Resources;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ_WRITE;
-import static org.junit.jupiter.api.parallel.Resources.SYSTEM_PROPERTIES;
-@ResourceLock(value = SYSTEM_PROPERTIES, mode = READ_WRITE)
+@ResourceLock(Resources.SYSTEM_PROPERTIES)
public class ManagedNamePatternJvmSystemPropertyTest extends
ManagementTestSupport {
@Override
