You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/05/13 08:47:33 UTC
svn commit: r1481707 - in
/archiva/sandbox/trunk/metadata-store-cassandra/src:
main/java/org/apache/archiva/metadata/repository/jpa/CassandraMetadataRepository.java
test/java/org/apache/archiva/metadata/repository/jpa/RepositoriesNamespaceTest.java
Author: olamy
Date: Mon May 13 06:47:33 2013
New Revision: 1481707
URL: http://svn.apache.org/r1481707
Log:
improve test
Modified:
archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/jpa/CassandraMetadataRepository.java
archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/jpa/RepositoriesNamespaceTest.java
Modified: archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/jpa/CassandraMetadataRepository.java
URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/jpa/CassandraMetadataRepository.java?rev=1481707&r1=1481706&r2=1481707&view=diff
==============================================================================
--- archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/jpa/CassandraMetadataRepository.java (original)
+++ archiva/sandbox/trunk/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/jpa/CassandraMetadataRepository.java Mon May 13 06:47:33 2013
@@ -84,12 +84,14 @@ public class CassandraMetadataRepository
{
Namespace namespace = new Namespace( namespaceId );
+ namespace.setRepository( repository );
+ entityManager.persist( namespace );
// contains the namespace ?
if ( !repository.getNamespaces().contains( namespace ) )
{
- entityManager.persist( namespace );
repository.getNamespaces().add( namespace );
entityManager.merge( repository );
+ entityManager.persist( namespace );
}
}
}
Modified: archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/jpa/RepositoriesNamespaceTest.java
URL: http://svn.apache.org/viewvc/archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/jpa/RepositoriesNamespaceTest.java?rev=1481707&r1=1481706&r2=1481707&view=diff
==============================================================================
--- archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/jpa/RepositoriesNamespaceTest.java (original)
+++ archiva/sandbox/trunk/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/jpa/RepositoriesNamespaceTest.java Mon May 13 06:47:33 2013
@@ -25,6 +25,7 @@ import org.apache.archiva.test.utils.Arc
import org.fest.assertions.api.Assertions;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.slf4j.Logger;
@@ -73,7 +74,8 @@ public class RepositoriesNamespaceTest
//emf.close();
}
- @Test
+ //@Test
+ @Ignore
public void quicktest()
throws Exception
{
@@ -140,9 +142,9 @@ public class RepositoriesNamespaceTest
{
Repository r = null;
Namespace n = null;
+ CassandraMetadataRepository cmr = new CassandraMetadataRepository( null, null, em );
try
{
- CassandraMetadataRepository cmr = new CassandraMetadataRepository( null, null, em );
cmr.updateNamespace( "release", "org" );
@@ -155,11 +157,17 @@ public class RepositoriesNamespaceTest
Assertions.assertThat( n ).isNotNull();
Assertions.assertThat( n.getRepository() ).isNotNull();
+
+ cmr.updateNamespace( "release", "org.apache" );
+
+ r = em.find( Repository.class, "release" );
+
+ Assertions.assertThat( r ).isNotNull();
+ Assertions.assertThat( r.getNamespaces() ).isNotEmpty().hasSize( 2 );
+
}
finally
{
- //em.remove( r );
- //em.remove( n );
clearReposAndNamespace();
}
}