svn commit: r723624 - in /archiva/branches/archiva-search-improvements/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search: DefaultCrossRepositorySearchTest.java FileContentIndexPopulator.java

[jdumay]

Author: jdumay
Date: Thu Dec  4 23:09:29 2008
New Revision: 723624

URL: http://svn.apache.org/viewvc?rev=723624&view=rev
Log:
Remove content tests

Modified:
    
archiva/branches/archiva-search-improvements/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearchTest.java
    
archiva/branches/archiva-search-improvements/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/FileContentIndexPopulator.java

Modified: 
archiva/branches/archiva-search-improvements/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearchTest.java
URL: 
http://svn.apache.org/viewvc/archiva/branches/archiva-search-improvements/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearchTest.java?rev=723624&r1=723623&r2=723624&view=diff
==============================================================================
--- 
archiva/branches/archiva-search-improvements/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearchTest.java
 (original)
+++ 
archiva/branches/archiva-search-improvements/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearchTest.java
 Thu Dec  4 23:09:29 2008
@@ -142,22 +142,6 @@
         assertSearchResults( expectedRepos, expectedResults, search, "org", 
null, false );
     }
 
-    public void testSearchTerm_Junit()
-        throws Exception
-    {        
-        CrossRepositorySearch search = lookupCrossRepositorySearch();
-        
-        String expectedRepos[] = new String[] {
-            TEST_DEFAULT_REPO_ID
-        };
-        
-        String expectedResults[] = new String[] { 
-            "junit","junit2","junit3"
-        };
-        
-        assertSearchResults( expectedRepos, expectedResults, search, "junit", 
null, false );
-    }
-
     public void testSearchInvalidTerm()
         throws Exception
     {        
@@ -174,44 +158,6 @@
         assertSearchResults( expectedRepos, expectedResults, search, 
"monosodium", null, false );
     }
     
-    public void testSearchWithinSearchResults()
-        throws Exception
-    {        
-        CrossRepositorySearch search = lookupCrossRepositorySearch();
-
-        String expectedRepos[] = new String[] {
-            TEST_DEFAULT_REPO_ID
-        };
-        
-        String expectedResults[] = new String[] { 
-            "org","org2","org3","org4","org5","org6","org7"
-        };
-        
-        // first search
-        assertSearchResults( expectedRepos, expectedResults, search, "org", 
null, false );
-        
-        List<String> previousSearchTerms = new ArrayList<String>();
-        previousSearchTerms.add( "org" );        
-        String secondSearchExpectedResults[] = new String[] { 
-            "org.apache.maven.archiva.record", 
"org.apache.maven.archiva.record2",
-                "org.apache.maven.archiva.record3", 
"org.apache.maven.archiva.record4",
-                "org.apache.maven.archiva.record5", 
"org.apache.maven.archiva.record6",
-                "org.apache.maven.archiva.record7" 
-        };
-        
-        //second search
-        assertSearchResults( expectedRepos, secondSearchExpectedResults, 
search, "org.apache.maven.archiva.record",
-                             previousSearchTerms, false );
-        
-        previousSearchTerms.add( "org.apache.maven.archiva.record" );
-        String thirdSearchExpectedResults[] = new String[] { 
-            "junit", "junit2", "junit3"
-        };
-        
-        //third search
-        assertSearchResults( expectedRepos, thirdSearchExpectedResults, 
search, "junit", previousSearchTerms, false );        
-    }
-    
     public void testSearchForClassesAndPackages()
         throws Exception
     {                

Modified: 
archiva/branches/archiva-search-improvements/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/FileContentIndexPopulator.java
URL: 
http://svn.apache.org/viewvc/archiva/branches/archiva-search-improvements/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/FileContentIndexPopulator.java?rev=723624&r1=723623&r2=723624&view=diff
==============================================================================
--- 
archiva/branches/archiva-search-improvements/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/FileContentIndexPopulator.java
 (original)
+++ 
archiva/branches/archiva-search-improvements/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/FileContentIndexPopulator.java
 Thu Dec  4 23:09:29 2008
@@ -78,16 +78,6 @@
         record.setRepositoryId( "test-repo" );
         record.setFilename( path );
 
-        try
-        {
-            record.setContents( FileUtils.readFileToString( pathToFile, null ) 
);
-        }
-        catch ( IOException e )
-        {
-            e.printStackTrace();
-            throw new AssertionFailedError( "Can't load test file contents: " 
+ pathToFile.getAbsolutePath() );
-        }
-
         return record;
     }
 }