Return-Path: X-Original-To: apmail-groovy-commits-archive@minotaur.apache.org Delivered-To: apmail-groovy-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 84D2C18C3A for ; Mon, 15 Feb 2016 22:16:03 +0000 (UTC) Received: (qmail 78962 invoked by uid 500); 15 Feb 2016 22:16:03 -0000 Delivered-To: apmail-groovy-commits-archive@groovy.apache.org Received: (qmail 78927 invoked by uid 500); 15 Feb 2016 22:16:03 -0000 Mailing-List: contact commits-help@groovy.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@groovy.apache.org Delivered-To: mailing list commits@groovy.apache.org Received: (qmail 78917 invoked by uid 99); 15 Feb 2016 22:16:03 -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; Mon, 15 Feb 2016 22:16:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B2258E0534; Mon, 15 Feb 2016 22:16:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pascalschumacher@apache.org To: commits@groovy.apache.org Message-Id: <35b12b3a29cc471088e389273c5789a1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: groovy git commit: Skip CircularLanguageReferenceTest and PropertyUsageFromJavaTest when running on Travis with JDK 6, because these tests always fail with "java.lang.IllegalArgumentException: URI is not hierarchical" on there. Date: Mon, 15 Feb 2016 22:16:02 +0000 (UTC) Repository: groovy Updated Branches: refs/heads/master b7fa55903 -> 18b587b0b Skip CircularLanguageReferenceTest and PropertyUsageFromJavaTest when running on Travis with JDK 6, because these tests always fail with "java.lang.IllegalArgumentException: URI is not hierarchical" on there. Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/18b587b0 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/18b587b0 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/18b587b0 Branch: refs/heads/master Commit: 18b587b0bd4687f6944cc0235fea04469b47a4ef Parents: b7fa559 Author: pascalschumacher Authored: Mon Feb 15 23:15:50 2016 +0100 Committer: pascalschumacher Committed: Mon Feb 15 23:15:50 2016 +0100 ---------------------------------------------------------------------- .../CircularLanguageReferenceTest.groovy | 33 ++++++++++++++++++++ .../PropertyUsageFromJavaTest.groovy | 33 ++++++++++++++++++++ 2 files changed, 66 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/18b587b0/src/test/org/codehaus/groovy/tools/stubgenerator/CircularLanguageReferenceTest.groovy ---------------------------------------------------------------------- diff --git a/src/test/org/codehaus/groovy/tools/stubgenerator/CircularLanguageReferenceTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/CircularLanguageReferenceTest.groovy index 4450bed..1035cbd 100644 --- a/src/test/org/codehaus/groovy/tools/stubgenerator/CircularLanguageReferenceTest.groovy +++ b/src/test/org/codehaus/groovy/tools/stubgenerator/CircularLanguageReferenceTest.groovy @@ -18,6 +18,12 @@ */ package org.codehaus.groovy.tools.stubgenerator +import org.junit.After +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.junit.runners.JUnit4 + /** * Test circular reference between Java and Groovy, as well as inheritance: * a Shape Java interface is implemented by a Rectangle Groovy class, @@ -27,8 +33,30 @@ package org.codehaus.groovy.tools.stubgenerator * * @author Guillaume Laforge */ +import static org.junit.Assume.assumeFalse + +@RunWith(JUnit4) class CircularLanguageReferenceTest extends StubTestCase { + @Before + void setUp() { + assumeNotOnTravisCIAndNotJava6() + super.setUp() + } + + private assumeNotOnTravisCIAndNotJava6() { + boolean travisCI = new File('.').absolutePath =~ /travis/ + boolean java6 = System.getProperty('java.version').startsWith('1.6') + + assumeFalse('''Test always fails with "java.lang.IllegalArgumentException: URI is not hierarchical" + on open jdk used by travis.''', travisCI && java6) + } + + @Test + void test() { + super.testRun() + } + void verifyStubs() { classes['stubgenerator.circularLanguageReference.Rectangle'].with { assert methods['area' ].signature == "public double area()" @@ -39,5 +67,10 @@ class CircularLanguageReferenceTest extends StubTestCase { assert imports == ['java.lang.*', 'java.io.*', 'java.net.*', 'java.util.*', 'groovy.lang.*', 'groovy.util.*'] } } + + @After + void tearDown() { + super.tearDown() + } } http://git-wip-us.apache.org/repos/asf/groovy/blob/18b587b0/src/test/org/codehaus/groovy/tools/stubgenerator/PropertyUsageFromJavaTest.groovy ---------------------------------------------------------------------- diff --git a/src/test/org/codehaus/groovy/tools/stubgenerator/PropertyUsageFromJavaTest.groovy b/src/test/org/codehaus/groovy/tools/stubgenerator/PropertyUsageFromJavaTest.groovy index eb34176..e199972 100644 --- a/src/test/org/codehaus/groovy/tools/stubgenerator/PropertyUsageFromJavaTest.groovy +++ b/src/test/org/codehaus/groovy/tools/stubgenerator/PropertyUsageFromJavaTest.groovy @@ -18,13 +18,41 @@ */ package org.codehaus.groovy.tools.stubgenerator +import org.junit.After +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.junit.runners.JUnit4 + +import static org.junit.Assume.assumeFalse + /** * Tests Groovy properties and how they can be used from Java. * * @author Guillaume Laforge */ +@RunWith(JUnit4) class PropertyUsageFromJavaTest extends StubTestCase { + @Before + void setUp() { + assumeNotOnTravisCIAndNotJava6() + super.setUp() + } + + private assumeNotOnTravisCIAndNotJava6() { + boolean travisCI = new File('.').absolutePath =~ /travis/ + boolean java6 = System.getProperty('java.version').startsWith('1.6') + + assumeFalse('''Test always fails with "java.lang.IllegalArgumentException: URI is not hierarchical" + on open jdk used by travis.''', travisCI && java6) + } + + @Test + void test() { + super.testRun() + } + void verifyStubs() { classes['stubgenerator.propertyUsageFromJava.somepackage.GroovyPogo'].with { assert methods['getAge'].signature == "public int getAge()" @@ -33,5 +61,10 @@ class PropertyUsageFromJavaTest extends StubTestCase { assert methods['setName'].signature == "public void setName(java.lang.String value)" } } + + @After + void tearDown() { + super.tearDown() + } }