Return-Path: X-Original-To: apmail-archiva-commits-archive@www.apache.org Delivered-To: apmail-archiva-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B695A107AE for ; Wed, 26 Mar 2014 06:30:23 +0000 (UTC) Received: (qmail 75897 invoked by uid 500); 26 Mar 2014 06:30:23 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 75836 invoked by uid 500); 26 Mar 2014 06:30:18 -0000 Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@archiva.apache.org Delivered-To: mailing list commits@archiva.apache.org Received: (qmail 75829 invoked by uid 99); 26 Mar 2014 06:30:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Mar 2014 06:30:17 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Mar 2014 06:30:16 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 41F9723889D5; Wed, 26 Mar 2014 06:29:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1581705 - in /archiva/trunk/archiva-modules: metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/ plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/ plugins/me... Date: Wed, 26 Mar 2014 06:29:56 -0000 To: commits@archiva.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140326062956.41F9723889D5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olamy Date: Wed Mar 26 06:29:55 2014 New Revision: 1581705 URL: http://svn.apache.org/r1581705 Log: add a test to ensure dependant are cleanup up Modified: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java Modified: archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java?rev=1581705&r1=1581704&r2=1581705&view=diff ============================================================================== --- archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java (original) +++ archiva/trunk/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java Wed Mar 26 06:29:55 2014 @@ -67,11 +67,11 @@ public abstract class AbstractMetadataRe protected static final String TEST_REPO_ID = "test"; - private static final String TEST_PROJECT = "projectId"; + protected static final String TEST_PROJECT = "projectId"; - private static final String TEST_NAMESPACE = "namespace"; + protected static final String TEST_NAMESPACE = "namespace"; - private static final String TEST_PROJECT_VERSION = "1.0"; + protected static final String TEST_PROJECT_VERSION = "1.0"; private static final String TEST_PROJECT_VERSION_2_0 = "2.0"; Modified: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java?rev=1581705&r1=1581704&r2=1581705&view=diff ============================================================================== --- archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java (original) +++ archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepository.java Wed Mar 26 06:29:55 2014 @@ -1941,6 +1941,9 @@ public class CassandraMetadataRepository for ( Row row : result.get().getList() ) { this.projectVersionMetadataTemplate.deleteRow( row.getKey() ); + removeMailingList( row.getKey() ); + removeLicenses( row.getKey() ); + removeDependencies( row.getKey() ); } RangeSlicesQuery query = HFactory // @@ -1958,8 +1961,8 @@ public class CassandraMetadataRepository for ( Row row : result.get() ) { this.artifactMetadataTemplate.deleteRow( row.getKey() ); - } + } } @Override Modified: archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java?rev=1581705&r1=1581704&r2=1581705&view=diff ============================================================================== --- archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java (original) +++ archiva/trunk/archiva-modules/plugins/metadata-store-cassandra/src/test/java/org/apache/archiva/metadata/repository/cassandra/CassandraMetadataRepositoryTest.java Wed Mar 26 06:29:55 2014 @@ -19,19 +19,25 @@ package org.apache.archiva.metadata.repo * under the License. */ +import org.apache.archiva.metadata.model.MailingList; import org.apache.archiva.metadata.model.MetadataFacetFactory; import org.apache.archiva.metadata.repository.AbstractMetadataRepositoryTest; +import org.apache.archiva.metadata.repository.cassandra.model.ProjectVersionMetadataModel; import org.apache.commons.io.FileUtils; import org.junit.After; import org.junit.Before; +import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.inject.Inject; import javax.inject.Named; import java.io.File; +import java.util.List; import java.util.Map; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Olivier Lamy */ @@ -66,6 +72,37 @@ public class CassandraMetadataRepository clearReposAndNamespace(); } + /** + * ensure all dependant tables are cleaned up (mailinglist, license, dependencies) + * + * @throws Exception + */ + @Test + public void clean_dependant_tables() + throws Exception + { + + super.testUpdateProjectVersionMetadataWithAllElements(); + + String key = new ProjectVersionMetadataModel.KeyBuilder().withRepository( TEST_REPO_ID ) // + .withNamespace( TEST_NAMESPACE ) // + .withProjectId( TEST_PROJECT ) // + .withProjectVersion( TEST_PROJECT_VERSION ) // + .withId( TEST_PROJECT_VERSION ) // + .build(); + + this.cmr.removeProjectVersion( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION ); + + assertThat( + repository.getProjectVersion( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION ) ).isNull(); + + assertThat( cmr.getMailingLists( key ) ).isNotNull().isEmpty(); + + assertThat( cmr.getLicenses( key ) ).isNotNull().isEmpty(); + + assertThat( cmr.getDependencies( key ) ).isNotNull().isEmpty(); + } + @After public void shutdown()