From 79a91fe1ffeb5bacfe36e96b20fceb70cbbb7797 Mon Sep 17 00:00:00 2001 From: Martin Schreier Date: Wed, 5 Jan 2022 15:30:51 +0100 Subject: [PATCH] Moving test classes for consistent package usage --- .../maven/{common => }/proxy/WagonFactoryTest.java | 2 +- .../JcrRepositoryStatisticsGatheringTest.java | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) rename archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/maven/{common => }/proxy/WagonFactoryTest.java (97%) rename archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/{stats => jcr}/JcrRepositoryStatisticsGatheringTest.java (95%) diff --git a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/maven/common/proxy/WagonFactoryTest.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/maven/proxy/WagonFactoryTest.java similarity index 97% rename from archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/maven/common/proxy/WagonFactoryTest.java rename to archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/maven/proxy/WagonFactoryTest.java index cf3515221..e165dd0cf 100644 --- a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/maven/common/proxy/WagonFactoryTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/maven/proxy/WagonFactoryTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.maven.common.proxy; +package org.apache.archiva.maven.proxy; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/stats/JcrRepositoryStatisticsGatheringTest.java b/archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrRepositoryStatisticsGatheringTest.java similarity index 95% rename from archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/stats/JcrRepositoryStatisticsGatheringTest.java rename to archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrRepositoryStatisticsGatheringTest.java index 35166df41..8124e51c2 100644 --- a/archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/stats/JcrRepositoryStatisticsGatheringTest.java +++ b/archiva-modules/metadata/metadata-store-provider/oak-jcr/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrRepositoryStatisticsGatheringTest.java @@ -1,4 +1,4 @@ -package org.apache.archiva.metadata.repository.stats; +package org.apache.archiva.metadata.repository.jcr; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -10,7 +10,6 @@ package org.apache.archiva.metadata.repository.stats; * 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 @@ -23,16 +22,10 @@ import junit.framework.TestCase; import org.apache.archiva.metadata.model.MetadataFacetFactory; import org.apache.archiva.metadata.repository.AbstractMetadataRepositoryTest; import org.apache.archiva.metadata.repository.DefaultMetadataResolver; -import org.apache.archiva.metadata.repository.MetadataRepository; import org.apache.archiva.metadata.repository.MetadataRepositoryException; import org.apache.archiva.metadata.repository.MetadataService; import org.apache.archiva.metadata.repository.RepositorySession; -import org.apache.archiva.metadata.repository.RepositorySessionFactory; -import org.apache.archiva.metadata.repository.jcr.JcrMetadataRepository; -import org.apache.archiva.metadata.repository.jcr.JcrRepositorySessionFactory; -import org.apache.archiva.metadata.repository.jcr.JcrRepositorySession; import org.apache.archiva.metadata.repository.stats.model.DefaultRepositoryStatistics; -import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.apache.jackrabbit.commons.JcrUtils; import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException; import org.junit.After; @@ -60,8 +53,6 @@ import java.nio.file.Paths; import java.util.Calendar; import java.util.Date; import java.util.List; -import java.util.Map; -import java.util.zip.GZIPInputStream; @RunWith( SpringJUnit4ClassRunner.class ) @ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } ) -- 2.39.5