svn commit: r885326 - /archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java

[brett]

Author: brett
Date: Mon Nov 30 03:32:58 2009
New Revision: 885326

URL: http://svn.apache.org/viewvc?rev=885326&view=rev
Log:
[MRM-1288] correction to adjusted getDependees() test

Modified:
    
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java

Modified: 
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java
URL: 
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java?rev=885326&r1=885325&r2=885326&view=diff
==============================================================================
--- 
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java
 (original)
+++ 
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/SearchServiceImplTest.java
 Mon Nov 30 03:32:58 2009
@@ -21,6 +21,7 @@
 
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -606,31 +607,23 @@
     public void testGetDependeesArtifactDoesNotExist()
         throws Exception
     {
-        Date date = new Date();
         List<String> observableRepoIds = new ArrayList<String>();
         observableRepoIds.add( "repo1.mirror" );
         observableRepoIds.add( "public.releases" );
 
+        // no longer differentiating between a project not being present and a 
project that is present but with
+        // no references. If it is later determined to be needed, we will need 
to modify the metadata content repository
         userReposControl.expectAndReturn( 
userRepos.getObservableRepositories(), observableRepoIds );
         metadataResolverControl.expectAndReturn(
             metadataResolver.getProjectReferences( "repo1.mirror", 
ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID,
-                                                   "1.0" ), null );
+                                                   "1.0" ), 
Collections.<ProjectVersionReference>emptyList() );
         metadataResolverControl.expectAndReturn(
             metadataResolver.getProjectReferences( "public.releases", 
ARCHIVA_TEST_GROUP_ID, ARCHIVA_TEST_ARTIFACT_ID,
-                                                   "1.0" ), null );
+                                                   "1.0" ), 
Collections.<ProjectVersionReference>emptyList() );
 
-        repoBrowsingControl.replay();
         userReposControl.replay();
+        metadataResolverControl.replay();
 
-        try
-        {
-            searchService.getDependees( ARCHIVA_TEST_GROUP_ID, 
ARCHIVA_TEST_ARTIFACT_ID, "1.0" );
-            fail( "An exception should have been thrown." );
-        }
-        catch ( Exception e )
-        {
-            repoBrowsingControl.verify();
-            userReposControl.verify();
-        }
+        assertTrue( searchService.getDependees( ARCHIVA_TEST_GROUP_ID, 
ARCHIVA_TEST_ARTIFACT_ID, "1.0" ).isEmpty() );
     }
 }
\ No newline at end of file