svn commit: r1484798 - in /archiva/sandbox/trunk/metadata-store-cassandra/src: main/java/org/apache/archiva/metadata/repository/cassandra/ test/java/org/apache/archiva/metadata/repository/cassandra/

[olamy]

Author: olamy
Date: Tue May 21 13:27:03 2013
New Revision: 1484798

URL: http://svn.apache.org/r1484798
Log:
cleanup datas between tests

Modified:
    
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
    
archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
    
archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java

Modified: 
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
URL: 
http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java?rev=1484798&r1=1484797&r2=1484798&view=diff
==============================================================================
--- 
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
 (original)
+++ 
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java
 Tue May 21 13:27:03 2013
@@ -172,6 +172,16 @@ public class CassandraMetadataRepository
         this.namespaceEntityManager = namespaceEntityManager;
     }
 
+    public EntityManager<Project, String> getProjectEntityManager()
+    {
+        return projectEntityManager;
+    }
+
+    public void setProjectEntityManager( EntityManager<Project, String> 
projectEntityManager )
+    {
+        this.projectEntityManager = projectEntityManager;
+    }
+
     @Override
     public void updateNamespace( String repositoryId, String namespaceId )
         throws MetadataRepositoryException

Modified: 
archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
URL: 
http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java?rev=1484798&r1=1484797&r2=1484798&view=diff
==============================================================================
--- 
archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
 (original)
+++ 
archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
 Tue May 21 13:27:03 2013
@@ -20,6 +20,9 @@ package org.apache.archiva.metadata.repo
  */
 
 import org.apache.archiva.metadata.repository.AbstractMetadataRepositoryTest;
+import org.apache.archiva.metadata.repository.cassandra.model.Namespace;
+import org.apache.archiva.metadata.repository.cassandra.model.Project;
+import org.apache.archiva.metadata.repository.cassandra.model.Repository;
 import org.apache.commons.io.FileUtils;
 import org.junit.After;
 import org.junit.Before;
@@ -29,6 +32,7 @@ import org.slf4j.LoggerFactory;
 import javax.inject.Inject;
 import javax.inject.Named;
 import java.io.File;
+import java.util.List;
 
 /**
  * @author Olivier Lamy
@@ -39,9 +43,11 @@ public class CassandraMetadataRepository
     private Logger logger = LoggerFactory.getLogger( getClass() );
 
     @Inject
-    @Named( value = "archivaEntityManagerFactory#cassandra" )
+    @Named(value = "archivaEntityManagerFactory#cassandra")
     CassandraEntityManagerFactory cassandraEntityManagerFactory;
 
+    CassandraMetadataRepository cmr;
+
     @Before
     public void setUp()
         throws Exception
@@ -54,7 +60,8 @@ public class CassandraMetadataRepository
             FileUtils.deleteDirectory( directory );
         }
 
-        this.repository = new CassandraMetadataRepository( null, null, 
cassandraEntityManagerFactory.getKeyspace() );
+        this.cmr = new CassandraMetadataRepository( null, null, 
cassandraEntityManagerFactory.getKeyspace() );
+        this.repository = this.cmr;
     }
 
 
@@ -65,4 +72,21 @@ public class CassandraMetadataRepository
         //cassandraEntityManagerFactory.getKeyspace().dr .dropKeyspace();
     }
 
+    protected void clearReposAndNamespace()
+        throws Exception
+    {
+        List<Project> projects = cmr.getProjectEntityManager().getAll();
+
+        cmr.getProjectEntityManager().remove( projects );
+
+        List<Namespace> namespaces = cmr.getNamespaceEntityManager().getAll();
+
+        cmr.getNamespaceEntityManager().remove( namespaces );
+
+        List<Repository> repositories = 
cmr.getRepositoryEntityManager().getAll();
+
+        cmr.getRepositoryEntityManager().remove( repositories );
+
+    }
+
 }

Modified: 
archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
URL: 
http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java?rev=1484798&r1=1484797&r2=1484798&view=diff
==============================================================================
--- 
archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
 (original)
+++ 
archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
 Tue May 21 13:27:03 2013
@@ -20,6 +20,7 @@ package org.apache.archiva.metadata.repo
  */
 
 import org.apache.archiva.metadata.repository.cassandra.model.Namespace;
+import org.apache.archiva.metadata.repository.cassandra.model.Project;
 import org.apache.archiva.metadata.repository.cassandra.model.Repository;
 import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
 import org.fest.assertions.api.Assertions;
@@ -33,19 +34,20 @@ import org.springframework.test.context.
 
 import javax.inject.Inject;
 import javax.inject.Named;
+import java.util.List;
 
 /**
  * @author Olivier Lamy
  */
-@RunWith( ArchivaSpringJUnit4ClassRunner.class )
-@ContextConfiguration( locations = { 
"classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
+@RunWith(ArchivaSpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { "classpath*:/META-INF/spring-context.xml", 
"classpath*:/spring-context.xml" })
 public class RepositoriesNamespaceTest
 {
 
     private Logger logger = LoggerFactory.getLogger( getClass() );
 
     @Inject
-    @Named( value = "archivaEntityManagerFactory#cassandra" )
+    @Named(value = "archivaEntityManagerFactory#cassandra")
     CassandraEntityManagerFactory cassandraEntityManagerFactory;
 
 
@@ -57,6 +59,7 @@ public class RepositoriesNamespaceTest
     {
 
         cmr = new CassandraMetadataRepository( null, null, 
cassandraEntityManagerFactory.getKeyspace() );
+        clearReposAndNamespace();
 
     }
 
@@ -64,7 +67,7 @@ public class RepositoriesNamespaceTest
     public void shutdown()
         throws Exception
     {
-
+        clearReposAndNamespace();
     }
 
 
@@ -114,9 +117,17 @@ public class RepositoriesNamespaceTest
     protected void clearReposAndNamespace()
         throws Exception
     {
-        if ( true )
-        {
-            return;
-        }
+        List<Project> projects = cmr.getProjectEntityManager().getAll();
+
+        cmr.getProjectEntityManager().remove( projects );
+
+        List<Namespace> namespaces = cmr.getNamespaceEntityManager().getAll();
+
+        cmr.getNamespaceEntityManager().remove( namespaces );
+
+        List<Repository> repositories = 
cmr.getRepositoryEntityManager().getAll();
+
+        cmr.getRepositoryEntityManager().remove( repositories );
+
     }
 }