diff --git a/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java b/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java index 59d24519c..3a530d7e4 100644 --- a/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java +++ b/MRM-124/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java @@ -843,6 +843,8 @@ private void assertManagedRepo( ManagedRepository managedRepo, ManagedRepository assertEquals( expectedRepoConfig.getId(), managedRepo.getId() ); assertEquals( expectedRepoConfig.getLayout(), managedRepo.getLayout() ); assertEquals( expectedRepoConfig.getName(), managedRepo.getName() ); + + //TODO enable assert once fixed in AdministrationServiceImpl! //assertEquals( "http://localhost:8080/archiva/repository/" + expectedRepoConfig.getId(), managedRepo.getUrl() ); assertEquals( expectedRepoConfig.isReleases(), managedRepo.isReleases() ); assertEquals( expectedRepoConfig.isSnapshots(), managedRepo.isSnapshots() ); @@ -900,22 +902,6 @@ private void recordDbConsumers() unprocessedConsumersControl.expectAndReturn( processPomConsumer.getId(), "process-pom" ); } - private List getArtifacts() - { - List artifacts = new ArrayList(); - - ArchivaArtifactModel model = new ArchivaArtifactModel(); - model.setRepositoryId( "internal" ); - model.setGroupId( "org.apache.archiva" ); - model.setArtifactId( "archiva-test" ); - model.setVersion( "1.0" ); - model.setType( "jar" ); - - ArchivaArtifact artifact = new ArchivaArtifact( model ); - artifacts.add( artifact ); - return artifacts; - } - private void recordInManagedLegacyRepoContent( MockControl fileTypesControl, FileTypes fileTypes, MockControl pathParserControl, PathParser parser ) throws LayoutException @@ -945,6 +931,22 @@ private void recordInManagedLegacyRepoContent( MockControl fileTypesControl, Fil aRef = createArtifactReference("archiva-test", "org.apache.archiva", "1.1", "jar"); pathParserControl.expectAndReturn( parser.toArtifactReference( "org.apache.archiva/jars/archiva-test-1.1.jar" ), aRef ); } + + private List getArtifacts() + { + List artifacts = new ArrayList(); + + ArchivaArtifactModel model = new ArchivaArtifactModel(); + model.setRepositoryId( "internal" ); + model.setGroupId( "org.apache.archiva" ); + model.setArtifactId( "archiva-test" ); + model.setVersion( "1.0" ); + model.setType( "jar" ); + + ArchivaArtifact artifact = new ArchivaArtifact( model ); + artifacts.add( artifact ); + return artifacts; + } private ArtifactReference createArtifactReference( String artifactId, String groupId, String version, String type ) {