ruper2/src/test/core/org/krysalis/ruper2/usecases FindTests.java,1.6,1.7 SynchronizeTests.java,1.4,1.5 FileHelper.java,1.1,1.2

[email protected]
Newsgroups gmane.comp.krysalis.metamorphosis.cvs
Message-ID <[email protected]>
Update of /cvsroot/metamorphosis/ruper2/src/test/core/org/krysalis/ruper2/usecases
In directory sc8-pr-cvs1:/tmp/cvs-serv16302/src/test/core/org/krysalis/ruper2/usecases

Modified Files:
	FindTests.java SynchronizeTests.java FileHelper.java 
Log Message:
Attempt to bring closer to working w/ Anou's API.

Index: FindTests.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/test/core/org/krysalis/ruper2/usecases/FindTests.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FindTests.java	9 Oct 2003 21:15:01 -0000	1.6
--- FindTests.java	10 Oct 2003 21:26:25 -0000	1.7
***************
*** 8,14 ****
  import junit.framework.TestSuite;
  
! import org.krysalis.ruper2.impl.ResourceUpdaterEngine;
! import org.krysalis.ruper2.impl.ResourceUpdaterIdentifier;
! import org.krysalis.ruper2.messaging.ResourceRequest;
  import org.krysalis.ruper2.query.ResourceQueryHelper;
  import org.krysalis.ruper2.query.ResourceResult;
--- 8,13 ----
  import junit.framework.TestSuite;
  
! import org.krysalis.ruper2.ResourceUpdater;
! import org.krysalis.ruper2.query.ResourceQuery;
  import org.krysalis.ruper2.query.ResourceQueryHelper;
  import org.krysalis.ruper2.query.ResourceResult;
***************
*** 93,100 ****
  
  		//  1. User configures Ruper
! 		ResourceUpdaterIdentifier identifier =
! 			new ResourceUpdaterIdentifier("findTest");
! 		ResourceUpdaterEngine updater =
! 			ResourceUpdaterEngine.getResourceUpdater(identifier, true);
  
  		IRepository fileRepo =
--- 92,97 ----
  
  		//  1. User configures Ruper
! 		ResourceUpdater ruper =
! 			ResourceUpdater.getDefaultResourceUpdater();
  
  		IRepository fileRepo =
***************
*** 105,114 ****
  		//  2. User supplies resource query and asks Ruper process it
  		ResourceSpecifier specifier = new ResourceSpecifier("gorilla");
! 		ResourceRequest request =
! 			new ResourceRequest(
  				ResourceQueryHelper.getResourceSpecifierQuery(
  					specifier,
! 					repos));
! 		ResourceResult result = updater.performRequest(request);
  
  		//  3. Ruper examines query to extract resource information
--- 102,110 ----
  		//  2. User supplies resource query and asks Ruper process it
  		ResourceSpecifier specifier = new ResourceSpecifier("gorilla");
! 		ResourceQuery query =
  				ResourceQueryHelper.getResourceSpecifierQuery(
  					specifier,
! 					repos);
! 		List results = ruper.findResource(query);
  
  		//  3. Ruper examines query to extract resource information
***************
*** 116,124 ****
  		//  5. Ruper reports results to User
  
! 		assertNotNull("Should get a result", result);
! 		// TODO: This is very hacky
! 		List resultList = ResourceResultHelper.getResourceList(result);
! 		assertEquals("Result had wrong size", 1, resultList.size());
! 		Resource resource = (Resource) resultList.get(0);
  
  		VirtualResourceLocator expected =
--- 112,118 ----
  		//  5. Ruper reports results to User
  
! 		assertNotNull("Should get a result", results);
! 		assertEquals("Result had wrong size", 1, results.size());
! 		Resource resource = (Resource) results.get(0);
  
  		VirtualResourceLocator expected =

Index: SynchronizeTests.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/test/core/org/krysalis/ruper2/usecases/SynchronizeTests.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SynchronizeTests.java	8 Oct 2003 13:23:22 -0000	1.4
--- SynchronizeTests.java	10 Oct 2003 21:26:25 -0000	1.5
***************
*** 7,16 ****
  import junit.framework.TestSuite;
  
! import org.krysalis.ruper2.api.FileAPI;
! import org.krysalis.ruper2.api.tool.FileUpdater;
! import org.krysalis.ruper2.impl.ResourceUpdaterEngine;
  import org.krysalis.ruper2.impl.ResourceUpdaterIdentifier;
- import org.krysalis.ruper2.repository.Repository;
  import org.krysalis.ruper2.repository.IRepository;
  import org.krysalis.ruper2.repository.RepositorySet;
  
--- 7,16 ----
  import junit.framework.TestSuite;
  
! import org.krysalis.ruper2.FileAssistant;
! import org.krysalis.ruper2.FileUpdater;
! import org.krysalis.ruper2.ResourceUpdater;
  import org.krysalis.ruper2.impl.ResourceUpdaterIdentifier;
  import org.krysalis.ruper2.repository.IRepository;
+ import org.krysalis.ruper2.repository.Repository;
  import org.krysalis.ruper2.repository.RepositorySet;
  
