forked from apache/maven
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed line feeds, added .gitattributes
- Loading branch information
1 parent
2f97f96
commit 176a85f
Showing
9 changed files
with
492 additions
and
486 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,8 @@ | ||
| *.jar -text -crlf | ||
| *.graffle -text -crlf | ||
| # Auto detect text files and perform LF normalization | ||
| * text=auto | ||
|
|
||
| *.java text diff=java | ||
| *.html text diff=html | ||
| *.css text | ||
| *.js text | ||
| *.sql text |
152 changes: 76 additions & 76 deletions
152
...ovider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,76 +1,76 @@ | ||
| package org.apache.maven.repository.internal; | ||
|
|
||
| /* | ||
| * 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.net.MalformedURLException; | ||
|
|
||
| import org.apache.maven.repository.internal.util.ConsoleRepositoryListener; | ||
| import org.apache.maven.repository.internal.util.ConsoleTransferListener; | ||
| import org.codehaus.plexus.PlexusTestCase; | ||
| import org.sonatype.aether.RepositorySystem; | ||
| import org.sonatype.aether.RepositorySystemSession; | ||
| import org.sonatype.aether.repository.LocalRepository; | ||
| import org.sonatype.aether.repository.RemoteRepository; | ||
|
|
||
| public abstract class AbstractRepositoryTestCase | ||
| extends PlexusTestCase | ||
| { | ||
| protected RepositorySystem system; | ||
|
|
||
| protected RepositorySystemSession session; | ||
|
|
||
| @Override | ||
| protected void setUp() | ||
| throws Exception | ||
| { | ||
| super.setUp(); | ||
| system = lookup( RepositorySystem.class ); | ||
| session = newMavenRepositorySystemSession( system ); | ||
| } | ||
|
|
||
| @Override | ||
| protected void tearDown() | ||
| throws Exception | ||
| { | ||
| session = null; | ||
| system = null; | ||
| super.tearDown(); | ||
| } | ||
|
|
||
| public static RepositorySystemSession newMavenRepositorySystemSession( RepositorySystem system ) | ||
| { | ||
| MavenRepositorySystemSession session = new MavenRepositorySystemSession( true ); | ||
|
|
||
| LocalRepository localRepo = new LocalRepository( "target/local-repo" ); | ||
| session.setLocalRepositoryManager( system.newLocalRepositoryManager( localRepo ) ); | ||
|
|
||
| session.setTransferListener( new ConsoleTransferListener() ); | ||
| session.setRepositoryListener( new ConsoleRepositoryListener() ); | ||
|
|
||
| return session; | ||
| } | ||
|
|
||
| public static RemoteRepository newTestRepository() | ||
| throws MalformedURLException | ||
| { | ||
| return new RemoteRepository( "repo", "default", | ||
| getTestFile( "target/test-classes/repo" ).toURI().toURL().toString() ); | ||
| } | ||
| } | ||
| package org.apache.maven.repository.internal; | ||
|
|
||
| /* | ||
| * 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.net.MalformedURLException; | ||
|
|
||
| import org.apache.maven.repository.internal.util.ConsoleRepositoryListener; | ||
| import org.apache.maven.repository.internal.util.ConsoleTransferListener; | ||
| import org.codehaus.plexus.PlexusTestCase; | ||
| import org.sonatype.aether.RepositorySystem; | ||
| import org.sonatype.aether.RepositorySystemSession; | ||
| import org.sonatype.aether.repository.LocalRepository; | ||
| import org.sonatype.aether.repository.RemoteRepository; | ||
|
|
||
| public abstract class AbstractRepositoryTestCase | ||
| extends PlexusTestCase | ||
| { | ||
| protected RepositorySystem system; | ||
|
|
||
| protected RepositorySystemSession session; | ||
|
|
||
| @Override | ||
| protected void setUp() | ||
| throws Exception | ||
| { | ||
| super.setUp(); | ||
| system = lookup( RepositorySystem.class ); | ||
| session = newMavenRepositorySystemSession( system ); | ||
| } | ||
|
|
||
| @Override | ||
| protected void tearDown() | ||
| throws Exception | ||
| { | ||
| session = null; | ||
| system = null; | ||
| super.tearDown(); | ||
| } | ||
|
|
||
| public static RepositorySystemSession newMavenRepositorySystemSession( RepositorySystem system ) | ||
| { | ||
| MavenRepositorySystemSession session = new MavenRepositorySystemSession( true ); | ||
|
|
||
| LocalRepository localRepo = new LocalRepository( "target/local-repo" ); | ||
| session.setLocalRepositoryManager( system.newLocalRepositoryManager( localRepo ) ); | ||
|
|
||
| session.setTransferListener( new ConsoleTransferListener() ); | ||
| session.setRepositoryListener( new ConsoleRepositoryListener() ); | ||
|
|
||
| return session; | ||
| } | ||
|
|
||
| public static RemoteRepository newTestRepository() | ||
| throws MalformedURLException | ||
| { | ||
| return new RemoteRepository( "repo", "default", | ||
| getTestFile( "target/test-classes/repo" ).toURI().toURL().toString() ); | ||
| } | ||
| } |
192 changes: 96 additions & 96 deletions
192
...ovider/src/test/java/org/apache/maven/repository/internal/DefaultVersionResolverTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,96 +1,96 @@ | ||
| package org.apache.maven.repository.internal; | ||
|
|
||
| /* | ||
| * 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 org.sonatype.aether.artifact.Artifact; | ||
| import org.sonatype.aether.impl.VersionResolver; | ||
| import org.sonatype.aether.resolution.VersionRequest; | ||
| import org.sonatype.aether.resolution.VersionResult; | ||
| import org.sonatype.aether.util.artifact.DefaultArtifact; | ||
|
|
||
| public class DefaultVersionResolverTest | ||
| extends AbstractRepositoryTestCase | ||
| { | ||
| private DefaultVersionResolver versionResolver; | ||
|
|
||
| @Override | ||
| protected void setUp() | ||
| throws Exception | ||
| { | ||
| super.setUp(); | ||
| // be sure we're testing the right class, i.e. DefaultVersionResolver.class | ||
| versionResolver = (DefaultVersionResolver) lookup( VersionResolver.class, "default" ); | ||
| } | ||
|
|
||
| @Override | ||
| protected void tearDown() | ||
| throws Exception | ||
| { | ||
| versionResolver = null; | ||
| super.tearDown(); | ||
| } | ||
|
|
||
| public void testResolveSeparateInstalledClassifiedNonUniqueVersionedArtifacts() | ||
| throws Exception | ||
| { | ||
| VersionRequest requestB = new VersionRequest(); | ||
| requestB.addRepository( newTestRepository() ); | ||
| Artifact artifactB = | ||
| new DefaultArtifact( "org.apache.maven.its", "dep-mng5324", "classifierB", "jar", "07.20.3-SNAPSHOT" ); | ||
| requestB.setArtifact( artifactB ); | ||
|
|
||
| VersionResult resultB = versionResolver.resolveVersion( session, requestB ); | ||
| assertEquals( "07.20.3-20120809.112920-97", resultB.getVersion() ); | ||
|
|
||
| VersionRequest requestA = new VersionRequest(); | ||
| requestA.addRepository( newTestRepository() ); | ||
|
|
||
| Artifact artifactA = | ||
| new DefaultArtifact( "org.apache.maven.its", "dep-mng5324", "classifierA", "jar", "07.20.3-SNAPSHOT" ); | ||
| requestA.setArtifact( artifactA ); | ||
|
|
||
| VersionResult resultA = versionResolver.resolveVersion( session, requestA ); | ||
| assertEquals( "07.20.3-20120809.112124-88", resultA.getVersion() ); | ||
| } | ||
|
|
||
| public void testResolveSeparateInstalledClassifiedNonVersionedArtifacts() | ||
| throws Exception | ||
| { | ||
| VersionRequest requestA = new VersionRequest(); | ||
| requestA.addRepository( newTestRepository() ); | ||
| String versionA = "07.20.3-20120809.112124-88"; | ||
| Artifact artifactA = | ||
| new DefaultArtifact( "org.apache.maven.its", "dep-mng5324", "classifierA", "jar", versionA ); | ||
| requestA.setArtifact( artifactA ); | ||
|
|
||
| VersionResult resultA = versionResolver.resolveVersion( session, requestA ); | ||
| assertEquals( versionA, resultA.getVersion() ); | ||
|
|
||
| VersionRequest requestB = new VersionRequest(); | ||
| requestB.addRepository( newTestRepository() ); | ||
| String versionB = "07.20.3-20120809.112920-97"; | ||
| Artifact artifactB = | ||
| new DefaultArtifact( "org.apache.maven.its", "dep-mng5324", "classifierB", "jar", versionB ); | ||
| requestB.setArtifact( artifactB ); | ||
|
|
||
| VersionResult resultB = versionResolver.resolveVersion( session, requestB ); | ||
| assertEquals( versionB, resultB.getVersion() ); | ||
| } | ||
| } | ||
| package org.apache.maven.repository.internal; | ||
|
|
||
| /* | ||
| * 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 org.sonatype.aether.artifact.Artifact; | ||
| import org.sonatype.aether.impl.VersionResolver; | ||
| import org.sonatype.aether.resolution.VersionRequest; | ||
| import org.sonatype.aether.resolution.VersionResult; | ||
| import org.sonatype.aether.util.artifact.DefaultArtifact; | ||
|
|
||
| public class DefaultVersionResolverTest | ||
| extends AbstractRepositoryTestCase | ||
| { | ||
| private DefaultVersionResolver versionResolver; | ||
|
|
||
| @Override | ||
| protected void setUp() | ||
| throws Exception | ||
| { | ||
| super.setUp(); | ||
| // be sure we're testing the right class, i.e. DefaultVersionResolver.class | ||
| versionResolver = (DefaultVersionResolver) lookup( VersionResolver.class, "default" ); | ||
| } | ||
|
|
||
| @Override | ||
| protected void tearDown() | ||
| throws Exception | ||
| { | ||
| versionResolver = null; | ||
| super.tearDown(); | ||
| } | ||
|
|
||
| public void testResolveSeparateInstalledClassifiedNonUniqueVersionedArtifacts() | ||
| throws Exception | ||
| { | ||
| VersionRequest requestB = new VersionRequest(); | ||
| requestB.addRepository( newTestRepository() ); | ||
| Artifact artifactB = | ||
| new DefaultArtifact( "org.apache.maven.its", "dep-mng5324", "classifierB", "jar", "07.20.3-SNAPSHOT" ); | ||
| requestB.setArtifact( artifactB ); | ||
|
|
||
| VersionResult resultB = versionResolver.resolveVersion( session, requestB ); | ||
| assertEquals( "07.20.3-20120809.112920-97", resultB.getVersion() ); | ||
|
|
||
| VersionRequest requestA = new VersionRequest(); | ||
| requestA.addRepository( newTestRepository() ); | ||
|
|
||
| Artifact artifactA = | ||
| new DefaultArtifact( "org.apache.maven.its", "dep-mng5324", "classifierA", "jar", "07.20.3-SNAPSHOT" ); | ||
| requestA.setArtifact( artifactA ); | ||
|
|
||
| VersionResult resultA = versionResolver.resolveVersion( session, requestA ); | ||
| assertEquals( "07.20.3-20120809.112124-88", resultA.getVersion() ); | ||
| } | ||
|
|
||
| public void testResolveSeparateInstalledClassifiedNonVersionedArtifacts() | ||
| throws Exception | ||
| { | ||
| VersionRequest requestA = new VersionRequest(); | ||
| requestA.addRepository( newTestRepository() ); | ||
| String versionA = "07.20.3-20120809.112124-88"; | ||
| Artifact artifactA = | ||
| new DefaultArtifact( "org.apache.maven.its", "dep-mng5324", "classifierA", "jar", versionA ); | ||
| requestA.setArtifact( artifactA ); | ||
|
|
||
| VersionResult resultA = versionResolver.resolveVersion( session, requestA ); | ||
| assertEquals( versionA, resultA.getVersion() ); | ||
|
|
||
| VersionRequest requestB = new VersionRequest(); | ||
| requestB.addRepository( newTestRepository() ); | ||
| String versionB = "07.20.3-20120809.112920-97"; | ||
| Artifact artifactB = | ||
| new DefaultArtifact( "org.apache.maven.its", "dep-mng5324", "classifierB", "jar", versionB ); | ||
| requestB.setArtifact( artifactB ); | ||
|
|
||
| VersionResult resultB = versionResolver.resolveVersion( session, requestB ); | ||
| assertEquals( versionB, resultB.getVersion() ); | ||
| } | ||
| } |
Oops, something went wrong.