svn commit: r527676 - in /maven/archiva/branches/archiva-jpox-database-refactor/archiva-database/src: main/java/org/apache/maven/archiva/database/jdo/JdoRepositoryDAO.java test/java/org/apache/maven/archiva/database/jdo/JdoRepositoryDAOTest.java

[jo...@apache.org]

Author: joakime
Date: Wed Apr 11 14:13:53 2007
New Revision: 527676

URL: http://svn.apache.org/viewvc?view=rev&rev=527676
Log:
Fixing RepositoryDAO and tests.

Modified:
    maven/archiva/branches/archiva-jpox-database-refactor/archiva-database/src/main/java/org/apache/maven/archiva/database/jdo/JdoRepositoryDAO.java
    maven/archiva/branches/archiva-jpox-database-refactor/archiva-database/src/test/java/org/apache/maven/archiva/database/jdo/JdoRepositoryDAOTest.java

Modified: maven/archiva/branches/archiva-jpox-database-refactor/archiva-database/src/main/java/org/apache/maven/archiva/database/jdo/JdoRepositoryDAO.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-database/src/main/java/org/apache/maven/archiva/database/jdo/JdoRepositoryDAO.java?view=diff&rev=527676&r1=527675&r2=527676
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-database/src/main/java/org/apache/maven/archiva/database/jdo/JdoRepositoryDAO.java (original)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-database/src/main/java/org/apache/maven/archiva/database/jdo/JdoRepositoryDAO.java Wed Apr 11 14:13:53 2007
@@ -67,7 +67,7 @@
     public List getRepositories()
         throws ObjectNotFoundException, ArchivaDatabaseException
     {
-        return jdo.getAllObjects( ArchivaRepositoryModel.class );
+        return queryRepositories( null );
     }
 
     public ArchivaRepository getRepository( String id )

Modified: maven/archiva/branches/archiva-jpox-database-refactor/archiva-database/src/test/java/org/apache/maven/archiva/database/jdo/JdoRepositoryDAOTest.java
URL: http://svn.apache.org/viewvc/maven/archiva/branches/archiva-jpox-database-refactor/archiva-database/src/test/java/org/apache/maven/archiva/database/jdo/JdoRepositoryDAOTest.java?view=diff&rev=527676&r1=527675&r2=527676
==============================================================================
--- maven/archiva/branches/archiva-jpox-database-refactor/archiva-database/src/test/java/org/apache/maven/archiva/database/jdo/JdoRepositoryDAOTest.java (original)
+++ maven/archiva/branches/archiva-jpox-database-refactor/archiva-database/src/test/java/org/apache/maven/archiva/database/jdo/JdoRepositoryDAOTest.java Wed Apr 11 14:13:53 2007
@@ -54,7 +54,8 @@
         // Save it. 
         ArchivaRepository repoSaved = repoDao.saveRepository( repo );
         assertNotNull( repoSaved );
-        assertEquals( "testRepo", JDOHelper.getObjectId( repoSaved ).toString() );
+        assertNotNull( repoSaved.getModel() );
+        assertEquals( "testRepo", JDOHelper.getObjectId( repoSaved.getModel() ).toString() );
 
         // Test that something has been saved.
         List repos = repoDao.getRepositories();
@@ -65,7 +66,7 @@
         ArchivaRepository firstRepo = (ArchivaRepository) repos.get( 0 );
         assertNotNull( firstRepo );
         assertEquals( "testRepo", repo.getId() );
-        assertEquals( "The Test Repository.", repo.getModel().getName() );
+        assertEquals( "Test Repository", repo.getModel().getName() );
         assertEquals( "Test Case", repo.getModel().getCreationSource() );
         assertEquals( "default", repo.getModel().getLayoutName() );
 
@@ -82,7 +83,7 @@
 
         // Test expected values.
         assertEquals( "testRepo", actualRepo.getId() );
-        assertEquals( "http://localhost:8080/repository/foo", actualRepo.getUrl() );
+        assertEquals( "http://localhost:8080/repository/foo", actualRepo.getUrl().toString() );
         assertEquals( "Changed", actualRepo.getModel().getCreationSource() );
 
         // Test that only 1 object is saved.