This is an automated email from the ASF dual-hosted git repository. matrei pushed a commit to branch groovy-5 in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 329f31eac95f44026a5973e5ae0f1891c3a8a6d5 Author: Mattias Reichel <[email protected]> AuthorDate: Wed Oct 29 11:19:13 2025 +0100 test: remove `@PendingFeature` for passing tests --- .../async/FutureTaskPromiseFactorySpec.groovy | 13 ----------- .../groovy/grails/async/PromiseListSpec.groovy | 5 ----- .../test/groovy/grails/async/PromiseSpec.groovy | 8 ------- .../async/SynchronousPromiseFactorySpec.groovy | 13 ----------- .../groovy/grails/async/GparsPromiseSpec.groovy | 9 -------- .../grails/async/services/WebPromisesSpec.groovy | 5 ----- .../factory/rxjava/RxJavaPromiseListSpec.groovy | 5 ----- .../async/factory/rxjava/RxJavaPromiseSpec.groovy | 9 -------- .../async/factory/rxjava2/RxPromiseListSpec.groovy | 5 ----- .../async/factory/rxjava2/RxPromiseSpec.groovy | 9 -------- .../async/factory/rxjava3/RxPromiseListSpec.groovy | 5 ----- .../async/factory/rxjava3/RxPromiseSpec.groovy | 9 -------- .../grails/build/logging/GrailsConsoleSpec.groovy | 4 +--- ...erActionTransformerCompilationErrorsSpec.groovy | 10 --------- .../ArtefactTypeAstTransformationSpec.groovy | 9 -------- .../org/grails/plugins/BinaryPluginSpec.groovy | 7 ------ .../grails/databinding/XMLBindingSpec.groovy | 5 ----- .../BindingFormatCompilationErrorsSpec.groovy | 5 ----- .../converters/DateConversionHelperSpec.groovy | 10 --------- .../GPathCollectionDataBindingSourceSpec.groovy | 5 ----- .../databinding/xml/GPathResultMapSpec.groovy | 25 ---------------------- .../web/CookieTenantResolverSpec.groovy | 9 -------- .../web/HttpHeaderTenantResolverSpec.groovy | 9 -------- .../web/SessionTenantResolverSpec.groovy | 11 ---------- .../web/SubDomainTenantResolverSpec.groovy | 5 ----- .../grails/events/TaskExecuterEventBusSpec.groovy | 5 ----- .../rxjava/PublishSubscribeSpringSpec.groovy | 5 ----- .../annotation/PublishSubscribeSpringSpec.groovy | 5 ----- .../build/parsing/CommandLineParserSpec.groovy | 14 ------------ .../compiler/logging/LoggingTransformerSpec.groovy | 5 ----- .../grails/cli/profile/ResourceProfileSpec.groovy | 18 ---------------- .../profile/commands/CreateAppCommandSpec.groovy | 13 ----------- .../groovy/pubsub/demo/PubSubSpec.groovy | 6 ------ .../groovy/pubsub/demo/TaskControllerSpec.groovy | 5 ----- .../groovy/views182/CustomErrorSpec.groovy | 5 ----- .../TestForControllerWithoutMockDomainTests.groovy | 5 ----- .../test/mixin/UrlMappingsTestMixinTests.groovy | 13 ----------- .../test/mixin/cascade/CascadeCircularSpec.groovy | 5 ----- .../GrailsMockHttpServletRequestTests.groovy | 9 -------- .../grails/web/servlet/RenderMethodTests.groovy | 5 ----- .../web/servlet/mvc/RedirectMethodTests.groovy | 5 ----- ...lerExceptionHandlerCompilationErrorsSpec.groovy | 5 ----- .../ControllerExceptionHandlerSpec.groovy | 21 ------------------ .../grails/web/mapping/RegexUrlMappingTests.groovy | 5 ----- 44 files changed, 1 insertion(+), 362 deletions(-) diff --git a/grails-async/core/src/test/groovy/grails/async/FutureTaskPromiseFactorySpec.groovy b/grails-async/core/src/test/groovy/grails/async/FutureTaskPromiseFactorySpec.groovy index 2d1c8d1ea5..1e758b5121 100644 --- a/grails-async/core/src/test/groovy/grails/async/FutureTaskPromiseFactorySpec.groovy +++ b/grails-async/core/src/test/groovy/grails/async/FutureTaskPromiseFactorySpec.groovy @@ -21,7 +21,6 @@ package grails.async import grails.async.decorator.PromiseDecorator import org.grails.async.factory.future.CachedThreadPoolPromiseFactory import spock.lang.Issue -import spock.lang.PendingFeatureIf import spock.lang.Specification import spock.util.concurrent.PollingConditions @@ -100,10 +99,6 @@ class FutureTaskPromiseFactorySpec extends Specification { hasError == false } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test promise onError handling'() { when: 'a promise is executed with an onComplete handler' @@ -138,10 +133,6 @@ class FutureTaskPromiseFactorySpec extends Specification { val == 10 } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test promise chaining with exception'() { when: 'a promise is chained' @@ -155,10 +146,6 @@ class FutureTaskPromiseFactorySpec extends Specification { } @Issue('GRAILS-10152') - @PendingFeatureIf({ - // Mock() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test promise closure is not executed multiple times if it returns null'() { given: 'a closure that returns null' diff --git a/grails-async/core/src/test/groovy/grails/async/PromiseListSpec.groovy b/grails-async/core/src/test/groovy/grails/async/PromiseListSpec.groovy index f0c9883939..aeba0311ee 100644 --- a/grails-async/core/src/test/groovy/grails/async/PromiseListSpec.groovy +++ b/grails-async/core/src/test/groovy/grails/async/PromiseListSpec.groovy @@ -18,7 +18,6 @@ */ package grails.async -import spock.lang.PendingFeatureIf import spock.lang.Specification import spock.util.concurrent.PollingConditions @@ -74,10 +73,6 @@ class PromiseListSpec extends Specification { } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test promise list with an exception'() { when: 'a promise list with a promise that throws an exception is used' diff --git a/grails-async/core/src/test/groovy/grails/async/PromiseSpec.groovy b/grails-async/core/src/test/groovy/grails/async/PromiseSpec.groovy index 1fb5555e46..2363e6b497 100644 --- a/grails-async/core/src/test/groovy/grails/async/PromiseSpec.groovy +++ b/grails-async/core/src/test/groovy/grails/async/PromiseSpec.groovy @@ -44,10 +44,6 @@ class PromiseSpec extends Specification { } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test promise timeout handling'() { when: 'a promise that takes a while is created' @@ -165,10 +161,6 @@ class PromiseSpec extends Specification { result == 10 } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test promise chaining with exception'() { when: 'a promise is chained' diff --git a/grails-async/core/src/test/groovy/grails/async/SynchronousPromiseFactorySpec.groovy b/grails-async/core/src/test/groovy/grails/async/SynchronousPromiseFactorySpec.groovy index 4666fce9bf..e4c96228a9 100644 --- a/grails-async/core/src/test/groovy/grails/async/SynchronousPromiseFactorySpec.groovy +++ b/grails-async/core/src/test/groovy/grails/async/SynchronousPromiseFactorySpec.groovy @@ -21,7 +21,6 @@ package grails.async import grails.async.decorator.PromiseDecorator import org.grails.async.factory.SynchronousPromiseFactory import spock.lang.Issue -import spock.lang.PendingFeatureIf import spock.lang.Specification import spock.util.concurrent.PollingConditions @@ -128,10 +127,6 @@ class SynchronousPromiseFactorySpec extends Specification { result == 10 } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test promise chaining with exception'() { when: 'a promise is chained' @@ -145,10 +140,6 @@ class SynchronousPromiseFactorySpec extends Specification { } @Issue('GRAILS-9229') - @PendingFeatureIf({ - // Mock() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test promise is executed without calling get'() { given: 'a closure' @@ -162,10 +153,6 @@ class SynchronousPromiseFactorySpec extends Specification { } @Issue('GRAILS-10152') - @PendingFeatureIf({ - // Mock() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test promise closure is not executed multiple times if it returns null'() { given: 'a closure that returns null' diff --git a/grails-async/gpars/src/test/groovy/grails/async/GparsPromiseSpec.groovy b/grails-async/gpars/src/test/groovy/grails/async/GparsPromiseSpec.groovy index d5751c72e6..9780ca6308 100644 --- a/grails-async/gpars/src/test/groovy/grails/async/GparsPromiseSpec.groovy +++ b/grails-async/gpars/src/test/groovy/grails/async/GparsPromiseSpec.groovy @@ -20,7 +20,6 @@ package grails.async import grails.async.decorator.PromiseDecorator import org.grails.async.factory.gpars.GparsPromiseFactory -import spock.lang.PendingFeatureIf import spock.lang.Specification import spock.util.concurrent.PollingConditions @@ -49,10 +48,6 @@ class GparsPromiseSpec extends Specification { result == '*10*' } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test promise timeout handling'() { when: 'a promise that takes longer than the timeout' @@ -147,10 +142,6 @@ class GparsPromiseSpec extends Specification { value == 10 } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test promise chaining with exception'() { when: 'a promise with an exception is chained' diff --git a/grails-async/plugin/src/test/groovy/grails/async/services/WebPromisesSpec.groovy b/grails-async/plugin/src/test/groovy/grails/async/services/WebPromisesSpec.groovy index f5686aae26..3fa214a227 100644 --- a/grails-async/plugin/src/test/groovy/grails/async/services/WebPromisesSpec.groovy +++ b/grails-async/plugin/src/test/groovy/grails/async/services/WebPromisesSpec.groovy @@ -22,7 +22,6 @@ import grails.async.Promises import grails.async.web.WebPromises import grails.util.GrailsWebMockUtil import org.springframework.web.context.request.RequestContextHolder -import spock.lang.PendingFeatureIf import spock.lang.Specification /** @@ -30,10 +29,6 @@ import spock.lang.Specification */ class WebPromisesSpec extends Specification { - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test web promises handling'() { setup: diff --git a/grails-async/rxjava/src/test/groovy/org/grails/async/factory/rxjava/RxJavaPromiseListSpec.groovy b/grails-async/rxjava/src/test/groovy/org/grails/async/factory/rxjava/RxJavaPromiseListSpec.groovy index 0e7a601aca..91409810b1 100644 --- a/grails-async/rxjava/src/test/groovy/org/grails/async/factory/rxjava/RxJavaPromiseListSpec.groovy +++ b/grails-async/rxjava/src/test/groovy/org/grails/async/factory/rxjava/RxJavaPromiseListSpec.groovy @@ -19,7 +19,6 @@ package org.grails.async.factory.rxjava import grails.async.PromiseList -import spock.lang.PendingFeatureIf import spock.lang.Specification import spock.util.concurrent.PollingConditions @@ -78,10 +77,6 @@ class RxJavaPromiseListSpec extends Specification{ result == [1,2,3] } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test promise list with an exception'() { given: 'a promise list with a promise that throws an exception' diff --git a/grails-async/rxjava/src/test/groovy/org/grails/async/factory/rxjava/RxJavaPromiseSpec.groovy b/grails-async/rxjava/src/test/groovy/org/grails/async/factory/rxjava/RxJavaPromiseSpec.groovy index 502c7e6dcf..828bc1f660 100644 --- a/grails-async/rxjava/src/test/groovy/org/grails/async/factory/rxjava/RxJavaPromiseSpec.groovy +++ b/grails-async/rxjava/src/test/groovy/org/grails/async/factory/rxjava/RxJavaPromiseSpec.groovy @@ -20,7 +20,6 @@ package org.grails.async.factory.rxjava import grails.async.Promises import grails.async.decorator.PromiseDecorator -import spock.lang.PendingFeatureIf import spock.lang.Specification import spock.util.concurrent.PollingConditions @@ -49,10 +48,6 @@ class RxJavaPromiseSpec extends Specification { } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test promise timeout handling'() { when: 'a promise that takes a while is created' @@ -146,10 +141,6 @@ class RxJavaPromiseSpec extends Specification { val == 10 } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test promise chaining with exception'() { when: 'a promise is chained' diff --git a/grails-async/rxjava2/src/test/groovy/org/grails/async/factory/rxjava2/RxPromiseListSpec.groovy b/grails-async/rxjava2/src/test/groovy/org/grails/async/factory/rxjava2/RxPromiseListSpec.groovy index baa76801a3..d79e24eb50 100644 --- a/grails-async/rxjava2/src/test/groovy/org/grails/async/factory/rxjava2/RxPromiseListSpec.groovy +++ b/grails-async/rxjava2/src/test/groovy/org/grails/async/factory/rxjava2/RxPromiseListSpec.groovy @@ -19,7 +19,6 @@ package org.grails.async.factory.rxjava2 import grails.async.PromiseList -import spock.lang.PendingFeatureIf import spock.lang.Specification import spock.util.concurrent.PollingConditions @@ -78,10 +77,6 @@ class RxPromiseListSpec extends Specification { } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test promise list with an exception'() { given: 'a promise list with a promise that throws an exception' diff --git a/grails-async/rxjava2/src/test/groovy/org/grails/async/factory/rxjava2/RxPromiseSpec.groovy b/grails-async/rxjava2/src/test/groovy/org/grails/async/factory/rxjava2/RxPromiseSpec.groovy index ece00ceb10..30b3c3bfd2 100644 --- a/grails-async/rxjava2/src/test/groovy/org/grails/async/factory/rxjava2/RxPromiseSpec.groovy +++ b/grails-async/rxjava2/src/test/groovy/org/grails/async/factory/rxjava2/RxPromiseSpec.groovy @@ -20,7 +20,6 @@ package org.grails.async.factory.rxjava2 import grails.async.Promises import grails.async.decorator.PromiseDecorator -import spock.lang.PendingFeatureIf import spock.lang.Specification import spock.util.concurrent.PollingConditions @@ -49,10 +48,6 @@ class RxPromiseSpec extends Specification { } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test promise timeout handling'() { when: 'a promise that takes a while is created' @@ -159,10 +154,6 @@ class RxPromiseSpec extends Specification { value == 10 } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test promise chaining with exception'() { when: 'a promise is chained' diff --git a/grails-async/rxjava3/src/test/groovy/org/grails/async/factory/rxjava3/RxPromiseListSpec.groovy b/grails-async/rxjava3/src/test/groovy/org/grails/async/factory/rxjava3/RxPromiseListSpec.groovy index d6f4954e40..c6aadf528f 100644 --- a/grails-async/rxjava3/src/test/groovy/org/grails/async/factory/rxjava3/RxPromiseListSpec.groovy +++ b/grails-async/rxjava3/src/test/groovy/org/grails/async/factory/rxjava3/RxPromiseListSpec.groovy @@ -19,7 +19,6 @@ package org.grails.async.factory.rxjava3 import grails.async.PromiseList -import spock.lang.PendingFeatureIf import spock.lang.Specification import spock.util.concurrent.PollingConditions @@ -75,10 +74,6 @@ class RxPromiseListSpec extends Specification { } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test promise list with an exception'() { given: 'a promise list with a promise that throws an exception' diff --git a/grails-async/rxjava3/src/test/groovy/org/grails/async/factory/rxjava3/RxPromiseSpec.groovy b/grails-async/rxjava3/src/test/groovy/org/grails/async/factory/rxjava3/RxPromiseSpec.groovy index aa4a233202..77cfd92dfa 100644 --- a/grails-async/rxjava3/src/test/groovy/org/grails/async/factory/rxjava3/RxPromiseSpec.groovy +++ b/grails-async/rxjava3/src/test/groovy/org/grails/async/factory/rxjava3/RxPromiseSpec.groovy @@ -20,7 +20,6 @@ package org.grails.async.factory.rxjava3 import grails.async.Promises import grails.async.decorator.PromiseDecorator -import spock.lang.PendingFeatureIf import spock.lang.Specification import spock.util.concurrent.PollingConditions @@ -46,10 +45,6 @@ class RxPromiseSpec extends Specification { } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test promise timeout handling'() { when: 'a promise that takes a while is created' @@ -156,10 +151,6 @@ class RxPromiseSpec extends Specification { value == 10 } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test promise chaining with exception'() { when: 'a promise is chained' diff --git a/grails-bootstrap/src/test/groovy/grails/build/logging/GrailsConsoleSpec.groovy b/grails-bootstrap/src/test/groovy/grails/build/logging/GrailsConsoleSpec.groovy index 817f90f9fb..00ae73048c 100644 --- a/grails-bootstrap/src/test/groovy/grails/build/logging/GrailsConsoleSpec.groovy +++ b/grails-bootstrap/src/test/groovy/grails/build/logging/GrailsConsoleSpec.groovy @@ -22,7 +22,6 @@ import jline.console.ConsoleReader import org.fusesource.jansi.Ansi import spock.lang.IgnoreIf import spock.lang.Issue -import spock.lang.PendingFeatureIf import spock.lang.Specification import java.util.regex.Pattern @@ -42,8 +41,7 @@ import java.util.regex.Pattern * @since 2.3 */ @IgnoreIf({ - !GrailsConsole.instance.isAnsiEnabled() || - GroovySystem.version.startsWith('5') // Mock() does currently not work with Groovy 5 + !GrailsConsole.instance.isAnsiEnabled() }) class GrailsConsoleSpec extends Specification { diff --git a/grails-controllers/src/test/groovy/org/grails/compiler/web/ControllerActionTransformerCompilationErrorsSpec.groovy b/grails-controllers/src/test/groovy/org/grails/compiler/web/ControllerActionTransformerCompilationErrorsSpec.groovy index fd55a50c27..0076e94139 100644 --- a/grails-controllers/src/test/groovy/org/grails/compiler/web/ControllerActionTransformerCompilationErrorsSpec.groovy +++ b/grails-controllers/src/test/groovy/org/grails/compiler/web/ControllerActionTransformerCompilationErrorsSpec.groovy @@ -23,8 +23,6 @@ import grails.compiler.ast.ClassInjector import org.codehaus.groovy.control.MultipleCompilationErrorsException import org.grails.compiler.injection.GrailsAwareClassLoader -import org.grails.compiler.web.ControllerActionTransformer -import spock.lang.PendingFeatureIf import spock.lang.Specification class ControllerActionTransformerCompilationErrorsSpec extends Specification { @@ -40,10 +38,6 @@ class ControllerActionTransformerCompilationErrorsSpec extends Specification { gcl.classInjectors = [transformer]as ClassInjector[] } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test overloaded method actions'() { when: 'A controller overloads a method action' gcl.parseClass(''' @@ -57,10 +51,6 @@ class ControllerActionTransformerCompilationErrorsSpec extends Specification { e.message.contains 'Controller actions may not be overloaded. The [methodAction] action has been overloaded in [TestController].' } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void "Test default parameter values"() { when: 'A method action has default parameter values' gcl.parseClass(''' diff --git a/grails-core/src/test/groovy/org/grails/compiler/injection/ArtefactTypeAstTransformationSpec.groovy b/grails-core/src/test/groovy/org/grails/compiler/injection/ArtefactTypeAstTransformationSpec.groovy index fa8f72da3f..36cd60939f 100644 --- a/grails-core/src/test/groovy/org/grails/compiler/injection/ArtefactTypeAstTransformationSpec.groovy +++ b/grails-core/src/test/groovy/org/grails/compiler/injection/ArtefactTypeAstTransformationSpec.groovy @@ -30,7 +30,6 @@ import org.codehaus.groovy.ast.expr.ConstantExpression import org.codehaus.groovy.ast.expr.PropertyExpression import org.grails.core.artefact.ControllerArtefactHandler import spock.lang.Issue -import spock.lang.PendingFeatureIf import spock.lang.Specification /** @@ -69,10 +68,6 @@ class ArtefactTypeAstTransformationSpec extends Specification { returnValue == "Controller" } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void "test resolveArtefactType with null"() { given: ArtefactTypeAstTransformation ast = new ArtefactTypeAstTransformation() @@ -112,10 +107,6 @@ class ArtefactTypeAstTransformationSpec extends Specification { } @Issue("https://github.com/apache/grails-core/issues/10531";) - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void "TraitInjector with SupportsClassNode gets applied only if supports return true"() { setup: TraitInjectionUtils.@traitInjectors = [new TestTraitInjectorForSupportsClassNode(false)] diff --git a/grails-core/src/test/groovy/org/grails/plugins/BinaryPluginSpec.groovy b/grails-core/src/test/groovy/org/grails/plugins/BinaryPluginSpec.groovy index 0f087dcfa4..d171006a1f 100644 --- a/grails-core/src/test/groovy/org/grails/plugins/BinaryPluginSpec.groovy +++ b/grails-core/src/test/groovy/org/grails/plugins/BinaryPluginSpec.groovy @@ -20,12 +20,9 @@ package org.grails.plugins import grails.core.DefaultGrailsApplication -import org.grails.plugins.BinaryGrailsPlugin -import org.grails.plugins.BinaryGrailsPluginDescriptor import org.springframework.core.io.ByteArrayResource import org.springframework.core.io.FileSystemResource import org.springframework.core.io.Resource -import spock.lang.PendingFeatureIf import spock.lang.Shared import spock.lang.Specification @@ -73,10 +70,6 @@ class BinaryPluginSpec extends Specification { cssResource == null } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) def "Test plugin with both plugin.yml and plugin.groovy throws exception"() { when: def descriptor = new BinaryGrailsPluginDescriptor(new ByteArrayResource(testBinary.getBytes('UTF-8')), ['org.grails.plugins.TestBinaryResource']) diff --git a/grails-databinding-core/src/test/groovy/grails/databinding/XMLBindingSpec.groovy b/grails-databinding-core/src/test/groovy/grails/databinding/XMLBindingSpec.groovy index 63d5900256..69c9232f4d 100755 --- a/grails-databinding-core/src/test/groovy/grails/databinding/XMLBindingSpec.groovy +++ b/grails-databinding-core/src/test/groovy/grails/databinding/XMLBindingSpec.groovy @@ -19,15 +19,10 @@ package grails.databinding import groovy.xml.XmlSlurper -import spock.lang.PendingFeatureIf import spock.lang.Specification class XMLBindingSpec extends Specification { - @PendingFeatureIf({ - // groovy.lang.MissingFieldException: No such field: id for class: groovy.xml.slurpersupport.NodeChild - GroovySystem.version.startsWith('5') - }) void 'Test simple XML binding'() { given: def binder = new SimpleDataBinder() diff --git a/grails-databinding-core/src/test/groovy/org/grails/databinding/compiler/BindingFormatCompilationErrorsSpec.groovy b/grails-databinding-core/src/test/groovy/org/grails/databinding/compiler/BindingFormatCompilationErrorsSpec.groovy index c75610df14..5667fc31cf 100644 --- a/grails-databinding-core/src/test/groovy/org/grails/databinding/compiler/BindingFormatCompilationErrorsSpec.groovy +++ b/grails-databinding-core/src/test/groovy/org/grails/databinding/compiler/BindingFormatCompilationErrorsSpec.groovy @@ -22,16 +22,11 @@ package org.grails.databinding.compiler import org.codehaus.groovy.control.MultipleCompilationErrorsException import spock.lang.Issue -import spock.lang.PendingFeatureIf import spock.lang.Specification class BindingFormatCompilationErrorsSpec extends Specification { @Issue('GRAILS-11321') - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test compiling @BindingFormat with no code and no value'() { given: def gcl = new GroovyClassLoader() diff --git a/grails-databinding-core/src/test/groovy/org/grails/databinding/converters/DateConversionHelperSpec.groovy b/grails-databinding-core/src/test/groovy/org/grails/databinding/converters/DateConversionHelperSpec.groovy index 1cbe41ff0b..e35e6b3d8c 100644 --- a/grails-databinding-core/src/test/groovy/org/grails/databinding/converters/DateConversionHelperSpec.groovy +++ b/grails-databinding-core/src/test/groovy/org/grails/databinding/converters/DateConversionHelperSpec.groovy @@ -19,13 +19,11 @@ package org.grails.databinding.converters import spock.lang.Issue -import spock.lang.PendingFeatureIf import java.text.ParseException import spock.lang.Specification -import java.text.SimpleDateFormat import static java.util.Calendar.* class DateConversionHelperSpec extends Specification { @@ -104,10 +102,6 @@ class DateConversionHelperSpec extends Specification { 0 == calendar.get(SECOND) } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test invalid format String'() { given: def helper = new DateConversionHelper(formatStrings: ['yyyy-MM-dd HH:mm:ss.S']) @@ -142,10 +136,6 @@ class DateConversionHelperSpec extends Specification { } @Issue("https://github.com/apache/grails-core/issues/10387";) - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test lenient date'() { given: DateConversionHelper helper = new DateConversionHelper(formatStrings: ['yyyy-MM-dd']) diff --git a/grails-databinding-core/src/test/groovy/org/grails/databinding/xml/GPathCollectionDataBindingSourceSpec.groovy b/grails-databinding-core/src/test/groovy/org/grails/databinding/xml/GPathCollectionDataBindingSourceSpec.groovy index 00b18aa975..8dea5e0954 100644 --- a/grails-databinding-core/src/test/groovy/org/grails/databinding/xml/GPathCollectionDataBindingSourceSpec.groovy +++ b/grails-databinding-core/src/test/groovy/org/grails/databinding/xml/GPathCollectionDataBindingSourceSpec.groovy @@ -20,15 +20,10 @@ package org.grails.databinding.xml import grails.databinding.DataBindingSource import groovy.xml.XmlSlurper -import spock.lang.PendingFeatureIf import spock.lang.Specification class GPathCollectionDataBindingSourceSpec extends Specification { - @PendingFeatureIf({ - // groovy.lang.MissingFieldException: No such field: id for class: groovy.xml.slurpersupport.NodeChild - GroovySystem.version.startsWith('5') - }) void 'Test multiple child elements'() { given: def xml = new XmlSlurper().parseText(''' diff --git a/grails-databinding-core/src/test/groovy/org/grails/databinding/xml/GPathResultMapSpec.groovy b/grails-databinding-core/src/test/groovy/org/grails/databinding/xml/GPathResultMapSpec.groovy index b9762f6395..81553a3457 100755 --- a/grails-databinding-core/src/test/groovy/org/grails/databinding/xml/GPathResultMapSpec.groovy +++ b/grails-databinding-core/src/test/groovy/org/grails/databinding/xml/GPathResultMapSpec.groovy @@ -19,15 +19,10 @@ package org.grails.databinding.xml import groovy.xml.XmlSlurper -import spock.lang.PendingFeatureIf import spock.lang.Specification class GPathResultMapSpec extends Specification { - @PendingFeatureIf({ - // groovy.lang.MissingFieldException: No such field: id for class: groovy.xml.slurpersupport.NodeChild - GroovySystem.version.startsWith('5') - }) void 'Test nested elements'() { given: def xml = new XmlSlurper().parseText(''' @@ -64,10 +59,6 @@ class GPathResultMapSpec extends Specification { person.locations.location[1].billingAddress == 'bar2' } - @PendingFeatureIf({ - // groovy.lang.MissingFieldException: No such field: id for class: groovy.xml.slurpersupport.NodeChild - GroovySystem.version.startsWith('5') - }) void 'Test basic Map operations'() { given: def xml = new XmlSlurper().parseText(''' @@ -133,10 +124,6 @@ class GPathResultMapSpec extends Specification { 'country' in keys } - @PendingFeatureIf({ - // groovy.lang.MissingFieldException: No such field: id for class: groovy.xml.slurpersupport.NodeChild - GroovySystem.version.startsWith('5') - }) void 'Test id element'() { given: def xml = new XmlSlurper().parseText(''' @@ -158,10 +145,6 @@ class GPathResultMapSpec extends Specification { map.name == 'Thin Lizzy' } - @PendingFeatureIf({ - // groovy.lang.MissingFieldException: No such field: id for class: groovy.xml.slurpersupport.NodeChild - GroovySystem.version.startsWith('5') - }) void 'Test id returns null when no id is present'() { given: def xml = new XmlSlurper().parseText(''' @@ -179,10 +162,6 @@ class GPathResultMapSpec extends Specification { map.band.id == null } - @PendingFeatureIf({ - // groovy.lang.MissingFieldException: No such field: id for class: groovy.xml.slurpersupport.NodeChild - GroovySystem.version.startsWith('5') - }) void 'Test id attributes'() { given: def xml = new XmlSlurper().parseText(''' @@ -275,10 +254,6 @@ class GPathResultMapSpec extends Specification { map.bar.id == '1' } - @PendingFeatureIf({ - // groovy.lang.MissingFieldException: No such field: id for class: groovy.xml.slurpersupport.NodeChild - GroovySystem.version.startsWith('5') - }) void 'Test empty Map'() { given: def xml = new XmlSlurper().parseText(''' diff --git a/grails-datastore-web/src/test/groovy/org/grails/datastore/mapping/multitenancy/web/CookieTenantResolverSpec.groovy b/grails-datastore-web/src/test/groovy/org/grails/datastore/mapping/multitenancy/web/CookieTenantResolverSpec.groovy index 1097b23310..7f83ffc180 100644 --- a/grails-datastore-web/src/test/groovy/org/grails/datastore/mapping/multitenancy/web/CookieTenantResolverSpec.groovy +++ b/grails-datastore-web/src/test/groovy/org/grails/datastore/mapping/multitenancy/web/CookieTenantResolverSpec.groovy @@ -23,7 +23,6 @@ import org.grails.datastore.mapping.multitenancy.exceptions.TenantNotFoundExcept import org.springframework.mock.web.MockHttpServletRequest import org.springframework.web.context.request.RequestContextHolder import org.springframework.web.context.request.ServletWebRequest -import spock.lang.PendingFeatureIf import spock.lang.Specification import jakarta.servlet.http.Cookie @@ -33,10 +32,6 @@ import jakarta.servlet.http.Cookie */ class CookieTenantResolverSpec extends Specification { - @PendingFeatureIf({ - // thrown does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void "Test subdomain resolver throws an exception outside a web request"() { when: new CookieTenantResolver().resolveTenantIdentifier() @@ -46,10 +41,6 @@ class CookieTenantResolverSpec extends Specification { e.message == "Tenant could not be resolved outside a web request" } - @PendingFeatureIf({ - // thrown does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void "Test not tenant id found"() { setup: def request = new MockHttpServletRequest("GET", "/foo") diff --git a/grails-datastore-web/src/test/groovy/org/grails/datastore/mapping/multitenancy/web/HttpHeaderTenantResolverSpec.groovy b/grails-datastore-web/src/test/groovy/org/grails/datastore/mapping/multitenancy/web/HttpHeaderTenantResolverSpec.groovy index 070b2fa260..c729e0f740 100644 --- a/grails-datastore-web/src/test/groovy/org/grails/datastore/mapping/multitenancy/web/HttpHeaderTenantResolverSpec.groovy +++ b/grails-datastore-web/src/test/groovy/org/grails/datastore/mapping/multitenancy/web/HttpHeaderTenantResolverSpec.groovy @@ -22,7 +22,6 @@ import org.grails.datastore.mapping.multitenancy.exceptions.TenantNotFoundExcept import org.springframework.mock.web.MockHttpServletRequest import org.springframework.web.context.request.RequestContextHolder import org.springframework.web.context.request.ServletWebRequest -import spock.lang.PendingFeatureIf import spock.lang.Specification /** @@ -30,10 +29,6 @@ import spock.lang.Specification */ class HttpHeaderTenantResolverSpec extends Specification { - @PendingFeatureIf({ - // thrown does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void "Test HttpHeader resolver throws an exception outside a web request"() { when: new HttpHeaderTenantResolver().resolveTenantIdentifier() @@ -44,10 +39,6 @@ class HttpHeaderTenantResolverSpec extends Specification { } - @PendingFeatureIf({ - // thrown does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void "Test not tenant id found"() { setup: def request = new MockHttpServletRequest("GET", "/foo") diff --git a/grails-datastore-web/src/test/groovy/org/grails/datastore/mapping/multitenancy/web/SessionTenantResolverSpec.groovy b/grails-datastore-web/src/test/groovy/org/grails/datastore/mapping/multitenancy/web/SessionTenantResolverSpec.groovy index 85179e1a1d..6625b910f1 100644 --- a/grails-datastore-web/src/test/groovy/org/grails/datastore/mapping/multitenancy/web/SessionTenantResolverSpec.groovy +++ b/grails-datastore-web/src/test/groovy/org/grails/datastore/mapping/multitenancy/web/SessionTenantResolverSpec.groovy @@ -18,12 +18,10 @@ */ package org.grails.datastore.mapping.multitenancy.web -import org.grails.datastore.mapping.core.connections.ConnectionSource import org.grails.datastore.mapping.multitenancy.exceptions.TenantNotFoundException import org.springframework.mock.web.MockHttpServletRequest import org.springframework.web.context.request.RequestContextHolder import org.springframework.web.context.request.ServletWebRequest -import spock.lang.PendingFeatureIf import spock.lang.Specification /** @@ -31,10 +29,6 @@ import spock.lang.Specification */ class SessionTenantResolverSpec extends Specification { - @PendingFeatureIf({ - // thrown does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void "Test subdomain resolver throws an exception outside a web request"() { when: new SessionTenantResolver().resolveTenantIdentifier() @@ -44,11 +38,6 @@ class SessionTenantResolverSpec extends Specification { e.message == "Tenant could not be resolved outside a web request" } - - @PendingFeatureIf({ - // thrown does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void "Test not tenant id found"() { setup: def request = new MockHttpServletRequest("GET", "/foo") diff --git a/grails-datastore-web/src/test/groovy/org/grails/datastore/mapping/multitenancy/web/SubDomainTenantResolverSpec.groovy b/grails-datastore-web/src/test/groovy/org/grails/datastore/mapping/multitenancy/web/SubDomainTenantResolverSpec.groovy index 559b711d9f..028832236c 100644 --- a/grails-datastore-web/src/test/groovy/org/grails/datastore/mapping/multitenancy/web/SubDomainTenantResolverSpec.groovy +++ b/grails-datastore-web/src/test/groovy/org/grails/datastore/mapping/multitenancy/web/SubDomainTenantResolverSpec.groovy @@ -23,7 +23,6 @@ import org.grails.datastore.mapping.multitenancy.exceptions.TenantNotFoundExcept import org.springframework.mock.web.MockHttpServletRequest import org.springframework.web.context.request.RequestContextHolder import org.springframework.web.context.request.ServletWebRequest -import spock.lang.PendingFeatureIf import spock.lang.Specification /** @@ -31,10 +30,6 @@ import spock.lang.Specification */ class SubDomainTenantResolverSpec extends Specification { - @PendingFeatureIf({ - // thrown does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void "Test subdomain resolver throws an exception outside a web request"() { when: new SubDomainTenantResolver().resolveTenantIdentifier() diff --git a/grails-events/core/src/test/groovy/org/grails/events/TaskExecuterEventBusSpec.groovy b/grails-events/core/src/test/groovy/org/grails/events/TaskExecuterEventBusSpec.groovy index 56407b5bf3..87215bc8e8 100644 --- a/grails-events/core/src/test/groovy/org/grails/events/TaskExecuterEventBusSpec.groovy +++ b/grails-events/core/src/test/groovy/org/grails/events/TaskExecuterEventBusSpec.groovy @@ -19,7 +19,6 @@ package org.grails.events import org.grails.events.bus.ExecutorEventBus -import spock.lang.PendingFeatureIf import spock.lang.Specification /** @@ -107,10 +106,6 @@ class TaskExecuterEventBusSpec extends Specification { result instanceof Throwable } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test task executor bus error handling with publish'() { given: 'a task executor event bus' diff --git a/grails-events/rxjava/src/test/groovy/org/grails/events/rxjava/PublishSubscribeSpringSpec.groovy b/grails-events/rxjava/src/test/groovy/org/grails/events/rxjava/PublishSubscribeSpringSpec.groovy index eaca1db394..6de88181f2 100644 --- a/grails-events/rxjava/src/test/groovy/org/grails/events/rxjava/PublishSubscribeSpringSpec.groovy +++ b/grails-events/rxjava/src/test/groovy/org/grails/events/rxjava/PublishSubscribeSpringSpec.groovy @@ -27,7 +27,6 @@ import org.grails.datastore.mapping.simple.SimpleMapDatastore import org.springframework.context.annotation.AnnotationConfigApplicationContext import org.springframework.stereotype.Component import spock.lang.AutoCleanup -import spock.lang.PendingFeatureIf import spock.lang.Shared import spock.lang.Specification import spock.util.concurrent.PollingConditions @@ -38,10 +37,6 @@ class PublishSubscribeSpringSpec extends Specification { @SuppressWarnings('unused') @Shared @AutoCleanup SimpleMapDatastore datastore = new SimpleMapDatastore() - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) def 'Test event publisher within Spring'() { given: 'a Spring application context with an event bus' diff --git a/grails-events/transforms/src/test/groovy/grails/events/annotation/PublishSubscribeSpringSpec.groovy b/grails-events/transforms/src/test/groovy/grails/events/annotation/PublishSubscribeSpringSpec.groovy index 7b028e61d6..9ea4fd9eac 100644 --- a/grails-events/transforms/src/test/groovy/grails/events/annotation/PublishSubscribeSpringSpec.groovy +++ b/grails-events/transforms/src/test/groovy/grails/events/annotation/PublishSubscribeSpringSpec.groovy @@ -25,7 +25,6 @@ import org.grails.datastore.mapping.simple.SimpleMapDatastore import org.springframework.context.annotation.AnnotationConfigApplicationContext import org.springframework.stereotype.Component import spock.lang.AutoCleanup -import spock.lang.PendingFeatureIf import spock.lang.Shared import spock.lang.Specification import spock.util.concurrent.PollingConditions @@ -39,10 +38,6 @@ class PublishSubscribeSpringSpec extends Specification { @SuppressWarnings('unused') @Shared @AutoCleanup SimpleMapDatastore datastore = new SimpleMapDatastore() - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) def 'Test event publisher within Spring'() { given: 'An application context with a publisher and subscriber' diff --git a/grails-gradle/model/src/test/groovy/org/grails/build/parsing/CommandLineParserSpec.groovy b/grails-gradle/model/src/test/groovy/org/grails/build/parsing/CommandLineParserSpec.groovy index ab9a60fbea..931f237c75 100644 --- a/grails-gradle/model/src/test/groovy/org/grails/build/parsing/CommandLineParserSpec.groovy +++ b/grails-gradle/model/src/test/groovy/org/grails/build/parsing/CommandLineParserSpec.groovy @@ -20,7 +20,6 @@ package org.grails.build.parsing import grails.util.Environment -import spock.lang.PendingFeatureIf import spock.lang.Shared import spock.lang.Specification @@ -122,10 +121,6 @@ class CommandLineParserSpec extends Specification { cl.remainingArgsString == "foo bar" } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void "Test that options with spaces throw an exception"() { when: def parser = new CommandLineParser() @@ -393,11 +388,6 @@ class CommandLineParserSpec extends Specification { cl.optionValue('include-sources') == 'file with spaces.xml' } - - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void "Test that parseString with unbalanced double quotes throws ParseException"() { when: def parser = new CommandLineParser() @@ -407,10 +397,6 @@ class CommandLineParserSpec extends Specification { thrown ParseException } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void "Test that parseString with unbalanced single quotes throws ParseException"() { when: def parser = new CommandLineParser() diff --git a/grails-logging/src/test/groovy/org/grails/compiler/logging/LoggingTransformerSpec.groovy b/grails-logging/src/test/groovy/org/grails/compiler/logging/LoggingTransformerSpec.groovy index c31ddcf67d..1dea989c6d 100644 --- a/grails-logging/src/test/groovy/org/grails/compiler/logging/LoggingTransformerSpec.groovy +++ b/grails-logging/src/test/groovy/org/grails/compiler/logging/LoggingTransformerSpec.groovy @@ -21,7 +21,6 @@ package org.grails.compiler.logging import org.slf4j.Logger import grails.compiler.ast.ClassInjector import org.grails.compiler.injection.GrailsAwareClassLoader -import spock.lang.PendingFeatureIf import spock.lang.Specification class LoggingTransformerSpec extends Specification { @@ -125,10 +124,6 @@ class LoggingController { } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) def "Test log field is not added to Application classes"() { given: def gcl = new GrailsAwareClassLoader() diff --git a/grails-shell-cli/src/test/groovy/org/grails/cli/profile/ResourceProfileSpec.groovy b/grails-shell-cli/src/test/groovy/org/grails/cli/profile/ResourceProfileSpec.groovy index b6e131108c..b53e30a409 100644 --- a/grails-shell-cli/src/test/groovy/org/grails/cli/profile/ResourceProfileSpec.groovy +++ b/grails-shell-cli/src/test/groovy/org/grails/cli/profile/ResourceProfileSpec.groovy @@ -23,7 +23,6 @@ import org.eclipse.aether.artifact.DefaultArtifact import org.eclipse.aether.graph.Dependency import org.grails.cli.profile.commands.factory.YamlCommandFactory import org.grails.io.support.Resource -import spock.lang.PendingFeatureIf import spock.lang.Specification /** @@ -31,10 +30,6 @@ import spock.lang.Specification */ class ResourceProfileSpec extends Specification { - @PendingFeatureIf({ - // Mock() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void "Test resource version"() { given:"A resource profile" def mockResource = Mock(Resource) @@ -83,10 +78,6 @@ class ResourceProfileSpec extends Specification { } - @PendingFeatureIf({ - // Mock() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void "test YamlCommandFactory readCommands"() { given: "A resource and profile" @@ -103,10 +94,6 @@ class ResourceProfileSpec extends Specification { data.description == "Cleans a Grails application's compiled sources" } - @PendingFeatureIf({ - // Mock() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void "Test dependencies"() { given:"A resource profile" @@ -144,11 +131,6 @@ class ResourceProfileSpec extends Specification { deps[0].artifact.version == '2.0' } - - @PendingFeatureIf({ - // Mock() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void "Test dependency exclusions"() { given:"A resource profile" diff --git a/grails-shell-cli/src/test/groovy/org/grails/cli/profile/commands/CreateAppCommandSpec.groovy b/grails-shell-cli/src/test/groovy/org/grails/cli/profile/commands/CreateAppCommandSpec.groovy index fe8a6bceeb..28d9354097 100644 --- a/grails-shell-cli/src/test/groovy/org/grails/cli/profile/commands/CreateAppCommandSpec.groovy +++ b/grails-shell-cli/src/test/groovy/org/grails/cli/profile/commands/CreateAppCommandSpec.groovy @@ -22,7 +22,6 @@ import grails.build.logging.GrailsConsole import org.grails.cli.profile.Feature import org.grails.cli.profile.Profile import org.spockframework.util.StringMessagePrintStream -import spock.lang.PendingFeatureIf import spock.lang.Shared import spock.lang.Specification /** @@ -47,10 +46,6 @@ class CreateAppCommandSpec extends Specification { GrailsConsole.instance.out = originalOut } - @PendingFeatureIf({ - // Mock() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void "test evaluateFeatures - multiple, some valid"() { given: Feature bar = Mock(Feature) { @@ -71,10 +66,6 @@ class CreateAppCommandSpec extends Specification { sps.toString() == "Warning |\nFeature foo does not exist in the profile web!\n" } - @PendingFeatureIf({ - // Mock() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void "test evaluateFeatures - multiple, all valid"() { given: Feature foo = Mock(Feature) { @@ -99,10 +90,6 @@ class CreateAppCommandSpec extends Specification { sps.toString() == "" } - @PendingFeatureIf({ - // Mock() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void "test evaluateFeatures fat finger"() { given: Feature bar = Mock(Feature) { diff --git a/grails-test-examples/async-events-pubsub-demo/src/integration-test/groovy/pubsub/demo/PubSubSpec.groovy b/grails-test-examples/async-events-pubsub-demo/src/integration-test/groovy/pubsub/demo/PubSubSpec.groovy index d9bc55a91c..09fadcf0cc 100644 --- a/grails-test-examples/async-events-pubsub-demo/src/integration-test/groovy/pubsub/demo/PubSubSpec.groovy +++ b/grails-test-examples/async-events-pubsub-demo/src/integration-test/groovy/pubsub/demo/PubSubSpec.groovy @@ -22,7 +22,6 @@ package pubsub.demo import grails.gorm.transactions.Rollback import grails.testing.mixin.integration.Integration import jakarta.inject.Inject -import spock.lang.PendingFeatureIf import spock.lang.Specification import spock.util.concurrent.PollingConditions @@ -85,12 +84,7 @@ class PubSubSpec extends Specification { } - @Rollback - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test synchronous event listener'() { when: 'when a event listener cancels an insert' diff --git a/grails-test-examples/async-events-pubsub-demo/src/integration-test/groovy/pubsub/demo/TaskControllerSpec.groovy b/grails-test-examples/async-events-pubsub-demo/src/integration-test/groovy/pubsub/demo/TaskControllerSpec.groovy index 1d295fdff3..aef9b5833e 100644 --- a/grails-test-examples/async-events-pubsub-demo/src/integration-test/groovy/pubsub/demo/TaskControllerSpec.groovy +++ b/grails-test-examples/async-events-pubsub-demo/src/integration-test/groovy/pubsub/demo/TaskControllerSpec.groovy @@ -27,7 +27,6 @@ import io.micronaut.http.client.HttpClient import io.micronaut.http.client.exceptions.HttpClientResponseException import spock.lang.AutoCleanup import spock.lang.PendingFeature -import spock.lang.PendingFeatureIf import spock.lang.Shared import spock.lang.Specification @@ -50,10 +49,6 @@ class TaskControllerSpec extends Specification { However, when starting the application with bootRun, the response body is as expected. ''') - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'test async error handling'() { when: 'we invoke an endpoint that throws an exception' diff --git a/grails-test-examples/issue-views-182/src/integration-test/groovy/views182/CustomErrorSpec.groovy b/grails-test-examples/issue-views-182/src/integration-test/groovy/views182/CustomErrorSpec.groovy index 82b87b1182..87730772c9 100644 --- a/grails-test-examples/issue-views-182/src/integration-test/groovy/views182/CustomErrorSpec.groovy +++ b/grails-test-examples/issue-views-182/src/integration-test/groovy/views182/CustomErrorSpec.groovy @@ -28,7 +28,6 @@ import io.micronaut.http.HttpResponse import io.micronaut.http.HttpStatus import io.micronaut.http.client.HttpClient import io.micronaut.http.client.exceptions.HttpClientResponseException -import spock.lang.PendingFeatureIf @Integration @Rollback @@ -40,10 +39,6 @@ class CustomErrorSpec extends HttpClientCommonSpec { this.client = HttpClient.create(new URL(baseUrl)) } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'it is possible to use gson views for handling exception errors'() { when: 'executing get to custom error' HttpResponse<String> response = client.toBlocking().exchange(HttpRequest.GET("/customError"), Argument.of(String), Argument.of(String)) diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/TestForControllerWithoutMockDomainTests.groovy b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/TestForControllerWithoutMockDomainTests.groovy index 7fc72c1db8..0f2cf06db9 100644 --- a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/TestForControllerWithoutMockDomainTests.groovy +++ b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/TestForControllerWithoutMockDomainTests.groovy @@ -21,15 +21,10 @@ package grails.test.mixin import grails.artefact.Artefact import grails.persistence.Entity import grails.testing.web.controllers.ControllerUnitTest -import spock.lang.PendingFeatureIf import spock.lang.Specification class TestForControllerWithoutMockDomainTests extends Specification implements ControllerUnitTest<ImpedimentsController> { - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void testEditImpediment() { def impedimentInstance = new Impediment(text:"blah") diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/UrlMappingsTestMixinTests.groovy b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/UrlMappingsTestMixinTests.groovy index dcec1b1cca..545e70e5f1 100644 --- a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/UrlMappingsTestMixinTests.groovy +++ b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/UrlMappingsTestMixinTests.groovy @@ -25,7 +25,6 @@ import grails.testing.web.UrlMappingsUnitTest import junit.framework.ComparisonFailure import org.springframework.web.context.WebApplicationContext import spock.lang.Issue -import spock.lang.PendingFeatureIf import spock.lang.Specification /** @@ -132,10 +131,6 @@ class AnotherUrlMappingsSpec extends Specification implements UrlMappingsUnitTes [GrailsUrlMappingsTestCaseFakeController] } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void testGrails5222Again() { when: assertForwardUrlMapping("/alias/param1value", controller: "grailsUrlMappingsTestCaseFake", action: "action1") { @@ -215,10 +210,6 @@ class GRAILS5222UrlMappingsSpec extends Specification implements UrlMappingsUnit [UserController] } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void testGRAILS5222() { when: assertForwardUrlMapping("/user", controller: "user", action: "publicProfile") { @@ -269,10 +260,6 @@ class GRAILS9110UrlMappingsSpec extends Specification implements UrlMappingsUnit [UserController] } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void testGrails9110() { when: assertForwardUrlMapping("/user", controller:"user", action:"publicProfile") { diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/cascade/CascadeCircularSpec.groovy b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/cascade/CascadeCircularSpec.groovy index 250f9c87fe..422721b62f 100644 --- a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/cascade/CascadeCircularSpec.groovy +++ b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/cascade/CascadeCircularSpec.groovy @@ -22,7 +22,6 @@ import grails.gorm.annotation.Entity import grails.testing.gorm.DataTest import grails.validation.ValidationException import spock.lang.Issue -import spock.lang.PendingFeatureIf import spock.lang.Specification /** @@ -32,10 +31,6 @@ import spock.lang.Specification class CascadeCircularSpec extends Specification implements DataTest{ @Issue('https://github.com/apache/grails-data-mapping/issues/967') - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void "test cascade circular"() { given: Person splinter = new Person(name: 'Master Splinter') diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/plugins/testing/GrailsMockHttpServletRequestTests.groovy b/grails-test-suite-uber/src/test/groovy/org/grails/plugins/testing/GrailsMockHttpServletRequestTests.groovy index 81aa1d0696..703ed262af 100644 --- a/grails-test-suite-uber/src/test/groovy/org/grails/plugins/testing/GrailsMockHttpServletRequestTests.groovy +++ b/grails-test-suite-uber/src/test/groovy/org/grails/plugins/testing/GrailsMockHttpServletRequestTests.groovy @@ -18,7 +18,6 @@ */ package org.grails.plugins.testing -import spock.lang.PendingFeatureIf import spock.lang.Specification import java.nio.charset.StandardCharsets @@ -85,10 +84,6 @@ class GrailsMockHttpServletRequestTests extends Specification { verifyXmlResult request.XML } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void testGetXMLNoContent() { given: @@ -105,10 +100,6 @@ class GrailsMockHttpServletRequestTests extends Specification { e.message == 'Error parsing XML' } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void testGetXMLContentNotXml() { given: diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/RenderMethodTests.groovy b/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/RenderMethodTests.groovy index d3441f3878..6e716bc052 100644 --- a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/RenderMethodTests.groovy +++ b/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/RenderMethodTests.groovy @@ -24,7 +24,6 @@ import org.grails.plugins.testing.GrailsMockHttpServletRequest import org.grails.plugins.testing.GrailsMockHttpServletResponse import org.grails.web.servlet.mvc.exceptions.ControllerExecutionException import grails.artefact.Artefact -import spock.lang.PendingFeatureIf import spock.lang.Specification /** @@ -34,10 +33,6 @@ import spock.lang.Specification */ class RenderMethodTests extends Specification implements ControllerUnitTest<RenderController> { - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void testRenderFile() { when: controller.render file:"hello".bytes, contentType:"text/plain" diff --git a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/RedirectMethodTests.groovy b/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/RedirectMethodTests.groovy index 5250f8836a..762dec93ae 100644 --- a/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/RedirectMethodTests.groovy +++ b/grails-test-suite-uber/src/test/groovy/org/grails/web/servlet/mvc/RedirectMethodTests.groovy @@ -25,7 +25,6 @@ import org.grails.web.util.GrailsApplicationAttributes import grails.artefact.Artefact import grails.web.mapping.mvc.RedirectEventListener import org.springframework.http.HttpStatus -import spock.lang.PendingFeatureIf import spock.lang.Specification /** @@ -122,10 +121,6 @@ class RedirectMethodTests extends Specification implements UrlMappingsUnitTest<U fired } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void testRedirectAlreadyCalledException() { when: diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/controllers/ControllerExceptionHandlerCompilationErrorsSpec.groovy b/grails-test-suite-web/src/test/groovy/org/grails/web/controllers/ControllerExceptionHandlerCompilationErrorsSpec.groovy index ae4c93c6b3..e8d985c2cf 100644 --- a/grails-test-suite-web/src/test/groovy/org/grails/web/controllers/ControllerExceptionHandlerCompilationErrorsSpec.groovy +++ b/grails-test-suite-web/src/test/groovy/org/grails/web/controllers/ControllerExceptionHandlerCompilationErrorsSpec.groovy @@ -23,7 +23,6 @@ import org.codehaus.groovy.control.MultipleCompilationErrorsException import grails.compiler.ast.ClassInjector import org.grails.compiler.injection.GrailsAwareClassLoader import org.grails.compiler.web.ControllerActionTransformer -import spock.lang.PendingFeatureIf import spock.lang.Specification class ControllerExceptionHandlerCompilationErrorsSpec extends Specification { @@ -39,10 +38,6 @@ class ControllerExceptionHandlerCompilationErrorsSpec extends Specification { gcl.classInjectors = [transformer]as ClassInjector[] } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test multiple exception handlers for the same exception type'() { when: 'Two handlers exist for the same exception type' gcl.parseClass(''' diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/controllers/ControllerExceptionHandlerSpec.groovy b/grails-test-suite-web/src/test/groovy/org/grails/web/controllers/ControllerExceptionHandlerSpec.groovy index 745af44365..66154b9b32 100644 --- a/grails-test-suite-web/src/test/groovy/org/grails/web/controllers/ControllerExceptionHandlerSpec.groovy +++ b/grails-test-suite-web/src/test/groovy/org/grails/web/controllers/ControllerExceptionHandlerSpec.groovy @@ -22,7 +22,6 @@ package org.grails.web.controllers import grails.artefact.Artefact import grails.testing.web.controllers.ControllerUnitTest import grails.web.mapping.mvc.exceptions.CannotRedirectException -import spock.lang.PendingFeatureIf import java.sql.BatchUpdateException import java.sql.SQLException @@ -127,10 +126,6 @@ class ControllerExceptionHandlerSpec extends Specification implements Controller model.problemDescription == 'A Number Was Invalid' } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test throwing an exception that does not have a handler'() { when: params.exceptionToThrow = 'grails.web.mapping.mvc.exceptions.CannotRedirectException' @@ -140,10 +135,6 @@ class ControllerExceptionHandlerSpec extends Specification implements Controller thrown(CannotRedirectException) } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test throwing an exception that does not have a handler and does match a private method in the parent controller'() { when: 'a controller action throws an exception which matches an inherited private method which should not be treated as an exception handler' params.exceptionToThrow = 'java.io.IOException' @@ -153,10 +144,6 @@ class ControllerExceptionHandlerSpec extends Specification implements Controller thrown IOException } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test action throws an exception that does not have a corresponding error handler'() { when: params.exceptionToThrow = 'java.lang.UnsupportedOperationException' @@ -166,10 +153,6 @@ class ControllerExceptionHandlerSpec extends Specification implements Controller thrown UnsupportedOperationException } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test command object action throws an exception that does not have a corresponding error handler'() { when: params.exceptionToThrow = 'java.lang.UnsupportedOperationException' @@ -179,10 +162,6 @@ class ControllerExceptionHandlerSpec extends Specification implements Controller thrown UnsupportedOperationException } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void 'Test typed parameter action throws an exception that does not have a corresponding error handler'() { when: params.exceptionToThrow = 'java.lang.UnsupportedOperationException' diff --git a/grails-test-suite-web/src/test/groovy/org/grails/web/mapping/RegexUrlMappingTests.groovy b/grails-test-suite-web/src/test/groovy/org/grails/web/mapping/RegexUrlMappingTests.groovy index 9d3fdc9ae8..0975ed8bca 100644 --- a/grails-test-suite-web/src/test/groovy/org/grails/web/mapping/RegexUrlMappingTests.groovy +++ b/grails-test-suite-web/src/test/groovy/org/grails/web/mapping/RegexUrlMappingTests.groovy @@ -26,7 +26,6 @@ import grails.web.mapping.UrlMapping import grails.web.mapping.exceptions.UrlMappingException import org.grails.datastore.gorm.validation.constraints.registry.DefaultConstraintRegistry import org.springframework.context.support.StaticMessageSource -import spock.lang.PendingFeatureIf import spock.lang.Specification class RegexUrlMappingTests extends Specification implements UrlMappingsUnitTest<UrlMappings> { @@ -123,10 +122,6 @@ class RegexUrlMappingTests extends Specification implements UrlMappingsUnitTest< m.constraints[0].nullable } - @PendingFeatureIf({ - // thrown() does currently not work with Groovy 5 - GroovySystem.version.startsWith('5') - }) void testCreateUrlFromMapping() { given: def holder = urlMappingsHolder
