Adding additional tests for new content API

archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/ManagedDefaultRepositoryContentTest.java

@@ -648,28 +648,28 @@ public class ManagedDefaultRepositoryContentTest
 
 
     @Test
-    public void testArtifactListWithProjectSelector1() {
+    public void testArtifactListWithProjectSelector() {
         ItemSelector selector = ArchivaItemSelector.builder( )
             .withNamespace( "org.apache.maven.shared" )
             .withProjectId( "maven-downloader" )
             .build( );
         List<? extends Artifact> results = repoContent.getArtifacts( selector );
-        checkArtifactListWithProjectSelector1( results );
+        checkArtifactListWithProjectSelector( results );
 
     }
 
     @Test
-    public void testArtifactStreamWithProjectSelector1() {
+    public void testArtifactStreamWithProjectSelector() {
         ItemSelector selector = ArchivaItemSelector.builder( )
             .withNamespace( "org.apache.maven.shared" )
             .withProjectId( "maven-downloader" )
             .build( );
         Stream<? extends Artifact> results = repoContent.newArtifactStream( selector );
-        checkArtifactListWithProjectSelector1( results.collect( Collectors.toList()) );
+        checkArtifactListWithProjectSelector( results.collect( Collectors.toList()) );
 
     }
 
-    private void checkArtifactListWithProjectSelector1( List<? extends Artifact> results )
+    private void checkArtifactListWithProjectSelector( List<? extends Artifact> results )
     {
         assertNotNull( results );
         assertEquals( 27, results.size( ) );
@@ -696,4 +696,37 @@ public class ManagedDefaultRepositoryContentTest
         assertEquals( ".jar.sha1", artifact.getRemainder( ) );
     }
 
+    @Test
+    public void testArtifactListWithNamespaceSelector() {
+        ItemSelector selector = ArchivaItemSelector.builder( )
+            .withNamespace( "org.multilevel" )
+            .build( );
+        List<? extends Artifact> results = repoContent.getArtifacts( selector );
+        assertNotNull( results );
+        assertEquals( 3, results.size( ) );
+        assertTrue( results.get( 0 ).getFileName( ).startsWith( "testproj1" ) );
+    }
+
+    @Test
+    public void testArtifactListWithNamespaceSelectorRecursive() {
+        ItemSelector selector = ArchivaItemSelector.builder( )
+            .withNamespace( "org.multilevel" )
+            .recurse()
+            .build( );
+        List<? extends Artifact> results = repoContent.getArtifacts( selector );
+        assertNotNull( results );
+        assertEquals( 6, results.size( ) );
+
+        Artifact artifact = results.stream( ).filter( a -> a.getFileName( ).equalsIgnoreCase( "testproj2-1.0.pom" ) )
+            .findFirst( ).get( );
+        assertNotNull( artifact );
+        assertEquals( 6, artifact.getAsset( ).getParent( ).getPath( ).split( "/" ).length );
+
+        artifact = results.stream( ).filter( a -> a.getFileName( ).equalsIgnoreCase( "testproj1-1.0.pom" ) )
+            .findFirst( ).get( );
+        assertNotNull( artifact );
+        assertEquals( 5, artifact.getAsset( ).getParent( ).getPath( ).split( "/" ).length );
+
+    }
+
 }

archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/multilevel/test/1.0/test-1.0.pom → archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/multilevel/testproj1/1.0/testproj1-1.0.pom

@@ -3,8 +3,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.multilevel</groupId>
-    <artifactId>test</artifactId>
-    <name>Multilevel Test Sub 1</name>
+    <artifactId>testproj1</artifactId>
+    <name>Multilevel Test 1</name>
     <version>1.0</version>
     <packaging>pom</packaging>
 

archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/multilevel/1.0/mulitlevel-1.0.pom → archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/repositories/default-repository/org/multilevel/testproj1/testproj2/1.0/testproj2-1.0.pom

@@ -2,9 +2,9 @@
 <project>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org</groupId>
-    <artifactId>multilevel</artifactId>
-    <name>Multilevel Test</name>
+    <groupId>org.multilevel.testproj1</groupId>
+    <artifactId>testproj2</artifactId>
+    <name>Multilevel Test Sub 2</name>
     <version>1.0</version>
     <packaging>pom</packaging>