***************
*** 87,150 ****
   */
  public class SynchronizeTests extends TestCase {
!     File m_repoDir = new File("transient/usecase/synchronize/repo");
!     File m_targetDir = new File("transient/usecase/synchronize/target");
!     FileHelper m_fileHelper = new FileHelper();
  
!     protected void setUp() {
!         m_repoDir.mkdirs();
!         m_fileHelper.setUp();
!     }
  
!     protected void tearDown() {
!         m_fileHelper.tearDown();
!     }
  
  
!     public void testMainScenario() throws Exception {
!         // Can't quite test main, cause defaults aren't suitable.
  
!         // BPS - Currently several bugs that we have to work around
!         // 1) Version comparision doesn't work unless we specify the full major.minor.point
!         //    (ie if target is version 2.3 it compares equal with 2.3.1 )
!         // 2) Don't know how to specify comparisons
!         File targetFile = m_fileHelper.setupActualFile( m_targetDir, "cat-2.3.0.jar");
!         File betterFile = m_fileHelper.setupActualFile( m_repoDir, "cat/jars/cat-2.3.1.jar");
!         File resultFile = m_fileHelper.setupExpectedFile( m_targetDir, "cat-2.3.1.jar");
  
!         //  1. User configures Ruper
!         ResourceUpdaterIdentifier identifier = new ResourceUpdaterIdentifier("synchronizeTest");
!         ResourceUpdaterEngine ruper= ResourceUpdaterEngine.getResourceUpdater( identifier, true );
  
!         IRepository  fileRepo = new Repository("test", m_repoDir.toURL().toString() );
!         RepositorySet repos = new RepositorySet();
!         repos.addRepository( fileRepo );
  
!         FileUpdater updater = new FileUpdater( new FileAPI(), ruper,  repos);
  
!         //  2. User supplies file details and asks Ruper to synchronize it
!         updater.updateFile( targetFile );
  
!         //  3. Ruper examines file details to extract resource information
!         //  4. Ruper queries repositories for resource
!         //  5. Ruper compares result(s) of query with existing file.
!         //  6. Ruper chooses best result and copies it to file location
!         assertTrue("Result file exists", resultFile.exists());
!         //  7. Ruper removes old copy of resource from file location
  
!         // BPS - This don't work yet
!         // assertFalse("Old file has been removed", targetFile.exists() );
  
!         //  8. Ruper reports results to User
  
!     }
  
!     public static Test suite() {
!         return new TestSuite(SynchronizeTests.class);
!     }
  
!     public static void main(String[] args) {
!         junit.textui.TestRunner.run(suite());
!     }
  }
- 
- 
--- 87,155 ----
   */
  public class SynchronizeTests extends TestCase {
! 	File m_repoDir = new File("transient/usecase/synchronize/repo");
! 	File m_targetDir = new File("transient/usecase/synchronize/target");
! 	FileHelper m_fileHelper = new FileHelper();
  
! 	protected void setUp() {
! 		m_repoDir.mkdirs();
! 		m_fileHelper.setUp();
! 	}
  
! 	protected void tearDown() {
! 		m_fileHelper.tearDown();
! 	}
  
+ 	public void testMainScenario() throws Exception {
+ 		// Can't quite test main, cause defaults aren't suitable.
  
! 		// BPS - Currently several bugs that we have to work around
! 		// 1) Version comparision doesn't work unless we specify the full major.minor.point
! 		//    (ie if target is version 2.3 it compares equal with 2.3.1 )
! 		// 2) Don't know how to specify comparisons
! 		File targetFile =
! 			m_fileHelper.setupActualFile(m_targetDir, "cat-2.3.0.jar");
! 		File betterFile =
! 			m_fileHelper.setupActualFile(m_repoDir, "cat/jars/cat-2.3.1.jar");
! 		File resultFile =
! 			m_fileHelper.setupExpectedFile(m_targetDir, "cat-2.3.1.jar");
  
! 		//  1. User configures Ruper
! 		ResourceUpdaterIdentifier identifier =
! 			new ResourceUpdaterIdentifier("synchronizeTest");
! 		ResourceUpdater ruper =
! 			ResourceUpdater.getResourceUpdater(identifier, true);
  
! 		IRepository fileRepo =
! 			new Repository("test", m_repoDir.toURL().toString());
! 		RepositorySet repos = new RepositorySet();
! 		repos.addRepository(fileRepo);
  
! 		ruper.setDefaultRepositorySet(repos);
  
! 		FileUpdater updater = new FileUpdater(new FileAssistant(), ruper);
  
! 		//  2. User supplies file details and asks Ruper to synchronize it
! 		updater.updateFile(targetFile);
  
! 		//  3. Ruper examines file details to extract resource information
! 		//  4. Ruper queries repositories for resource
! 		//  5. Ruper compares result(s) of query with existing file.
! 		//  6. Ruper chooses best result and copies it to file location
! 		assertTrue("Result file exists", resultFile.exists());
! 		//  7. Ruper removes old copy of resource from file location
  
! 		// BPS - This don't work yet
! 		// assertFalse("Old file has been removed", targetFile.exists() );
  
! 		//  8. Ruper reports results to User
  
! 	}
  
! 	public static Test suite() {
! 		return new TestSuite(SynchronizeTests.class);
! 	}
  
! 	public static void main(String[] args) {
! 		junit.textui.TestRunner.run(suite());
! 	}
  }

Index: FileHelper.java
===================================================================
RCS file: /cvsroot/metamorphosis/ruper2/src/test/core/org/krysalis/ruper2/usecases/FileHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FileHelper.java	29 Sep 2003 18:09:25 -0000	1.1
--- FileHelper.java	10 Oct 2003 21:26:25 -0000	1.2
***************
*** 13,20 ****
   * @author Ben Sommerville
   */
! public class FileHelper {
  
      private List m_testFiles = new LinkedList();
- 
  
      public void setUp() {
--- 13,19 ----
   * @author Ben Sommerville
   */
! class FileHelper {
  
      private List m_testFiles = new LinkedList();
  
      public void setUp() {




-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.