Author: kenney
Date: Thu Nov 16 07:02:23 2006
New Revision: 475757
URL: http://svn.apache.org/viewvc?view=rev&rev=475757
Log:
Fix duplicate buildCommand entries in .project.
Updated BuildCommand.equals() to handle cases where one has no argument map
(null)
and the other one has an empty map.
Added unit test to test various equals situations.
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/BuildCommandTest.java
(with props)
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/BuildCommand.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/BuildCommand.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/BuildCommand.java?view=diff&rev=475757&r1=475756&r2=475757
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/BuildCommand.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/BuildCommand.java
Thu Nov 16 07:02:23 2006
@@ -22,6 +22,7 @@
import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
+ * Represents a buildCommand section in the <code>.project</code> file.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Kenney Westerhof</a>
* @author Jochen Kuhnle
@@ -191,8 +192,12 @@
if ( obj instanceof BuildCommand )
{
BuildCommand b = (BuildCommand) obj;
- return name.equals( b.name ) && ( triggers == null ? b.triggers ==
null : triggers.equals( b.triggers ) )
- && ( arguments == null ? b.arguments == null :
arguments.equals( b.arguments ) );
+
+ return name.equals( b.name )
+ && ( triggers == null ? b.triggers == null : triggers.equals(
b.triggers ) )
+ && ( arguments == null || arguments.isEmpty()
+ ? b.arguments == null || b.arguments.isEmpty()
+ : arguments.equals( b.arguments ) );
}
else
{
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/BuildCommandTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/BuildCommandTest.java?view=auto&rev=475757
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/BuildCommandTest.java
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/BuildCommandTest.java
Thu Nov 16 07:02:23 2006
@@ -0,0 +1,69 @@
+/*
+ * 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.apache.maven.plugin.eclipse;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import junit.framework.TestCase;
+
+/**
+ * Tests the BuildCommand class.
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">Kenney Westerhof</a>
+ */
+public class BuildCommandTest
+ extends TestCase
+{
+ /**
+ * Tests various equalities for buildCommands, needed to remove duplicate
build commands from <code>.project</code>.
+ */
+ public void testEquals()
+ {
+ BuildCommand b1 = new BuildCommand( "foobuilder", null, (Map) null );
+ BuildCommand b2 = new BuildCommand( "foobuilder", "", (Map) null );
+ assertEquals( false, b1.equals( b2 ) );
+ assertEquals( false, b2.equals( b1 ) );
+
+ b2 = new BuildCommand( "foobuilder", null, (Map) null );
+ assertEquals( true, b1.equals( b2 ) );
+ assertEquals( true, b2.equals( b1 ) );
+
+ b2 = new BuildCommand( "foobuilder", null, new HashMap() );
+ assertEquals( true, b1.equals( b2 ) );
+ assertEquals( true, b2.equals( b1 ) );
+
+ Map m1 = new HashMap();
+ Map m2 = new HashMap();
+
+ b1 = new BuildCommand( "foobuilder", null, m1 );
+ b2 = new BuildCommand( "foobuilder", null, m2 );
+ assertEquals( true, b1.equals( b2 ) );
+ assertEquals( true, b2.equals( b1 ) );
+
+ m1.put( "arg1", "value1" );
+ m2.put( "arg1", "value1" );
+ b1 = new BuildCommand( "foobuilder", null, m1 );
+ b2 = new BuildCommand( "foobuilder", null, m2 );
+ assertEquals( true, b1.equals( b2 ) );
+ assertEquals( true, b2.equals( b1 ) );
+
+ m2.put( "arg1", "foo" );
+ b1 = new BuildCommand( "foobuilder", null, m1 );
+ b2 = new BuildCommand( "foobuilder", null, m2 );
+ assertEquals( false, b1.equals( b2 ) );
+ assertEquals( false, b2.equals( b1 ) );
+ }
+}
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/BuildCommandTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/BuildCommandTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
