Add cache tests for JCache

spring-context-support/src/test/java/org/springframework/cache/AbstractCacheTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package org.springframework.cache;
 
+import java.util.UUID;
+
 import org.junit.Test;
 
 import static org.junit.Assert.*;
@@ -45,7 +47,7 @@ public abstract class AbstractCacheTests<T extends Cache> {
 	public void testCachePut() throws Exception {
 		T cache = getCache();
 
-		Object key = "enescu";
+		String key = createRandomKey();
 		Object value = "george";
 
 		assertNull(cache.get(key));
@@ -69,7 +71,7 @@ public abstract class AbstractCacheTests<T extends Cache> {
 	public void testCachePutIfAbsent() throws Exception {
 		T cache = getCache();
 
-		Object key = new Object();
+		String key = createRandomKey();
 		Object value = "initialValue";
 
 		assertNull(cache.get(key));
@@ -83,7 +85,7 @@ public abstract class AbstractCacheTests<T extends Cache> {
 	public void testCacheRemove() throws Exception {
 		T cache = getCache();
 
-		Object key = "enescu";
+		String key = createRandomKey();
 		Object value = "george";
 
 		assertNull(cache.get(key));
@@ -102,4 +104,9 @@ public abstract class AbstractCacheTests<T extends Cache> {
 		assertNull(cache.get("vlaicu"));
 		assertNull(cache.get("enescu"));
 	}
+
+	private String createRandomKey() {
+		return UUID.randomUUID().toString();
+	}
+
 }

spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheEhCacheTests.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2002-2015 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cache.jcache;
+
+import javax.cache.Cache;
+import javax.cache.CacheManager;
+import javax.cache.Caching;
+import javax.cache.configuration.MutableConfiguration;
+import javax.cache.spi.CachingProvider;
+
+import org.junit.After;
+import org.junit.Before;
+
+import org.springframework.cache.AbstractCacheTests;
+
+/**
+ * @author Stephane Nicoll
+ */
+public class JCacheEhCacheTests extends AbstractCacheTests<JCacheCache> {
+
+	private CacheManager cacheManager;
+
+	private Cache<Object, Object> nativeCache;
+
+	private JCacheCache cache;
+
+	@Before
+	public void setUp() {
+		this.cacheManager = getCachingProvider().getCacheManager();
+		this.cacheManager.createCache(CACHE_NAME, new MutableConfiguration<>());
+		this.nativeCache = this.cacheManager.getCache(CACHE_NAME);
+		this.cache = new JCacheCache(this.nativeCache);
+	}
+
+	@After
+	public void shutdownCacheManager() {
+		this.cacheManager.close();
+	}
+
+	@Override
+	protected JCacheCache getCache() {
+		return this.cache;
+	}
+
+	@Override
+	protected Object getNativeCache() {
+		return this.nativeCache;
+	}
+
+	protected CachingProvider getCachingProvider() {
+		return Caching.getCachingProvider();
+	}
+
+}

spring-test/src/test/java/org/springframework/cache/jcache/JCacheEhcache3Tests.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2002-2015 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cache.jcache;
+
+import javax.cache.Caching;
+import javax.cache.spi.CachingProvider;
+
+/**
+ * Just here to be run against EHCache 3, whereas the original JCacheEhCacheAnnotationTests
+ * runs against EhCache 2.x with the EhCache-JCache add-on.
+ *
+ * @author Stephane Nicoll
+ */
+public class JCacheEhcache3Tests extends JCacheEhCacheTests {
+
+	@Override
+	protected CachingProvider getCachingProvider() {
+		return Caching.getCachingProvider("org.ehcache.jsr107.EhcacheCachingProvider");
+	}
+
+}