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 A1B06200B80 for ; Wed, 14 Sep 2016 15:00:37 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id A04D5160ABA; Wed, 14 Sep 2016 13:00:37 +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 BD4CB160AB4 for ; Wed, 14 Sep 2016 15:00:36 +0200 (CEST) Received: (qmail 12858 invoked by uid 500); 14 Sep 2016 13:00:36 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 12848 invoked by uid 99); 14 Sep 2016 13:00:36 -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; Wed, 14 Sep 2016 13:00:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id ACE59E0159; Wed, 14 Sep 2016 13:00:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Message-Id: <95a6dcce757b4984b62b2da8d2b89ebf@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: Minors. Date: Wed, 14 Sep 2016 13:00:35 +0000 (UTC) archived-at: Wed, 14 Sep 2016 13:00:37 -0000 Repository: ignite Updated Branches: refs/heads/ignite-3661 36c817038 -> 8569b3efb Minors. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8569b3ef Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8569b3ef Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8569b3ef Branch: refs/heads/ignite-3661 Commit: 8569b3efbcabc5ecbfebe1a7e9faf604296f58e8 Parents: 36c8170 Author: vozerov-gridgain Authored: Wed Sep 14 16:00:26 2016 +0300 Committer: vozerov-gridgain Committed: Wed Sep 14 16:00:26 2016 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/testframework/IgniteTestSuite.java | 10 +++++----- .../java/org/apache/ignite/testsuites/IgniteIgnore.java | 6 +++--- .../ignite/internal/websession/WebSessionSelfTest.java | 2 +- .../websession/WebSessionTransactionalSelfTest.java | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8569b3ef/modules/core/src/test/java/org/apache/ignite/testframework/IgniteTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/IgniteTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testframework/IgniteTestSuite.java index 73610c2..4153600 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/IgniteTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/IgniteTestSuite.java @@ -168,19 +168,19 @@ public class IgniteTestSuite extends TestSuite { if (hasIgnore) { IgniteIgnore ignore = m.getAnnotation(IgniteIgnore.class); - String ticket = ignore.jira(); + String reason = ignore.value(); - if (F.isEmpty(ticket)) - throw new IllegalArgumentException("JIRA ticket is not set for ignored test [class=" + + if (F.isEmpty(reason)) + throw new IllegalArgumentException("Reason is not set for ignored test [class=" + theClass.getName() + ", method=" + name + ']'); Test test = createTest(theClass, name); if (ignore.forceFailure()) { if (test instanceof GridAbstractTest) - ((GridAbstractTest)test).forceFailure(ignore.jira()); + ((GridAbstractTest)test).forceFailure(ignore.value()); else - test = new ForcedFailure(name, ignore.jira()); + test = new ForcedFailure(name, ignore.value()); } addTest(test); http://git-wip-us.apache.org/repos/asf/ignite/blob/8569b3ef/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgnore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgnore.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgnore.java index b98202e..05af2a2 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgnore.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgnore.java @@ -29,12 +29,12 @@ import java.lang.annotation.Target; @Target({ElementType.METHOD, ElementType.TYPE}) public @interface IgniteIgnore { /** - * JIRA ticket URL for this failure. + * Reason for ignore (usually link to JIRA ticket). */ - String jira(); + String value(); /** - * Whether tests should be failed immediately. Useful when test hangs or consumes a lot of time. + * Whether test should be failed immediately. Useful when test hangs or consumes a lot of time. */ boolean forceFailure() default false; } http://git-wip-us.apache.org/repos/asf/ignite/blob/8569b3ef/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java index 1c3d23c..5138e3a 100644 --- a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java +++ b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java @@ -89,7 +89,7 @@ public class WebSessionSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ - @IgniteIgnore(jira = "https://issues.apache.org/jira/browse/IGNITE-3663") + @IgniteIgnore("https://issues.apache.org/jira/browse/IGNITE-3663") public void testSessionRenewalDuringLogin() throws Exception { testSessionRenewalDuringLogin("/modules/core/src/test/config/websession/example-cache.xml"); } http://git-wip-us.apache.org/repos/asf/ignite/blob/8569b3ef/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionTransactionalSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionTransactionalSelfTest.java b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionTransactionalSelfTest.java index 80fa445..4cc1a63 100644 --- a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionTransactionalSelfTest.java +++ b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionTransactionalSelfTest.java @@ -29,19 +29,19 @@ public class WebSessionTransactionalSelfTest extends WebSessionSelfTest { } /** {@inheritDoc} */ - @IgniteIgnore(jira = "https://issues.apache.org/jira/browse/IGNITE-810", forceFailure = true) + @IgniteIgnore(value = "https://issues.apache.org/jira/browse/IGNITE-810", forceFailure = true) @Override public void testRestarts() throws Exception { // No-op. } /** {@inheritDoc} */ - @IgniteIgnore(jira = "https://issues.apache.org/jira/browse/IGNITE-810", forceFailure = true) + @IgniteIgnore(value = "https://issues.apache.org/jira/browse/IGNITE-810", forceFailure = true) @Override public void testInvalidatedSession() throws Exception { // No-op. } /** {@inheritDoc} */ - @IgniteIgnore(jira = "https://issues.apache.org/jira/browse/IGNITE-810", forceFailure = true) + @IgniteIgnore(value = "https://issues.apache.org/jira/browse/IGNITE-810", forceFailure = true) @Override public void testClientReconnectRequest() throws Exception { // No-op. }