You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by jd...@apache.org on 2026/04/08 04:36:23 UTC
(grails-core) 03/03: GRAILS-11661 - fix unit test metaclass cleanup issue
This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a commit to branch GRAILS-11661
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit b06a58bd0ba237af6194b4850de515e93b954173
Author: Jeff Scott Brown <jb...@pivotal.io>
AuthorDate: Mon Aug 18 14:23:35 2014 -0500
GRAILS-11661 - fix unit test metaclass cleanup issue
Cleaning the registry between test methods without creating a fresh runtime is problematic
---
.../test/runtime/MetaClassCleanerTestPlugin.groovy | 31 ++++++++--------------
.../test/runtime/TestRuntimeJunitAdapter.groovy | 1 +
.../mixin/DomainClassMetaClassCleanupSpec.groovy | 2 ++
3 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/grails-plugin-testing/src/main/groovy/grails/test/runtime/MetaClassCleanerTestPlugin.groovy b/grails-plugin-testing/src/main/groovy/grails/test/runtime/MetaClassCleanerTestPlugin.groovy
index f3772eb5dc..84fd131867 100644
--- a/grails-plugin-testing/src/main/groovy/grails/test/runtime/MetaClassCleanerTestPlugin.groovy
+++ b/grails-plugin-testing/src/main/groovy/grails/test/runtime/MetaClassCleanerTestPlugin.groovy
@@ -30,49 +30,40 @@ import org.codehaus.groovy.grails.cli.support.MetaClassRegistryCleaner
@CompileStatic
public class MetaClassCleanerTestPlugin implements TestPlugin {
private static final String META_CLASS_REGISTRY_LISTENER = "metaClassRegistryListener"
- private static final String PER_TEST_METHOD_META_CLASS_REGISTRY_LISTENER = "perTestMethodMetaClassRegistryListener"
String[] requiredFeatures = []
String[] providedFeatures = ['metaClassCleaner']
int ordinal = 0
- protected void registerMetaClassRegistryWatcher(TestRuntime runtime, String id) {
+ protected void registerMetaClassRegistryWatcher(TestRuntime runtime) {
MetaClassRegistryCleaner metaClassRegistryListener = MetaClassRegistryCleaner.createAndRegister()
- runtime.putValue(id, metaClassRegistryListener)
+ runtime.putValue(META_CLASS_REGISTRY_LISTENER, metaClassRegistryListener)
}
- protected void deregisterMetaClassCleaner(TestRuntime runtime, String id) {
- if (runtime.containsValueFor(id)) {
- MetaClassRegistryCleaner metaClassRegistryListener = (MetaClassRegistryCleaner)runtime.getValue(id)
+ protected void deregisterMetaClassCleaner(TestRuntime runtime) {
+ if (runtime.containsValueFor(META_CLASS_REGISTRY_LISTENER)) {
+ MetaClassRegistryCleaner metaClassRegistryListener = (MetaClassRegistryCleaner)runtime.getValue(META_CLASS_REGISTRY_LISTENER)
MetaClassRegistryCleaner.cleanAndRemove(metaClassRegistryListener)
- runtime.removeValue(id)
+ runtime.removeValue(META_CLASS_REGISTRY_LISTENER)
}
}
public void onTestEvent(TestEvent event) {
TestRuntime runtime=event.runtime
- def someName = event.name
switch(event.name) {
case 'startRuntime':
- registerMetaClassRegistryWatcher(runtime, META_CLASS_REGISTRY_LISTENER)
+ registerMetaClassRegistryWatcher(runtime)
break
case 'closeRuntime':
- deregisterMetaClassCleaner(runtime, META_CLASS_REGISTRY_LISTENER)
+ deregisterMetaClassCleaner(runtime)
break
case 'startFreshRuntime':
- deregisterMetaClassCleaner(runtime, META_CLASS_REGISTRY_LISTENER)
- registerMetaClassRegistryWatcher(runtime, META_CLASS_REGISTRY_LISTENER)
- break
- case 'before':
- registerMetaClassRegistryWatcher(runtime, PER_TEST_METHOD_META_CLASS_REGISTRY_LISTENER)
- break
- case 'after':
- deregisterMetaClassCleaner(runtime, PER_TEST_METHOD_META_CLASS_REGISTRY_LISTENER)
+ deregisterMetaClassCleaner(runtime)
+ registerMetaClassRegistryWatcher(runtime)
break
}
}
public void close(TestRuntime runtime) {
- deregisterMetaClassCleaner(runtime, PER_TEST_METHOD_META_CLASS_REGISTRY_LISTENER)
- deregisterMetaClassCleaner(runtime, META_CLASS_REGISTRY_LISTENER)
+ deregisterMetaClassCleaner(runtime)
}
}
diff --git a/grails-plugin-testing/src/main/groovy/grails/test/runtime/TestRuntimeJunitAdapter.groovy b/grails-plugin-testing/src/main/groovy/grails/test/runtime/TestRuntimeJunitAdapter.groovy
index 9246c4a449..77796f8f35 100644
--- a/grails-plugin-testing/src/main/groovy/grails/test/runtime/TestRuntimeJunitAdapter.groovy
+++ b/grails-plugin-testing/src/main/groovy/grails/test/runtime/TestRuntimeJunitAdapter.groovy
@@ -110,6 +110,7 @@ class TestRuntimeJunitAdapter {
}
protected void after(TestRuntime runtime, Object testInstance, Description description, Throwable throwable) {
+ runtime.publishEvent("resetGrailsApplication", [testInstance: testInstance, description: description, throwable: throwable], [immediateDelivery: true, reverseOrderDelivery: true])
runtime.publishEvent("after", [testInstance: testInstance, description: description, throwable: throwable], [immediateDelivery: true, reverseOrderDelivery: true])
}
diff --git a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassMetaClassCleanupSpec.groovy b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassMetaClassCleanupSpec.groovy
index c3483be67a..b37d240177 100644
--- a/grails-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassMetaClassCleanupSpec.groovy
+++ b/grails-test-suite-uber/src/test/groovy/grails/test/mixin/DomainClassMetaClassCleanupSpec.groovy
@@ -1,10 +1,12 @@
package grails.test.mixin
import grails.persistence.Entity
+import grails.test.runtime.FreshRuntime
import spock.lang.Issue
import spock.lang.Specification
@TestFor(SomeDomainClass)
+@FreshRuntime
class DomainClassMetaClassCleanupSpec extends Specification {
@Issue('GRAILS-11661')