You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ca...@apache.org on 2014/11/23 21:45:43 UTC
archiva git commit: Remove duplicated cleanup in tests
Repository: archiva
Updated Branches:
refs/heads/master 480825d72 -> 1f42a01fb
Remove duplicated cleanup in tests
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/1f42a01f
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/1f42a01f
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/1f42a01f
Branch: refs/heads/master
Commit: 1f42a01fb0238c1fd7fabcb485bb8adf475f6e2c
Parents: 480825d
Author: Carlos Sanchez <ca...@apache.org>
Authored: Sun Nov 23 20:40:55 2014 +0100
Committer: Carlos Sanchez <ca...@apache.org>
Committed: Sun Nov 23 21:15:31 2014 +0100
----------------------------------------------------------------------
.../cassandra/CassandraMetadataRepositoryTest.java | 6 +++---
.../cassandra/RepositoriesNamespaceTest.java | 17 +++--------------
2 files changed, 6 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/1f42a01f/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java b/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
index 57bd33d..c26a660 100644
--- a/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
+++ b/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
@@ -70,7 +70,7 @@ public class CassandraMetadataRepositoryTest
this.cmr = new CassandraMetadataRepository( factories, null, cassandraArchivaManager );
this.repository = this.cmr;
- clearReposAndNamespace();
+ clearReposAndNamespace( cassandraArchivaManager );
}
/**
@@ -109,11 +109,11 @@ public class CassandraMetadataRepositoryTest
public void shutdown()
throws Exception
{
- clearReposAndNamespace();
+ clearReposAndNamespace( cassandraArchivaManager );
super.tearDown();
}
- protected void clearReposAndNamespace()
+ static void clearReposAndNamespace( CassandraArchivaManager cassandraArchivaManager )
throws Exception
{
cassandraArchivaManager.getCluster().truncate( cassandraArchivaManager.getKeyspace().getKeyspaceName(),
http://git-wip-us.apache.org/repos/asf/archiva/blob/1f42a01f/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java b/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
index 547d3e8..3a999c0 100644
--- a/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
+++ b/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
@@ -61,14 +61,14 @@ public class RepositoriesNamespaceTest
{
cassandraArchivaManager.start();
}
- clearReposAndNamespace();
+ CassandraMetadataRepositoryTest.clearReposAndNamespace( cassandraArchivaManager );
}
@After
public void shutdown()
throws Exception
{
- clearReposAndNamespace();
+ CassandraMetadataRepositoryTest.clearReposAndNamespace( cassandraArchivaManager );
cassandraArchivaManager.shutdown();
}
@@ -136,18 +136,7 @@ public class RepositoriesNamespaceTest
}
finally
{
- clearReposAndNamespace();
+ CassandraMetadataRepositoryTest.clearReposAndNamespace( cassandraArchivaManager );
}
}
-
- protected void clearReposAndNamespace()
- throws Exception
- {
- cassandraArchivaManager.getCluster().truncate( cassandraArchivaManager.getKeyspace().getKeyspaceName(),
- "project" );
- cassandraArchivaManager.getCluster().truncate( cassandraArchivaManager.getKeyspace().getKeyspaceName(),
- "namespace" );
- cassandraArchivaManager.getCluster().truncate( cassandraArchivaManager.getKeyspace().getKeyspaceName(),
- "repository" );
- }
}