Apache/archiva
1
0
Fork 0
mirror of https://github.com/apache/archiva.git synced 2025-03-07 00:49:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicated cleanup in tests

Browse Source
This commit is contained in:
Carlos Sanchez 2014-11-23 20:40:55 +01:00
parent 480825d72b
commit 1f42a01fb0
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java
View File

@ -70,7 +70,7 @@ public void setUp()
this.cmr = new CassandraMetadataRepository( factories, null, cassandraArchivaManager );
this.repository = this.cmr;
clearReposAndNamespace();
clearReposAndNamespace( cassandraArchivaManager );
}
/**
@ -109,11 +109,11 @@ public void clean_dependant_tables()
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(),

17
archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/RepositoriesNamespaceTest.java
View File

@ -61,14 +61,14 @@ public void setup()
{
cassandraArchivaManager.start();
}
clearReposAndNamespace();
CassandraMetadataRepositoryTest.clearReposAndNamespace( cassandraArchivaManager );
}
@After
public void shutdown()
throws Exception
{
clearReposAndNamespace();
CassandraMetadataRepositoryTest.clearReposAndNamespace( cassandraArchivaManager );
cassandraArchivaManager.shutdown();
}
@ -136,18 +136,7 @@ public void testMetadataRepo()
}
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" );
}
}