Repository: tapestry-5 Updated Branches: refs/heads/master 52b687c56 -> 7293256e7
use TestNG classes in TestNG tests, add spock as a testCompile dependency to all subprojects Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/74b8ee2d Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/74b8ee2d Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/74b8ee2d Branch: refs/heads/master Commit: 74b8ee2d2d1b598c39c892ac351db781afd7bf44 Parents: 52b687c Author: Jochen Kemnade <[email protected]> Authored: Thu Mar 5 09:33:44 2015 +0100 Committer: Jochen Kemnade <[email protected]> Committed: Thu Mar 5 09:33:44 2015 +0100 ---------------------------------------------------------------------- build.gradle | 4 +++- plastic/build.gradle | 1 - tapestry-clojure/build.gradle | 1 - .../tapestry5/internal/services/URLEncoderImplTest.java | 3 +-- .../org/apache/tapestry5/internal/util/LocaleUtilsTest.java | 8 ++++---- tapestry-ioc/build.gradle | 1 - tapestry-javadoc/build.gradle | 2 -- tapestry-json/build.gradle | 1 - tapestry-mongodb/build.gradle | 2 -- 9 files changed, 8 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74b8ee2d/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 178e0d3..b6547b3 100755 --- a/build.gradle +++ b/build.gradle @@ -173,7 +173,9 @@ subprojects { eclipse.classpath.plusConfigurations += [configurations.provided] dependencies { - + + testCompile "org.spockframework:spock-core:${versions.spock}" + testRuntime "org.slf4j:slf4j-log4j12:${versions.slf4j}" } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74b8ee2d/plastic/build.gradle ---------------------------------------------------------------------- diff --git a/plastic/build.gradle b/plastic/build.gradle index 3b5987e..25a53f9 100644 --- a/plastic/build.gradle +++ b/plastic/build.gradle @@ -2,7 +2,6 @@ description = "High-level runtime transformations of Java classes" dependencies { compile "org.slf4j:slf4j-api:${versions.slf4j}" - testCompile "org.spockframework:spock-core:$versions.spock" } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74b8ee2d/tapestry-clojure/build.gradle ---------------------------------------------------------------------- diff --git a/tapestry-clojure/build.gradle b/tapestry-clojure/build.gradle index 77111c6..934fe02 100644 --- a/tapestry-clojure/build.gradle +++ b/tapestry-clojure/build.gradle @@ -7,7 +7,6 @@ dependencies { // Added just to prove that it works (TAP5-1945) testCompile project(':tapestry-core') testRuntime "javax.servlet:servlet-api:${versions.servletapi}" - testCompile "org.spockframework:spock-core:${versions.spock}" } test { http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74b8ee2d/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/URLEncoderImplTest.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/URLEncoderImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/URLEncoderImplTest.java index db55d72..bc88200 100644 --- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/URLEncoderImplTest.java +++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/URLEncoderImplTest.java @@ -14,7 +14,6 @@ package org.apache.tapestry5.internal.services; -import junit.framework.AssertionFailedError; import org.apache.tapestry5.services.URLEncoder; import org.testng.Assert; import org.testng.annotations.DataProvider; @@ -88,7 +87,7 @@ public class URLEncoderImplTest extends Assert try { encoder.decode(input); - throw new AssertionFailedError("This code should not be reachable."); + Assert.fail("This code should not be reachable."); } catch (IllegalArgumentException ex) { http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74b8ee2d/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/LocaleUtilsTest.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/LocaleUtilsTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/LocaleUtilsTest.java index d13b7b8..26753b1 100644 --- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/LocaleUtilsTest.java +++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/LocaleUtilsTest.java @@ -14,7 +14,7 @@ package org.apache.tapestry5.internal.util; -import junit.framework.Assert; +import org.testng.Assert; import org.testng.annotations.Test; import java.util.Locale; @@ -33,7 +33,7 @@ public class LocaleUtilsTest extends Assert private void assertValidToLocale(String language) { Locale locale = LocaleUtils.toLocale(language); - assertNotNull("valid locale", locale); + assertNotNull(locale, "valid locale"); assertEquals(language, locale.getLanguage()); //country and variant are empty assertTrue(locale.getCountry() == null || locale.getCountry().length() == 0); @@ -50,7 +50,7 @@ public class LocaleUtilsTest extends Assert private void assertValidToLocale(String localeString, String language, String country) { Locale locale = LocaleUtils.toLocale(localeString); - assertNotNull("valid locale", locale); + assertNotNull(locale, "valid locale"); assertEquals(language, locale.getLanguage()); assertEquals(country, locale.getCountry()); //variant is empty @@ -70,7 +70,7 @@ public class LocaleUtilsTest extends Assert String country, String variant) { Locale locale = LocaleUtils.toLocale(localeString); - assertNotNull("valid locale", locale); + assertNotNull(locale, "valid locale"); assertEquals(language, locale.getLanguage()); assertEquals(country, locale.getCountry()); assertEquals(variant, locale.getVariant()); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74b8ee2d/tapestry-ioc/build.gradle ---------------------------------------------------------------------- diff --git a/tapestry-ioc/build.gradle b/tapestry-ioc/build.gradle index cc5a43f..8113a23 100644 --- a/tapestry-ioc/build.gradle +++ b/tapestry-ioc/build.gradle @@ -15,7 +15,6 @@ dependencies { compile "org.slf4j:slf4j-api:${versions.slf4j}" - testCompile "org.spockframework:spock-core:${versions.spock}" testCompile "commons-lang:commons-lang:2.6" provided "org.testng:testng:${versions.testng}", { transitive = false } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74b8ee2d/tapestry-javadoc/build.gradle ---------------------------------------------------------------------- diff --git a/tapestry-javadoc/build.gradle b/tapestry-javadoc/build.gradle index efc6f9d..412bf8e 100644 --- a/tapestry-javadoc/build.gradle +++ b/tapestry-javadoc/build.gradle @@ -5,8 +5,6 @@ dependencies { compile "commons-lang:commons-lang:2.6" compile files(getTools()) - testCompile "org.spockframework:spock-core:${versions.spock}" - } /** Returns the tools.jar/classes.jar of the Java runtime. */ http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74b8ee2d/tapestry-json/build.gradle ---------------------------------------------------------------------- diff --git a/tapestry-json/build.gradle b/tapestry-json/build.gradle index a94d169..ccf936e 100644 --- a/tapestry-json/build.gradle +++ b/tapestry-json/build.gradle @@ -3,7 +3,6 @@ description = "Repackaged, improved (and tested) version of code originally from dependencies { provided project(':tapestry-ioc') - testCompile "org.spockframework:spock-core:${versions.spock}" } test { http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/74b8ee2d/tapestry-mongodb/build.gradle ---------------------------------------------------------------------- diff --git a/tapestry-mongodb/build.gradle b/tapestry-mongodb/build.gradle index 42dce0d..7a7df39 100644 --- a/tapestry-mongodb/build.gradle +++ b/tapestry-mongodb/build.gradle @@ -8,8 +8,6 @@ dependencies { testCompile group: 'org.jongo', name: 'jongo', version: '0.3' - testCompile "org.spockframework:spock-core:${versions.spock}" - testCompile "de.flapdoodle.embed:de.flapdoodle.embed.mongo:1.28" }
