You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dm...@apache.org on 2020/03/24 07:44:39 UTC
[camel] 01/02: camel-jcache: Tests are failing due to hazelcast
upgrade
This is an automated email from the ASF dual-hosted git repository.
dmvolod pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 06c48d08c2e64ec2fb225e21db2068a84ea48f6b
Author: Dmitry Volodin <dm...@gmail.com>
AuthorDate: Mon Mar 23 16:58:09 2020 +0300
camel-jcache: Tests are failing due to hazelcast upgrade
---
components/camel-jcache/pom.xml | 23 +++++++++++++++++++++-
.../src/main/docs/jcache-component.adoc | 3 +--
.../jcache/JCacheComponentTestSupport.java | 2 ++
.../policy/CacheManagerFromRegistryTest.java | 9 ++-------
.../component/jcache/policy/hazelcast-spring.xml | 3 ++-
5 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/components/camel-jcache/pom.xml b/components/camel-jcache/pom.xml
index 81ff9fb..41e6962 100644
--- a/components/camel-jcache/pom.xml
+++ b/components/camel-jcache/pom.xml
@@ -72,7 +72,7 @@
</dependency>
<dependency>
<groupId>com.hazelcast</groupId>
- <artifactId>hazelcast</artifactId>
+ <artifactId>hazelcast-all</artifactId>
<version>${hazelcast-version}</version>
<scope>test</scope>
</dependency>
@@ -111,4 +111,25 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>hazelcast.named.jcache.instance</name>
+ <value>false</value>
+ </property>
+ <property>
+ <name>hazelcast.jcache.provider.type</name>
+ <value>server</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
diff --git a/components/camel-jcache/src/main/docs/jcache-component.adoc b/components/camel-jcache/src/main/docs/jcache-component.adoc
index 2d8dc6a..3d8b32b 100644
--- a/components/camel-jcache/src/main/docs/jcache-component.adoc
+++ b/components/camel-jcache/src/main/docs/jcache-component.adoc
@@ -303,10 +303,9 @@ It's not strictly speaking related to Camel XML DSL, but JCache providers usuall
[source,xml]
----------------------------
-<?xml version="1.0" encoding="UTF-8"?>
<hazelcast xmlns="http://www.hazelcast.com/schema/config"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.11.xsd" >
+ xsi:schemaLocation="http://www.hazelcast.com/schema/config http://www.hazelcast.com/schema/config/hazelcast-config-4.0.xsd">
<cache name="spring">
<key-type class-name="java.lang.String"/>
diff --git a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheComponentTestSupport.java b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheComponentTestSupport.java
index c8e334c..2d4f4c1 100644
--- a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheComponentTestSupport.java
+++ b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheComponentTestSupport.java
@@ -23,6 +23,8 @@ import java.util.UUID;
import javax.cache.Cache;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
+import org.junit.BeforeClass;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/CacheManagerFromRegistryTest.java b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/CacheManagerFromRegistryTest.java
index 609e82b..bb83080 100644
--- a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/CacheManagerFromRegistryTest.java
+++ b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/CacheManagerFromRegistryTest.java
@@ -22,7 +22,6 @@ import javax.cache.Cache;
import javax.cache.CacheManager;
import javax.cache.Caching;
-import com.hazelcast.instance.impl.HazelcastInstanceFactory;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.junit.After;
@@ -42,10 +41,10 @@ public class CacheManagerFromRegistryTest extends JCachePolicyTestBase {
// Send exchange
Object responseBody = this.template().requestBody("direct:policy-context-manager", key);
- // Verify the cacheManager "hzsecond" registered in the CamelContext was
- // used
+ // Verify the cacheManager "hzsecond" registered in the CamelContext was used
assertNull(lookupCache("contextCacheManager"));
CacheManager cacheManager = Caching.getCachingProvider().getCacheManager(URI.create("hzsecond"), null);
+
Cache cache = cacheManager.getCache("contextCacheManager");
assertEquals(generateValue(key), cache.get(key));
@@ -74,10 +73,6 @@ public class CacheManagerFromRegistryTest extends JCachePolicyTestBase {
CacheManager cacheManager = Caching.getCachingProvider().getCacheManager(URI.create("hzsecond"), null);
cacheManager.getCacheNames().forEach(s -> cacheManager.destroyCache(s));
Caching.getCachingProvider().close(URI.create("hzsecond"), null);
-
- // We need to shutdown the second instance using the Hazelcast api.
- // close(URI,ClassLoader) doesn't do that.
- HazelcastInstanceFactory.getHazelcastInstance("hzsecond").shutdown();
}
}
diff --git a/components/camel-jcache/src/test/resources/org/apache/camel/component/jcache/policy/hazelcast-spring.xml b/components/camel-jcache/src/test/resources/org/apache/camel/component/jcache/policy/hazelcast-spring.xml
index 058335d..add97eb 100644
--- a/components/camel-jcache/src/test/resources/org/apache/camel/component/jcache/policy/hazelcast-spring.xml
+++ b/components/camel-jcache/src/test/resources/org/apache/camel/component/jcache/policy/hazelcast-spring.xml
@@ -19,7 +19,8 @@
-->
<hazelcast xmlns="http://www.hazelcast.com/schema/config"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-4.0.xsd" >
+ xsi:schemaLocation="http://www.hazelcast.com/schema/config
+ http://www.hazelcast.com/schema/config/hazelcast-config-4.0.xsd">
<cache name="spring">
<key-type class-name="java.lang.String"/>