Index: trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ChildOrParentSelectorTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ChildOrParentSelectorTest.groovy	(revision 14017)
+++ trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ChildOrParentSelectorTest.groovy	(revision 14019)
@@ -20,6 +20,4 @@
 class ChildOrParentSelectorTest {
     static private Logger logger = Logger.getLogger(ChildOrParentSelectorTest.class.getName());
-
-    def shouldFail = new GroovyTestCase().&shouldFail
 
     def DataSet ds;
Index: trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyConditionTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyConditionTest.groovy	(revision 14017)
+++ trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyConditionTest.groovy	(revision 14019)
@@ -2,4 +2,5 @@
 package org.openstreetmap.josm.gui.mappaint.mapcss;
 
+import static groovy.test.GroovyAssert.shouldFail
 import static org.junit.Assert.*
 
@@ -16,6 +17,4 @@
 
 class KeyConditionTest {
-
-    def shouldFail = new GroovyTestCase().&shouldFail
 
     def DataSet ds;
Index: trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyValueConditionTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyValueConditionTest.groovy	(revision 14017)
+++ trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/KeyValueConditionTest.groovy	(revision 14019)
@@ -1,4 +1,6 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.mappaint.mapcss;
+
+import static groovy.test.GroovyAssert.shouldFail
 
 import org.junit.*
@@ -15,8 +17,5 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.MapCSSParser
 
-
 class KeyValueConditionTest {
-
-    def shouldFail = new GroovyTestCase().&shouldFail
 
     def DataSet ds;
Index: trunk/test/unit/org/openstreetmap/josm/io/ChangesetQueryUrlParserTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/ChangesetQueryUrlParserTest.groovy	(revision 14017)
+++ trunk/test/unit/org/openstreetmap/josm/io/ChangesetQueryUrlParserTest.groovy	(revision 14019)
@@ -1,4 +1,9 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.io
+
+import static groovy.test.GroovyAssert.shouldFail
+
+import java.time.OffsetDateTime
+import java.time.ZoneOffset
 
 import org.junit.Test
@@ -6,9 +11,5 @@
 import org.openstreetmap.josm.io.ChangesetQuery.ChangesetQueryUrlParser
 
-import java.time.OffsetDateTime
-import java.time.ZoneOffset
-
 class ChangesetQueryUrlParserTest {
-    final shouldFail = new GroovyTestCase().&shouldFail
 
     @Test
Index: trunk/test/unit/org/openstreetmap/josm/io/DiffResultProcessorTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/DiffResultProcessorTest.groovy	(revision 14017)
+++ trunk/test/unit/org/openstreetmap/josm/io/DiffResultProcessorTest.groovy	(revision 14019)
@@ -2,4 +2,5 @@
 package org.openstreetmap.josm.io;
 
+import static groovy.test.GroovyAssert.shouldFail
 import static org.junit.Assert.*
 
@@ -30,6 +31,4 @@
     public void testParse_NOK_Cases() {
         def DiffResultProcessor processor  = new DiffResultProcessor([])
-
-        final shouldFail = new GroovyTestCase().&shouldFail
 
         shouldFail(IllegalArgumentException) {
Index: trunk/test/unit/org/openstreetmap/josm/io/OsmChangeBuilderTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/OsmChangeBuilderTest.groovy	(revision 14017)
+++ trunk/test/unit/org/openstreetmap/josm/io/OsmChangeBuilderTest.groovy	(revision 14019)
@@ -1,4 +1,5 @@
 package org.openstreetmap.josm.io;
 
+import static groovy.test.GroovyAssert.shouldFail
 import static org.junit.Assert.*
 
@@ -38,6 +39,4 @@
         def Changeset cs = new Changeset(1)
         OsmChangeBuilder builder = new OsmChangeBuilder(cs)
-
-        final shouldFail = new GroovyTestCase().&shouldFail
 
         // should be OK
Index: trunk/test/unit/org/openstreetmap/josm/io/OsmChangesetContentParserTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/OsmChangesetContentParserTest.groovy	(revision 14017)
+++ trunk/test/unit/org/openstreetmap/josm/io/OsmChangesetContentParserTest.groovy	(revision 14019)
@@ -1,4 +1,6 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.io;
+
+import static groovy.test.GroovyAssert.shouldFail
 
 import java.nio.charset.StandardCharsets
@@ -15,5 +17,4 @@
 
 class OsmChangesetContentParserTest {
-    final shouldFail = new GroovyTestCase().&shouldFail
 
     @Test
Index: trunk/test/unit/org/openstreetmap/josm/io/ParseWithChangesetReaderTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/io/ParseWithChangesetReaderTest.groovy	(revision 14017)
+++ trunk/test/unit/org/openstreetmap/josm/io/ParseWithChangesetReaderTest.groovy	(revision 14019)
@@ -2,4 +2,5 @@
 package org.openstreetmap.josm.io;
 
+import static groovy.test.GroovyAssert.shouldFail
 import static org.junit.Assert.*
 
@@ -167,6 +168,4 @@
         """
 
-        final shouldFail = new GroovyTestCase().&shouldFail
-
         shouldFail(IllegalDataException) {
             DataSet ds = getDataSet(doc)
@@ -184,6 +183,4 @@
         </osm>
         """
-
-        final shouldFail = new GroovyTestCase().&shouldFail
 
         shouldFail(IllegalDataException) {
@@ -203,6 +200,4 @@
             """
 
-        final shouldFail = new GroovyTestCase().&shouldFail
-
         shouldFail(IllegalDataException) {
             DataSet ds = getDataSet(doc)