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 B302E200B87 for ; Sun, 4 Sep 2016 16:25:32 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B1B5D160AA9; Sun, 4 Sep 2016 14:25:32 +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 B8766160AD2 for ; Sun, 4 Sep 2016 16:25:31 +0200 (CEST) Received: (qmail 6677 invoked by uid 500); 4 Sep 2016 14:25:30 -0000 Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ant.apache.org Delivered-To: mailing list notifications@ant.apache.org Received: (qmail 6322 invoked by uid 99); 4 Sep 2016 14:25:30 -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; Sun, 04 Sep 2016 14:25:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 97270E3813; Sun, 4 Sep 2016 14:25:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bodewig@apache.org To: notifications@ant.apache.org Date: Sun, 04 Sep 2016 14:25:32 -0000 Message-Id: In-Reply-To: <625ca86dc9694b5fa03b15ece766cc4f@git.apache.org> References: <625ca86dc9694b5fa03b15ece766cc4f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/9] ant git commit: whitespace archived-at: Sun, 04 Sep 2016 14:25:32 -0000 whitespace Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/bdba0f5c Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/bdba0f5c Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/bdba0f5c Branch: refs/heads/master Commit: bdba0f5c1f1647d8694fc95cbcf4c6457699ac0c Parents: e290fd7 Author: Stefan Bodewig Authored: Sun Sep 4 12:05:58 2016 +0200 Committer: Stefan Bodewig Committed: Sun Sep 4 12:05:58 2016 +0200 ---------------------------------------------------------------------- .../optional/junit/JUnitReportTest.java | 26 ++++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/bdba0f5c/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitReportTest.java ---------------------------------------------------------------------- diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitReportTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitReportTest.java index c5b6feb..1551a5b 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitReportTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitReportTest.java @@ -40,11 +40,11 @@ import org.junit.Test; * */ public class JUnitReportTest { - - @Rule - public BuildFileRule buildRule = new BuildFileRule(); - @Before + @Rule + public BuildFileRule buildRule = new BuildFileRule(); + + @Before public void setUp() { buildRule.configureProject("src/etc/testcases/taskdefs/optional/junitreport.xml"); } @@ -54,11 +54,11 @@ public class JUnitReportTest { * output is selected via the default. * Needs reports1 task from junitreport.xml. */ - @Test + @Test public void testNoFileJUnitNoFrames() { buildRule.executeTarget("reports1"); assertFalse("No file junit-noframes.html expected", (new File(System.getProperty("root"), "src/etc/testcases/taskdefs/optional/junitreport/test/html/junit-noframes.html").exists())); - + } public void assertIndexCreated() { @@ -71,23 +71,23 @@ public class JUnitReportTest { @Test public void testEmptyFile() throws Exception { - buildRule.executeTarget("testEmptyFile"); + buildRule.executeTarget("testEmptyFile"); assertIndexCreated(); - assertContains("Required text not found in log", XMLResultAggregator.WARNING_EMPTY_FILE, buildRule.getLog()); + assertContains("Required text not found in log", XMLResultAggregator.WARNING_EMPTY_FILE, buildRule.getLog()); } @Test public void testIncompleteFile() throws Exception { buildRule.executeTarget("testIncompleteFile"); assertIndexCreated(); - assertContains("Required text not found in log", XMLResultAggregator.WARNING_IS_POSSIBLY_CORRUPTED, buildRule.getLog()); + assertContains("Required text not found in log", XMLResultAggregator.WARNING_IS_POSSIBLY_CORRUPTED, buildRule.getLog()); } - + @Test public void testWrongElement() throws Exception { buildRule.executeTarget("testWrongElement"); assertIndexCreated(); - assertContains("Required text not found in log", XMLResultAggregator.WARNING_INVALID_ROOT_ELEMENT, buildRule.getLog()); + assertContains("Required text not found in log", XMLResultAggregator.WARNING_INVALID_ROOT_ELEMENT, buildRule.getLog()); } // Bugzilla Report 34963 @@ -196,8 +196,8 @@ public class JUnitReportTest { @Test public void testWithParams() throws Exception { - buildRule.executeTarget("testWithParams"); - assertContains("key1=value1,key2=value2", buildRule.getLog()); + buildRule.executeTarget("testWithParams"); + assertContains("key1=value1,key2=value2", buildRule.getLog()); File reportFile = new File(buildRule.getOutputDir(), "html/index.html"); // tests one the file object assertTrue("No index.html present. Not generated?", reportFile.exists() );