You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2014/10/15 19:01:49 UTC
svn commit: r1632121 - in /commons/proper/jcs/trunk: ./ commons-jcs-core/
commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/struct/
Author: ggregory
Date: Wed Oct 15 17:01:49 2014
New Revision: 1632121
URL: http://svn.apache.org/r1632121
Log:
Update tests to Apache Commons Collection 4.0.
Modified:
commons/proper/jcs/trunk/commons-jcs-core/pom.xml
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/struct/JCSvsCommonsLRUMapPerformanceTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/struct/LRUMapPerformanceTest.java
commons/proper/jcs/trunk/pom.xml
Modified: commons/proper/jcs/trunk/commons-jcs-core/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/pom.xml?rev=1632121&r1=1632120&r2=1632121&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/pom.xml (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/pom.xml Wed Oct 15 17:01:49 2014
@@ -68,8 +68,8 @@
<!-- For comparative performance tests only -->
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
<scope>test</scope>
</dependency>
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/struct/JCSvsCommonsLRUMapPerformanceTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/struct/JCSvsCommonsLRUMapPerformanceTest.java?rev=1632121&r1=1632120&r2=1632121&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/struct/JCSvsCommonsLRUMapPerformanceTest.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/struct/JCSvsCommonsLRUMapPerformanceTest.java Wed Oct 15 17:01:49 2014
@@ -22,6 +22,7 @@ package org.apache.commons.jcs.utils.str
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
+
import org.apache.commons.jcs.JCSvsHashtablePerformanceTest;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -144,7 +145,7 @@ public class JCSvsCommonsLRUMapPerforman
cache2Name = "Commons ";
// or LRUMapJCS
@SuppressWarnings("unchecked")
- Map<String, String> cache2 = new org.apache.commons.collections.map.LRUMap( tries );
+ Map<String, String> cache2 = new org.apache.commons.collections4.map.LRUMap<String, String>( tries );
// cache2Name = "Hashtable";
// Hashtable cache2 = new Hashtable();
start = System.currentTimeMillis();
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/struct/LRUMapPerformanceTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/struct/LRUMapPerformanceTest.java?rev=1632121&r1=1632120&r2=1632121&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/struct/LRUMapPerformanceTest.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/utils/struct/LRUMapPerformanceTest.java Wed Oct 15 17:01:49 2014
@@ -137,7 +137,7 @@ public class LRUMapPerformanceTest
cache2Name = "LRUMapJCS (commons)";
//or LRUMapJCS
@SuppressWarnings("unchecked")
- Map<String, String> cache2 = new org.apache.commons.collections.map.LRUMap( tries );
+ Map<String, String> cache2 = new org.apache.commons.collections4.map.LRUMap<String, String>( tries );
//cache2Name = "Hashtable";
//Hashtable cache2 = new Hashtable();
start = System.currentTimeMillis();
Modified: commons/proper/jcs/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/pom.xml?rev=1632121&r1=1632120&r2=1632121&view=diff
==============================================================================
--- commons/proper/jcs/trunk/pom.xml (original)
+++ commons/proper/jcs/trunk/pom.xml Wed Oct 15 17:01:49 2014
@@ -263,9 +263,9 @@
<!-- For comparative performance tests only -->
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>${collections.version}</version>
<scope>test</scope>
</dependency>
@@ -470,6 +470,7 @@
<commons.javadoc.java.link>http://docs.oracle.com/javase/6/docs/api/</commons.javadoc.java.link>
<jsr107.api.version>1.0.0</jsr107.api.version>
+ <collections.version>4.0</collections.version>
<test.type>Unit</test.type>
</properties>