You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by st...@apache.org on 2012/08/29 20:49:23 UTC
svn commit: r1378680 - in /maven/shared/trunk/maven-shared-utils/src: main/java/org/apache/maven/shared/utils/CollectionUtils.java test/java/org/apache/maven/shared/utils/CollectionUtilsTest.java

Author: struberg
Date: Wed Aug 29 18:49:23 2012
New Revision: 1378680

URL: http://svn.apache.org/viewvc?rev=1378680&view=rev
Log:
MSHARED-236 move CollectionUtils + test over from sandbox-pu

Added:
    maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/CollectionUtils.java
      - copied, changed from r1378653, maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/CollectionUtils.java
    maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/CollectionUtilsTest.java
      - copied, changed from r1378653, maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/CollectionUtilsTest.java

Copied: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/CollectionUtils.java (from r1378653, maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/CollectionUtils.java)
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/CollectionUtils.java?p2=maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/CollectionUtils.java&p1=maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/CollectionUtils.java&r1=1378653&r2=1378680&rev=1378680&view=diff
==============================================================================
--- maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-commons-bridge/src/main/java/org/codehaus/plexus/util/CollectionUtils.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/CollectionUtils.java Wed Aug 29 18:49:23 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.util;
+package org.apache.maven.shared.utils;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Copied: maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/CollectionUtilsTest.java (from r1378653, maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/CollectionUtilsTest.java)
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/CollectionUtilsTest.java?p2=maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/CollectionUtilsTest.java&p1=maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/CollectionUtilsTest.java&r1=1378653&r2=1378680&rev=1378680&view=diff
==============================================================================
--- maven/sandbox/trunk/plexus-utils-commons-bridge/plexus-utils-tck/src/test/java/org/codehaus/plexus/util/CollectionUtilsTest.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/CollectionUtilsTest.java Wed Aug 29 18:49:23 2012
@@ -1,4 +1,4 @@
-package org.codehaus.plexus.util;
+package org.apache.maven.shared.utils;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -26,20 +26,13 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.maven.tck.FixPlexusBugs;
 import org.junit.Assert;
-import org.junit.Rule;
 import org.junit.Test;
 
-import com.google.common.collect.HashMultiset;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Multiset;
 
 public class CollectionUtilsTest
     extends Assert
 {
-    @Rule
-    public FixPlexusBugs fixPlexusBugs = new FixPlexusBugs();
 
     @SuppressWarnings( "rawtypes" )
     @Test
@@ -130,14 +123,14 @@ public class CollectionUtilsTest
         c2.add( "33.3" );
         c2.add( "jabberwock" );
 
-        Multiset<String> correct = HashMultiset.create();
+        List<String> correct = new ArrayList<String>();
         correct.add( "blue" );
         correct.add( "blue" );
         correct.add( "porpoise" );
 
         @SuppressWarnings( "unchecked" )
         Collection<String> res = CollectionUtils.intersection( c1, c2 );
-        Multiset<String> actual = HashMultiset.create();
+        List<String> actual = new ArrayList<String>();
         actual.addAll( res );
         assertEquals( correct, actual );
     }
@@ -173,7 +166,7 @@ public class CollectionUtilsTest
         c2.add( "33.3" );
         c2.add( "jabberwock" );
 
-        Multiset<String> correct = HashMultiset.create();
+        List<String> correct = new ArrayList<String>();
         correct.addAll( c1 );
         for ( String s : c2 )
         {
@@ -182,7 +175,7 @@ public class CollectionUtilsTest
 
         @SuppressWarnings( "unchecked" )
         Collection<String> res = CollectionUtils.subtract( c1, c2 );
-        Multiset<String> act = HashMultiset.create();
+        List<String> act = new ArrayList<String>();
         act.addAll( res );
 
         assertEquals( correct, act );
@@ -236,7 +229,7 @@ public class CollectionUtilsTest
         c1.add( "blue" );
         c1.add( "gray" );
         
-        List<String> expected = Lists.newArrayList( c1.iterator() );
+        List<String> expected = new ArrayList<String>( c1 );
         @SuppressWarnings( "unchecked" )
         List<String> actual = CollectionUtils.iteratorToList( c1.iterator() );
         assertEquals( expected, actual );