* Adding boilerplate for DatabaseUpdater.

* Splitting ArchivaDAO into sub-DAO's to aide in maintenance.



git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/branches/archiva-jpox-database-refactor@526822 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 100 insertions, 57 deletions

diff --git a/archiva-database/src/test/java/org/apache/maven/archiva/database/jdo/JdoArchivaDAOTest.java b/archiva-database/src/test/java/org/apache/maven/archiva/database/jdo/JdoArchivaDAOTest.java
index 5697afd11..a97492c24 100644
--- a/archiva-database/src/test/java/org/apache/maven/archiva/database/jdo/JdoArchivaDAOTest.java
+++ b/archiva-database/src/test/java/org/apache/maven/archiva/database/jdo/JdoArchivaDAOTest.java
@@ -20,12 +20,6 @@ package org.apache.maven.archiva.database.jdo;
  */
 
 import org.apache.maven.archiva.database.AbstractArchivaDatabaseTestCase;
-import org.apache.maven.archiva.database.ArchivaDatabaseException;
-import org.apache.maven.archiva.model.ArchivaRepositoryModel;
-
-import java.util.List;
-
-import javax.jdo.JDOHelper;
 
 /**
  * JdoArchivaDAOTest 
@@ -33,58 +27,12 @@ import javax.jdo.JDOHelper;
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
  * @version $Id$
  */
-public class JdoArchivaDAOTest extends AbstractArchivaDatabaseTestCase
+public class JdoArchivaDAOTest
+    extends AbstractArchivaDatabaseTestCase
 {
-    public void testRepositoryCRUD() throws ArchivaDatabaseException
+    public void testSubDAOs()
     {
-        // Create it
-        ArchivaRepositoryModel repo = dao.createRepository( "testRepo", "http://localhost:8080/repository/foo" );
-        assertNotNull( repo );
-
-        // Set some mandatory values
-        repo.setName( "The Test Repository." );
-        repo.setCreationSource( "Test Case" );
-        repo.setLayoutName( "default" );
-
-        // Save it. 
-        ArchivaRepositoryModel repoSaved = dao.saveRepository( repo );
-        assertNotNull( repoSaved );
-        assertEquals( "testRepo", JDOHelper.getObjectId( repoSaved ).toString() );
-
-        // Test that something has been saved.
-        List repos = dao.getRepositories();
-        assertNotNull( repos );
-        assertEquals( 1, repos.size() );
-
-        // Test that retreived object is what we expect.
-        ArchivaRepositoryModel firstRepo = (ArchivaRepositoryModel) repos.get( 0 );
-        assertNotNull( firstRepo );
-        assertEquals( "testRepo", repo.getId() );
-        assertEquals( "The Test Repository.", repo.getName() );
-        assertEquals( "Test Case", repo.getCreationSource() );
-        assertEquals( "default", repo.getLayoutName() );
-
-        // Change value and save.
-        repoSaved.setName( "Saved Again" );
-        dao.saveRepository( repoSaved );
-
-        // Test that only 1 object is saved.
-        assertEquals( 1, dao.getRepositories().size() );
-
-        // Get the specific repo.
-        ArchivaRepositoryModel actualRepo = dao.getRepository( "testRepo" );
-        assertNotNull( actualRepo );
-
-        // Test expected values.
-        assertEquals( "testRepo", actualRepo.getId() );
-        assertEquals( "http://localhost:8080/repository/foo", actualRepo.getUrl() );
-        assertEquals( "Saved Again", actualRepo.getName() );
-
-        // Test that only 1 object is saved.
-        assertEquals( 1, dao.getRepositories().size() );
-
-        // Delete object.
-        dao.deleteRepository( actualRepo );
-        assertEquals( 0, dao.getRepositories().size() );
+        assertNotNull( "Artifact DAO", dao.getArtifactDAO() );
+        assertNotNull( "Repository DAO", dao.getRepositoryDAO() );
     }
 }
diff --git a/archiva-database/src/test/java/org/apache/maven/archiva/database/jdo/JdoRepositoryDAOTest.java b/archiva-database/src/test/java/org/apache/maven/archiva/database/jdo/JdoRepositoryDAOTest.java
new file mode 100644
index 000000000..ed18c2560
--- /dev/null
+++ b/archiva-database/src/test/java/org/apache/maven/archiva/database/jdo/JdoRepositoryDAOTest.java
@@ -0,0 +1,95 @@
+package org.apache.maven.archiva.database.jdo;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.archiva.database.AbstractArchivaDatabaseTestCase;
+import org.apache.maven.archiva.database.ArchivaDatabaseException;
+import org.apache.maven.archiva.database.RepositoryDAO;
+import org.apache.maven.archiva.model.ArchivaRepositoryModel;
+
+import java.util.List;
+
+import javax.jdo.JDOHelper;
+
+/**
+ * JdoRepositoryDAOTest 
+ *
+ * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @version $Id$
+ */
+public class JdoRepositoryDAOTest
+    extends AbstractArchivaDatabaseTestCase
+{
+    public void testRepositoryCRUD()
+        throws ArchivaDatabaseException
+    {
+        RepositoryDAO repoDao = dao.getRepositoryDAO();
+        
+        // Create it
+        ArchivaRepositoryModel repo = repoDao.createRepository( "testRepo", "http://localhost:8080/repository/foo" );
+        assertNotNull( repo );
+
+        // Set some mandatory values
+        repo.setName( "The Test Repository." );
+        repo.setCreationSource( "Test Case" );
+        repo.setLayoutName( "default" );
+
+        // Save it. 
+        ArchivaRepositoryModel repoSaved = repoDao.saveRepository( repo );
+        assertNotNull( repoSaved );
+        assertEquals( "testRepo", JDOHelper.getObjectId( repoSaved ).toString() );
+
+        // Test that something has been saved.
+        List repos = repoDao.getRepositories();
+        assertNotNull( repos );
+        assertEquals( 1, repos.size() );
+
+        // Test that retreived object is what we expect.
+        ArchivaRepositoryModel firstRepo = (ArchivaRepositoryModel) repos.get( 0 );
+        assertNotNull( firstRepo );
+        assertEquals( "testRepo", repo.getId() );
+        assertEquals( "The Test Repository.", repo.getName() );
+        assertEquals( "Test Case", repo.getCreationSource() );
+        assertEquals( "default", repo.getLayoutName() );
+
+        // Change value and save.
+        repoSaved.setName( "Saved Again" );
+        repoDao.saveRepository( repoSaved );
+
+        // Test that only 1 object is saved.
+        assertEquals( 1, repoDao.getRepositories().size() );
+
+        // Get the specific repo.
+        ArchivaRepositoryModel actualRepo = repoDao.getRepository( "testRepo" );
+        assertNotNull( actualRepo );
+
+        // Test expected values.
+        assertEquals( "testRepo", actualRepo.getId() );
+        assertEquals( "http://localhost:8080/repository/foo", actualRepo.getUrl() );
+        assertEquals( "Saved Again", actualRepo.getName() );
+
+        // Test that only 1 object is saved.
+        assertEquals( 1, repoDao.getRepositories().size() );
+
+        // Delete object.
+        repoDao.deleteRepository( actualRepo );
+        assertEquals( 0, repoDao.getRepositories().size() );
+    }
+}