svn commit: r584421 - in /maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade: DefaultShaderTest.java ShadeMojoTest.java mojo/ mojo/ShadeMojoTest.java

[ma...@apache.org]

Author: mauro
Date: Sat Oct 13 09:13:45 2007
New Revision: 584421

URL: http://svn.apache.org/viewvc?rev=584421&view=rev
Log:
Added DefaultShaderTest which tests shading logic separately from mojo.
Added unit test to reproduce MSHADE-4.

Added:
    maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java
    maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/mojo/
    maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java
      - copied, changed from r584419, maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/ShadeMojoTest.java
Removed:
    maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/ShadeMojoTest.java

Added: maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java?rev=584421&view=auto
==============================================================================
--- maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java (added)
+++ maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/DefaultShaderTest.java Sat Oct 13 09:13:45 2007
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to you 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.apache.maven.plugins.shade;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import junit.framework.TestCase;
+
+import org.apache.maven.plugins.shade.relocation.SimpleRelocator;
+import org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer;
+
+/** 
+ * @author Jason van Zyl 
+ * @author Mauro Talevi
+ */
+public class DefaultShaderTest
+    extends TestCase
+{
+    private static final String[] EXCLUDES = new String[] {
+        "org/codehaus/plexus/util/xml/Xpp3Dom",
+        "org/codehaus/plexus/util/xml/pull.*" };
+
+    public void testShaderWithDefaultShadedPattern()
+        throws Exception
+    {
+        shaderWithPattern( null, new File( "target/foo-default.jar" ), EXCLUDES );
+    }
+
+    public void testShaderWithCustomShadedPattern()
+        throws Exception
+    {
+        shaderWithPattern( "org/shaded/plexus/util", new File( "target/foo-custom.jar" ), EXCLUDES );
+    }
+
+    public void testShaderWithoutExcludesShouldRemoveReferencesOfOriginalPattern()
+        throws Exception
+    {
+        //FIXME:  shaded jar should not include references to org/codehaus/* (empty dirs) or org.codehaus.* META-INF files.
+        shaderWithPattern( "org/shaded/plexus/util", new File( "target/foo-custom-without-excludes.jar" ), new String[] {} );
+    }
+
+    public void shaderWithPattern( String shadedPattern, File jar, String[] excludes )
+        throws Exception
+    {
+        Shader s = new DefaultShader();
+
+        Set set = new HashSet();
+
+        set.add( new File( "src/test/jars/test-project-1.0-SNAPSHOT.jar" ) );
+
+        set.add( new File( "src/test/jars/plexus-utils-1.4.1.jar" ) );
+
+        List relocators = new ArrayList();
+
+        relocators.add( new SimpleRelocator( "org/codehaus/plexus/util", shadedPattern, Arrays.asList( excludes ) ) );
+
+        List resourceTransformers = new ArrayList();
+
+        resourceTransformers.add( new ComponentsXmlResourceTransformer() );
+
+        s.shade( set, jar, relocators, resourceTransformers );
+    }
+
+}

Copied: maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java (from r584419, maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/ShadeMojoTest.java)
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java?p2=maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java&p1=maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/ShadeMojoTest.java&r1=584419&r2=584421&rev=584421&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/ShadeMojoTest.java (original)
+++ maven/sandbox/trunk/plugins/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java Sat Oct 13 09:13:45 2007
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.maven.plugins.shade;
+package org.apache.maven.plugins.shade.mojo;
 
 import java.io.File;
 import java.util.ArrayList;