You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/07/12 12:29:59 UTC
svn commit: r793311 - in
/maven/maven-2/branches/maven-2.2.x/maven-model/src: main/mdo/
test/java/org/apache/maven/model/
Author: bentmann
Date: Sun Jul 12 10:29:57 2009
New Revision: 793311
URL: http://svn.apache.org/viewvc?rev=793311&view=rev
Log:
[MNG-3265] maven-model Extension.equals causes NPE when any field is uninitialized
Modified:
maven/maven-2/branches/maven-2.2.x/maven-model/src/main/mdo/maven.mdo
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ActivationFileTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ActivationOSTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ActivationPropertyTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ActivationTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/BuildTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/CiManagementTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ContributorTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/DependencyManagementTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/DependencyTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/DeploymentRepositoryTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/DeveloperTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/DistributionManagementTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ExclusionTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ExtensionTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/IssueManagementTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/LicenseTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/MailingListTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ModelTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/NotifierTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/OrganizationTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ParentTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/PluginConfigurationTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/PluginContainerTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/PluginExecutionTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/PluginManagementTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/PluginTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/PrerequisitesTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ProfileTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/RelocationTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ReportPluginTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ReportSetTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ReportingTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/RepositoryPolicyTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/RepositoryTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ResourceTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ScmTest.java
maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/SiteTest.java
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/main/mdo/maven.mdo
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/main/mdo/maven.mdo?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/main/mdo/maven.mdo (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/main/mdo/maven.mdo Sun Jul 12 10:29:57 2009
@@ -3429,21 +3429,26 @@
Extension e = (Extension) o;
- if ( !e.getArtifactId().equals( getArtifactId() ) )
+ if ( !equal( e.getArtifactId(), getArtifactId() ) )
{
return false;
}
- else if ( !e.getGroupId().equals( getGroupId() ) )
+ else if ( !equal( e.getGroupId(), getGroupId() ) )
{
return false;
}
- else if ( e.getVersion() != null ? !e.getVersion().equals( getVersion() ) : getVersion() != null )
+ else if ( !equal( e.getVersion(), getVersion() ) )
{
return false;
}
return true;
}
+ private static <T> boolean equal( T obj1, T obj2 )
+ {
+ return ( obj1 != null ) ? obj1.equals( obj2 ) : obj2 == null;
+ }
+
/**
* @see java.lang.Object#hashCode()
*/
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ActivationFileTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ActivationFileTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ActivationFileTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ActivationFileTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new ActivationFile().equals( null ) );
+
+ new ActivationFile().equals( new ActivationFile() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ActivationOSTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ActivationOSTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ActivationOSTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ActivationOSTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new ActivationOS().equals( null ) );
+
+ new ActivationOS().equals( new ActivationOS() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ActivationPropertyTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ActivationPropertyTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ActivationPropertyTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ActivationPropertyTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new ActivationProperty().equals( null ) );
+
+ new ActivationProperty().equals( new ActivationProperty() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ActivationTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ActivationTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ActivationTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ActivationTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new Activation().equals( null ) );
+
+ new Activation().equals( new Activation() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/BuildTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/BuildTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/BuildTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/BuildTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new Build().equals( null ) );
+
+ new Build().equals( new Build() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/CiManagementTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/CiManagementTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/CiManagementTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/CiManagementTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new CiManagement().equals( null ) );
+
+ new CiManagement().equals( new CiManagement() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ContributorTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ContributorTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ContributorTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ContributorTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new Contributor().equals( null ) );
+
+ new Contributor().equals( new Contributor() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/DependencyManagementTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/DependencyManagementTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/DependencyManagementTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/DependencyManagementTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new DependencyManagement().equals( null ) );
+
+ new DependencyManagement().equals( new DependencyManagement() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/DependencyTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/DependencyTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/DependencyTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/DependencyTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new Dependency().equals( null ) );
+
+ new Dependency().equals( new Dependency() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/DeploymentRepositoryTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/DeploymentRepositoryTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/DeploymentRepositoryTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/DeploymentRepositoryTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new DeploymentRepository().equals( null ) );
+
+ new DeploymentRepository().equals( new DeploymentRepository() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/DeveloperTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/DeveloperTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/DeveloperTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/DeveloperTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new Developer().equals( null ) );
+
+ new Developer().equals( new Developer() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/DistributionManagementTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/DistributionManagementTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/DistributionManagementTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/DistributionManagementTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new DistributionManagement().equals( null ) );
+
+ new DistributionManagement().equals( new DistributionManagement() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ExclusionTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ExclusionTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ExclusionTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ExclusionTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new Exclusion().equals( null ) );
+
+ new Exclusion().equals( new Exclusion() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ExtensionTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ExtensionTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ExtensionTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ExtensionTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new Extension().equals( null ) );
+
+ new Extension().equals( new Extension() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/IssueManagementTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/IssueManagementTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/IssueManagementTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/IssueManagementTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new IssueManagement().equals( null ) );
+
+ new IssueManagement().equals( new IssueManagement() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/LicenseTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/LicenseTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/LicenseTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/LicenseTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new License().equals( null ) );
+
+ new License().equals( new License() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/MailingListTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/MailingListTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/MailingListTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/MailingListTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new MailingList().equals( null ) );
+
+ new MailingList().equals( new MailingList() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ModelTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ModelTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ModelTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ModelTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new Model().equals( null ) );
+
+ new Model().equals( new Model() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/NotifierTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/NotifierTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/NotifierTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/NotifierTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new Notifier().equals( null ) );
+
+ new Notifier().equals( new Notifier() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/OrganizationTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/OrganizationTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/OrganizationTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/OrganizationTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new Organization().equals( null ) );
+
+ new Organization().equals( new Organization() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ParentTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ParentTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ParentTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ParentTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new Parent().equals( null ) );
+
+ new Parent().equals( new Parent() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/PluginConfigurationTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/PluginConfigurationTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/PluginConfigurationTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/PluginConfigurationTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new PluginConfiguration().equals( null ) );
+
+ new PluginConfiguration().equals( new PluginConfiguration() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/PluginContainerTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/PluginContainerTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/PluginContainerTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/PluginContainerTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new PluginContainer().equals( null ) );
+
+ new PluginContainer().equals( new PluginContainer() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/PluginExecutionTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/PluginExecutionTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/PluginExecutionTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/PluginExecutionTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new PluginExecution().equals( null ) );
+
+ new PluginExecution().equals( new PluginExecution() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/PluginManagementTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/PluginManagementTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/PluginManagementTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/PluginManagementTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new PluginManagement().equals( null ) );
+
+ new PluginManagement().equals( new PluginManagement() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/PluginTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/PluginTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/PluginTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/PluginTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new Plugin().equals( null ) );
+
+ new Plugin().equals( new Plugin() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/PrerequisitesTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/PrerequisitesTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/PrerequisitesTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/PrerequisitesTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new Prerequisites().equals( null ) );
+
+ new Prerequisites().equals( new Prerequisites() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ProfileTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ProfileTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ProfileTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ProfileTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new Profile().equals( null ) );
+
+ new Profile().equals( new Profile() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/RelocationTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/RelocationTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/RelocationTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/RelocationTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new Relocation().equals( null ) );
+
+ new Relocation().equals( new Relocation() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ReportPluginTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ReportPluginTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ReportPluginTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ReportPluginTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new ReportPlugin().equals( null ) );
+
+ new ReportPlugin().equals( new ReportPlugin() );
}
public void testEqualsIsKey()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ReportSetTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ReportSetTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ReportSetTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ReportSetTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new ReportSet().equals( null ) );
+
+ new ReportSet().equals( new ReportSet() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ReportingTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ReportingTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ReportingTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ReportingTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new Reporting().equals( null ) );
+
+ new Reporting().equals( new Reporting() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/RepositoryPolicyTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/RepositoryPolicyTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/RepositoryPolicyTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/RepositoryPolicyTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new RepositoryPolicy().equals( null ) );
+
+ new RepositoryPolicy().equals( new RepositoryPolicy() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/RepositoryTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/RepositoryTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/RepositoryTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/RepositoryTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new Repository().equals( null ) );
+
+ new Repository().equals( new Repository() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ResourceTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ResourceTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ResourceTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ResourceTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new Resource().equals( null ) );
+
+ new Resource().equals( new Resource() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ScmTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ScmTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ScmTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/ScmTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new Scm().equals( null ) );
+
+ new Scm().equals( new Scm() );
}
public void testEqualsIdentity()
Modified: maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/SiteTest.java
URL: http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/SiteTest.java?rev=793311&r1=793310&r2=793311&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/SiteTest.java (original)
+++ maven/maven-2/branches/maven-2.2.x/maven-model/src/test/java/org/apache/maven/model/SiteTest.java Sun Jul 12 10:29:57 2009
@@ -39,6 +39,8 @@
public void testEqualsNullSafe()
{
assertFalse( new Site().equals( null ) );
+
+ new Site().equals( new Site() );
}
public void testEqualsIdentity()