svn commit: r1174827 - in /archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test: java/org/apache/archiva/indexer/search/ nexus-search-test-repo/org/apache/archiva/test-webapp/ nexus-search-test-repo/org/apache/archiva/test-webapp/1.0-SNA...

[olamy]

Author: olamy
Date: Fri Sep 23 15:16:56 2011
New Revision: 1174827

URL: http://svn.apache.org/viewvc?rev=1174827&view=rev
Log:
[MRM-1129] web applications are not indexed for java source code : add a unit 
test

Added:
    
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/archiva/test-webapp/
    
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/archiva/test-webapp/1.0-SNAPSHOT/
    
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/archiva/test-webapp/1.0-SNAPSHOT/test-webapp-1.0-SNAPSHOT.war
Modified:
    
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java?rev=1174827&r1=1174826&r2=1174827&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java
 Fri Sep 23 15:16:56 2011
@@ -19,8 +19,8 @@ package org.apache.archiva.indexer.searc
  * under the License.
  */
 
-import org.apache.archiva.indexer.util.SearchUtil;
 import org.apache.archiva.common.utils.FileUtil;
+import org.apache.archiva.indexer.util.SearchUtil;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
@@ -284,7 +284,7 @@ public class NexusRepositorySearchTest
 
         assertNotNull( results );
         assertEquals( 1, results.getHits().size() );
-        assertEquals( "total hits not 7 for page1 " + results, 7, 
results.getTotalHits() );
+        assertEquals( "total hits not 8 for page1 " + results, 8, 
results.getTotalHits() );
         assertEquals( "returned hits not 1 for page1 " + results, 1, 
results.getReturnedHitsCount() );
         assertEquals( limits, results.getLimits() );
 
@@ -305,7 +305,7 @@ public class NexusRepositorySearchTest
         assertNotNull( results );
 
         assertEquals( "hits not 1", 1, results.getHits().size() );
-        assertEquals( "total hits not 7 for page 2 " + results, 7, 
results.getTotalHits() );
+        assertEquals( "total hits not 8 for page 2 " + results, 8, 
results.getTotalHits() );
         assertEquals( "returned hits not 1 for page2 " + results, 1, 
results.getReturnedHitsCount() );
         assertEquals( limits, results.getLimits() );
     }
@@ -778,4 +778,29 @@ public class NexusRepositorySearchTest
         assertNotNull( results );
         assertEquals( 0, results.getTotalHits() );
     }
+
+    @Test
+    public void testAdvancedSearchClassNameInWar()
+        throws Exception
+    {
+        createIndexContainingMoreArtifacts( true );
+
+        List<String> selectedRepos = Arrays.asList( TEST_REPO_1 );
+
+        SearchFields searchFields = new SearchFields();
+        searchFields.setClassName( "SomeClass" );
+        searchFields.setRepositories( selectedRepos );
+
+        archivaConfigControl.expectAndReturn( 
archivaConfig.getConfiguration(), config );
+
+        archivaConfigControl.replay();
+
+        SearchResults results = search.search( "user", searchFields, null );
+
+        archivaConfigControl.verify();
+
+        assertNotNull( results );
+        assertEquals( 1, results.getHits().size() );
+        assertEquals( "test-webapp", results.getHits().get( 0 
).getArtifactId() );
+    }
 }

Added: 
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/archiva/test-webapp/1.0-SNAPSHOT/test-webapp-1.0-SNAPSHOT.war
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/archiva/test-webapp/1.0-SNAPSHOT/test-webapp-1.0-SNAPSHOT.war?rev=1174827&view=auto
==============================================================================
Files 
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/archiva/test-webapp/1.0-SNAPSHOT/test-webapp-1.0-SNAPSHOT.war
 (added) and 
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/nexus-search-test-repo/org/apache/archiva/test-webapp/1.0-SNAPSHOT/test-webapp-1.0-SNAPSHOT.war
 Fri Sep 23 15:16:56 2011 differ