Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 3DB11200B9C for ; Thu, 1 Sep 2016 21:04:24 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 3C5F4160ACE; Thu, 1 Sep 2016 19:04:24 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5B4A3160ACF for ; Thu, 1 Sep 2016 21:04:23 +0200 (CEST) Received: (qmail 25046 invoked by uid 500); 1 Sep 2016 19:04:22 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 24823 invoked by uid 99); 1 Sep 2016 19:04:22 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Sep 2016 19:04:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E8553DFF8E; Thu, 1 Sep 2016 19:04:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Thu, 01 Sep 2016 19:04:26 -0000 Message-Id: In-Reply-To: <6d97e0a1cb7b4b91b5ea112a8adfab8d@git.apache.org> References: <6d97e0a1cb7b4b91b5ea112a8adfab8d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [06/28] accumulo git commit: ACCUMULO-4423 Simplify use of JUnit categories archived-at: Thu, 01 Sep 2016 19:04:24 -0000 ACCUMULO-4423 Simplify use of JUnit categories * Create surefire.groups, surefire.excludedGroups, failsafe.groups, and failsafe.excludedGroups to control categories, based on feedback from Maven developers about what to expect these property names to be in maven-surefire-plugin and maven-failsafe-plugin version 3.0 * Remove intermediate property names, which added unneeded level of property indirection (under assumption that we'll keep these categories stable over time, in order to keep the docs valid) * Remove unneeded profiles * Update documentation Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3bf08454 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3bf08454 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3bf08454 Branch: refs/heads/master Commit: 3bf084545a6b2ffd693f1323e8e72ea13478455c Parents: dd5bd0c Author: Christopher Tubbs Authored: Wed Aug 31 18:04:32 2016 -0400 Committer: Christopher Tubbs Committed: Wed Aug 31 19:44:04 2016 -0400 ---------------------------------------------------------------------- TESTING.md | 7 ++++--- maven-plugin/src/it/plugin-test/pom.xml | 29 +++++++++++---------------- pom.xml | 30 ++++++++-------------------- 3 files changed, 24 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3bf08454/TESTING.md ---------------------------------------------------------------------- diff --git a/TESTING.md b/TESTING.md index 125110b..4d37055 100644 --- a/TESTING.md +++ b/TESTING.md @@ -64,8 +64,8 @@ stopping the MiniAccumuloCluster. While this is a surefire way to isolate tests increases the actual runtime of the test by, on average, 10x. Some times the tests require the use of MAC because the test is being destructive or some special environment setup (e.g. Kerberos). -By default, these tests are run during the `integration-test` lifecycle phase using `mvn verify`. These tests can -also be run at the `test` lifecycle phase using `mvn package -Pminicluster-unit-tests`. +These tests will run by default during the `integration-test` lifecycle phase using `mvn verify`. +To execute only these tests, use `mvn verify -Dfailsafe.groups=org.apache.accumulo.test.categories.MiniClusterOnlyTest` ### Standalone Cluster (`AnyClusterTest`) @@ -79,7 +79,8 @@ Use of a standalone cluster can be enabled using system properties on the Maven providing a Java properties file on the Maven command line. The use of a properties file is recommended since it is typically a fixed file per standalone cluster you want to run the tests against. -These tests will always run during the `integration-test` lifecycle phase using `mvn verify`. +These tests will run by default during the `integration-test` lifecycle phase using `mvn verify`. +To execute only these tests, use `mvn verify -Dfailsafe.groups=org.apache.accumulo.test.categories.AnyClusterTest` ## Configuration for Standalone clusters http://git-wip-us.apache.org/repos/asf/accumulo/blob/3bf08454/maven-plugin/src/it/plugin-test/pom.xml ---------------------------------------------------------------------- diff --git a/maven-plugin/src/it/plugin-test/pom.xml b/maven-plugin/src/it/plugin-test/pom.xml index 3b0b7f7..020e170 100644 --- a/maven-plugin/src/it/plugin-test/pom.xml +++ b/maven-plugin/src/it/plugin-test/pom.xml @@ -94,25 +94,20 @@ + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + + + + - org.apache.maven.plugins - maven-failsafe-plugin - - - run-integration-tests - - integration-test - verify - - - - - - - - - @project.groupId@ @project.artifactId@ @project.version@ http://git-wip-us.apache.org/repos/asf/accumulo/blob/3bf08454/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d6393d2..cc2b9e0 100644 --- a/pom.xml +++ b/pom.xml @@ -115,10 +115,6 @@ https://builds.apache.org/view/A-D/view/Accumulo/ - org.apache.accumulo.test.categories.AnyClusterTest - - ${accumulo.anyClusterTests},${accumulo.miniclusterTests} - org.apache.accumulo.test.categories.MiniClusterOnlyTest ${project.version} posix @@ -128,6 +124,8 @@ ${project.parent.basedir}/contrib/Eclipse-Accumulo-Codestyle.xml + + 3.0.3 @@ -151,7 +149,9 @@ 1.7.5 source-release-tar + false + 0.9.1 @@ -685,6 +685,8 @@ org.apache.maven.plugins maven-surefire-plugin + ${surefire.excludedGroups} + ${surefire.groups} ${project.build.directory} @@ -695,6 +697,8 @@ org.apache.maven.plugins maven-failsafe-plugin + ${failsafe.excludedGroups} + ${failsafe.groups} ${project.build.directory} @@ -1010,10 +1014,6 @@ integration-test verify - - ${accumulo.it.excludedGroups} - ${accumulo.it.groups} - @@ -1407,19 +1407,5 @@ - - only-minicluster-tests - - ${accumulo.anyClusterTests} - ${accumulo.miniclusterTests} - - - - standalone-capable-tests - - ${accumulo.miniclusterTests} - ${accumulo.anyClusterTests} - -