Author: olamy
Date: Sat Jan 5 22:02:45 2013
New Revision: 1429393
URL: http://svn.apache.org/viewvc?rev=1429393&view=rev
Log:
generics for test
Modified:
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/apache/archiva/redback/components/cache/ehcache/EhcacheCacheTest.java
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/src/test/java/org/apache/archiva/redback/components/cache/hashmap/HashMapCacheTest.java
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/src/test/resources/spring-context.xml
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/src/test/java/org/apache/archiva/redback/components/cache/oscache/OsCacheCacheTest.java
Modified:
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/apache/archiva/redback/components/cache/ehcache/EhcacheCacheTest.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/apache/archiva/redback/components/cache/ehcache/EhcacheCacheTest.java?rev=1429393&r1=1429392&r2=1429393&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/apache/archiva/redback/components/cache/ehcache/EhcacheCacheTest.java
(original)
+++
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/src/test/java/org/apache/archiva/redback/components/cache/ehcache/EhcacheCacheTest.java
Sat Jan 5 22:02:45 2013
@@ -19,6 +19,7 @@ package org.apache.archiva.redback.compo
import org.apache.archiva.redback.components.cache.Cache;
import org.apache.archiva.redback.components.cache.ehcache.EhcacheCache;
import org.apache.archiva.redback.components.cache.test.AbstractCacheTestCase;
+import org.apache.archiva.redback.components.cache.test.examples.wine.Wine;
import javax.inject.Inject;
import javax.inject.Named;
@@ -34,45 +35,45 @@ public class EhcacheCacheTest
{
@Inject @Named(value = "cache#ehcache")
- Cache cache;
+ Cache<String,Integer> cache;
@Inject @Named(value = "cache#alwaysrefresh")
- Cache cachealwaysrefresh;
+ Cache<String,Wine> cachealwaysrefresh;
@Inject @Named(value = "cache#onesecondrefresh")
- Cache cacheonesecondrefresh;
+ Cache<String,Wine> cacheonesecondrefresh;
@Inject @Named(value = "cache#onesecondrefresh")
- Cache cachetwosecondrefresh;
+ Cache<String,Wine> cachetwosecondrefresh;
@Inject @Named(value = "cache#neverrefresh")
- Cache cacheneversecondrefresh;
+ Cache<String,Wine> cacheneversecondrefresh;
@Override
- public Cache getCache()
+ public Cache<String,Integer> getCache()
{
return cache;
}
- public Cache getAlwaysRefresCache()
+ public Cache<String,Wine> getAlwaysRefresCache()
throws Exception
{
return cachealwaysrefresh;
}
- public Cache getNeverRefresCache()
+ public Cache<String,Wine> getNeverRefresCache()
throws Exception
{
return cacheneversecondrefresh;
}
- public Cache getOneSecondRefresCache()
+ public Cache<String,Wine> getOneSecondRefresCache()
throws Exception
{
return cacheonesecondrefresh;
}
- public Cache getTwoSecondRefresCache()
+ public Cache<String,Wine> getTwoSecondRefresCache()
throws Exception
{
return cachetwosecondrefresh;
Modified:
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/src/test/java/org/apache/archiva/redback/components/cache/hashmap/HashMapCacheTest.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/src/test/java/org/apache/archiva/redback/components/cache/hashmap/HashMapCacheTest.java?rev=1429393&r1=1429392&r2=1429393&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/src/test/java/org/apache/archiva/redback/components/cache/hashmap/HashMapCacheTest.java
(original)
+++
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/src/test/java/org/apache/archiva/redback/components/cache/hashmap/HashMapCacheTest.java
Sat Jan 5 22:02:45 2013
@@ -19,56 +19,64 @@ package org.apache.archiva.redback.compo
import org.apache.archiva.redback.components.cache.Cache;
import org.apache.archiva.redback.components.cache.hashmap.HashMapCache;
import org.apache.archiva.redback.components.cache.test.AbstractCacheTestCase;
+import org.apache.archiva.redback.components.cache.test.examples.wine.Wine;
import javax.inject.Inject;
import javax.inject.Named;
/**
- * HashMapCacheTest
+ * HashMapCacheTest
*
* @author <a href="mailto:[email protected]";>Joakim Erdfelt</a>
- *
*/
public class HashMapCacheTest
extends AbstractCacheTestCase
{
- @Inject @Named(value = "cache#hashmap")
- Cache cache;
-
- @Inject @Named(value = "cache#alwaysrefresh")
- Cache cachealwaysrefresh;
-
- @Inject @Named(value = "cache#onesecondrefresh")
- Cache cacheonesecondrefresh;
-
- @Inject @Named(value = "cache#twosecondrefresh")
- Cache cachetwosecondrefresh;
+ @Inject
+ @Named(value = "cache#hashmap")
+ Cache<String, Integer> cache;
+
+ @Inject
+ @Named(value = "cache#alwaysrefresh")
+ Cache<String, Wine> cachealwaysrefresh;
+
+ @Inject
+ @Named( value = "cache#never" )
+ Cache<String, Wine> cachenever;
+
+ @Inject
+ @Named(value = "cache#onesecondrefresh")
+ Cache<String, Wine> cacheonesecondrefresh;
+
+ @Inject
+ @Named(value = "cache#twosecondrefresh")
+ Cache<String, Wine> cachetwosecondrefresh;
@Override
- public Cache getCache()
+ public Cache<String, Integer> getCache()
{
return cache;
}
- public Cache getAlwaysRefresCache()
+ public Cache<String, Wine> getAlwaysRefresCache()
throws Exception
{
return cachealwaysrefresh;
}
- public Cache getNeverRefresCache()
+ public Cache<String, Wine> getNeverRefresCache()
throws Exception
{
- return cache;
+ return cachenever;
}
- public Cache getOneSecondRefresCache()
+ public Cache<String, Wine> getOneSecondRefresCache()
throws Exception
{
return cacheonesecondrefresh;
}
- public Cache getTwoSecondRefresCache()
+ public Cache<String, Wine> getTwoSecondRefresCache()
throws Exception
{
return cachetwosecondrefresh;
Modified:
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/src/test/resources/spring-context.xml?rev=1429393&r1=1429392&r2=1429393&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/src/test/resources/spring-context.xml
(original)
+++
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/src/test/resources/spring-context.xml
Sat Jan 5 22:02:45 2013
@@ -30,6 +30,12 @@
<property name="refreshTime" value="0"/>
</bean>
+ <bean name="cache#never"
class="org.apache.archiva.redback.components.cache.hashmap.HashMapCache">
+ <property name="cacheHitRatio" value="1.0"/>
+ <property name="cacheMaxSize" value="0"/>
+ <property name="refreshTime" value="0"/>
+ </bean>
+
<bean name="cache#alwaysrefresh"
class="org.apache.archiva.redback.components.cache.hashmap.HashMapCache">
<property name="cacheHitRatio" value="1.0"/>
<property name="cacheMaxSize" value="0"/>
Modified:
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/src/test/java/org/apache/archiva/redback/components/cache/oscache/OsCacheCacheTest.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/src/test/java/org/apache/archiva/redback/components/cache/oscache/OsCacheCacheTest.java?rev=1429393&r1=1429392&r2=1429393&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/src/test/java/org/apache/archiva/redback/components/cache/oscache/OsCacheCacheTest.java
(original)
+++
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/src/test/java/org/apache/archiva/redback/components/cache/oscache/OsCacheCacheTest.java
Sat Jan 5 22:02:45 2013
@@ -19,6 +19,7 @@ package org.apache.archiva.redback.compo
import org.apache.archiva.redback.components.cache.Cache;
import org.apache.archiva.redback.components.cache.oscache.OsCacheCache;
import org.apache.archiva.redback.components.cache.test.AbstractCacheTestCase;
+import org.apache.archiva.redback.components.cache.test.examples.wine.Wine;
import javax.inject.Inject;
import javax.inject.Named;
@@ -27,7 +28,6 @@ import javax.inject.Named;
* Tests for OsCacheCache.
*
* @author Olivier Lamy
- *
* @since 3 February, 2007
*/
public class OsCacheCacheTest
@@ -35,50 +35,50 @@ public class OsCacheCacheTest
{
@Inject
- @Named( value = "cache#oscache" )
- Cache cache;
+ @Named(value = "cache#oscache")
+ Cache<String, Integer> cache;
@Inject
- @Named( value = "cache#alwaysrefresh" )
- Cache cachealwaysrefresh;
+ @Named(value = "cache#alwaysrefresh")
+ Cache<String, Wine> cachealwaysrefresh;
@Inject
- @Named( value = "cache#onesecondrefresh" )
- Cache cacheonesecondrefresh;
+ @Named(value = "cache#onesecondrefresh")
+ Cache<String, Wine> cacheonesecondrefresh;
@Inject
- @Named( value = "cache#twosecondrefresh" )
- Cache cachetwosecondrefresh;
+ @Named(value = "cache#twosecondrefresh")
+ Cache<String, Wine> cachetwosecondrefresh;
@Inject
- @Named( value = "cache#neverrefresh" )
- Cache cacheneversecondrefresh;
+ @Named(value = "cache#neverrefresh")
+ Cache<String, Wine> cacheneversecondrefresh;
@Override
- public Cache getCache()
+ public Cache<String, Integer> getCache()
{
return cache;
}
- public Cache getAlwaysRefresCache()
+ public Cache<String, Wine> getAlwaysRefresCache()
throws Exception
{
return cachealwaysrefresh;
}
- public Cache getNeverRefresCache()
+ public Cache<String, Wine> getNeverRefresCache()
throws Exception
{
return cacheneversecondrefresh;
}
- public Cache getOneSecondRefresCache()
+ public Cache<String, Wine> getOneSecondRefresCache()
throws Exception
{
return cacheonesecondrefresh;
}
- public Cache getTwoSecondRefresCache()
+ public Cache<String, Wine> getTwoSecondRefresCache()
throws Exception
{
return cachetwosecondrefresh;
