Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o Fixed NPEs 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@805163 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-08-17 21:49:37 +00:00
parent 5eaec2f448
commit 6499386f49
4 changed files with 131 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilter.java
View File

@ -40,6 +40,7 @@ public class AndArtifactFilter
public AndArtifactFilter()
{
this.filters = new LinkedHashSet<ArtifactFilter>();
}
public AndArtifactFilter( List<ArtifactFilter> filters )
@ -63,11 +64,6 @@ public class AndArtifactFilter
public void add( ArtifactFilter artifactFilter )
{
if ( filters == null )
{
filters = new LinkedHashSet<ArtifactFilter>();
}
filters.add( artifactFilter );
}

9
maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilter.java
View File

@ -38,6 +38,7 @@ public class OrArtifactFilter
public OrArtifactFilter()
{
this.filters = new LinkedHashSet<ArtifactFilter>();
}
public OrArtifactFilter( Collection<ArtifactFilter> filters )
@ -46,8 +47,6 @@ public class OrArtifactFilter
}
public boolean include( Artifact artifact )
{
if ( filters != null )
{
for ( ArtifactFilter filter : filters )
{
@ -56,18 +55,12 @@ public class OrArtifactFilter
return true;
}
}
}
return false;
}
public void add( ArtifactFilter artifactFilter )
{
if ( filters == null )
{
filters = new LinkedHashSet<ArtifactFilter>();
}
filters.add( artifactFilter );
}

62
maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/AndArtifactFilterTest.java Normal file
View File

@ -0,0 +1,62 @@
package org.apache.maven.artifact.resolver.filter;
/*
* 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.
*/
import java.util.Arrays;
import org.apache.maven.artifact.Artifact;
import junit.framework.TestCase;
/**
* Tests {@link AndArtifactFilter}.
*
* @author Benjamin Bentmann
*/
public class AndArtifactFilterTest
extends TestCase
{
private ArtifactFilter newSubFilter()
{
return new ArtifactFilter()
{
public boolean include( Artifact artifact )
{
return false;
}
};
}
public void testEquals()
{
AndArtifactFilter filter1 = new AndArtifactFilter();
AndArtifactFilter filter2 = new AndArtifactFilter( Arrays.asList( newSubFilter() ) );
assertFalse( filter1.equals( null ) );
assertTrue( filter1.equals( filter1 ) );
assertEquals( filter1.hashCode(), filter1.hashCode() );
assertFalse( filter1.equals( filter2 ) );
assertFalse( filter2.equals( filter1 ) );
}
}

62
maven-compat/src/test/java/org/apache/maven/artifact/resolver/filter/OrArtifactFilterTest.java Normal file
View File

@ -0,0 +1,62 @@
package org.apache.maven.artifact.resolver.filter;
/*
* 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.
*/
import java.util.Arrays;
import org.apache.maven.artifact.Artifact;
import junit.framework.TestCase;
/**
* Tests {@link OrArtifactFilter}.
*
* @author Benjamin Bentmann
*/
public class OrArtifactFilterTest
extends TestCase
{
private ArtifactFilter newSubFilter()
{
return new ArtifactFilter()
{
public boolean include( Artifact artifact )
{
return false;
}
};
}
public void testEquals()
{
OrArtifactFilter filter1 = new OrArtifactFilter();
OrArtifactFilter filter2 = new OrArtifactFilter( Arrays.asList( newSubFilter() ) );
assertFalse( filter1.equals( null ) );
assertTrue( filter1.equals( filter1 ) );
assertEquals( filter1.hashCode(), filter1.hashCode() );
assertFalse( filter1.equals( filter2 ) );
assertFalse( filter2.equals( filter1 ) );
}
}