From 85233964b013351447373c3c61eb8d5d5e4bc4b6 Mon Sep 17 00:00:00 2001 From: Jeff Brown Date: Tue, 27 Mar 2012 16:44:57 -0500 Subject: [PATCH] Revert "fix failing tests" This reverts commit 07cc6f4e735217ebbd42a48328fd4d613999493b. --- .../web/pages/ext/jsp/GroovyPageWithJSPTagsTests.groovy | 4 ++-- .../grails/web/pages/ext/jsp/IterativeJspTagTests.groovy | 2 +- .../web/pages/ext/jsp/MockRootLoaderTagLibraryResolver.groovy | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/ext/jsp/GroovyPageWithJSPTagsTests.groovy b/grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/ext/jsp/GroovyPageWithJSPTagsTests.groovy index b92a8b913ee..06ad0e1f7ae 100644 --- a/grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/ext/jsp/GroovyPageWithJSPTagsTests.groovy +++ b/grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/ext/jsp/GroovyPageWithJSPTagsTests.groovy @@ -20,9 +20,9 @@ class GroovyPageWithJSPTagsTests extends AbstractGrailsTagTests { GroovySystem.metaClassRegistry.removeMetaClass MockHttpServletRequest TagLibraryResolver.metaClass.resolveRootLoader = {-> def rootLoader = new RootLoader([] as URL[], Thread.currentThread().getContextClassLoader()) - def res = new FileSystemResource("../lib/taglibs/standard/1.1.2/jars/standard-1.1.2.jar") + def res = new FileSystemResource("../lib/taglibs/standard/1.1.2/jar/standard-1.1.2.jar") rootLoader.addURL res.getURL() - resolver.getResources("file:../lib/org.springframework/spring-web*/*/jars/*.jar").each { + resolver.getResources("file:../lib/org.springframework/spring-web*/*/jar/*.jar").each { rootLoader.addURL it.getURL() } return rootLoader diff --git a/grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/ext/jsp/IterativeJspTagTests.groovy b/grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/ext/jsp/IterativeJspTagTests.groovy index 190d0acc588..a68e081d22e 100644 --- a/grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/ext/jsp/IterativeJspTagTests.groovy +++ b/grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/ext/jsp/IterativeJspTagTests.groovy @@ -32,7 +32,7 @@ class IterativeJspTagTests extends GroovyTestCase { TagLibraryResolver.metaClass.resolveRootLoader = {-> def rootLoader = new RootLoader([] as URL[], Thread.currentThread().getContextClassLoader()) - def res = new FileSystemResource("../lib/taglibs/standard/1.1.2/jars/standard-1.1.2.jar") + def res = new FileSystemResource("../lib/taglibs/standard/1.1.2/jar/standard-1.1.2.jar") rootLoader.addURL res.getURL() return rootLoader } diff --git a/grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/ext/jsp/MockRootLoaderTagLibraryResolver.groovy b/grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/ext/jsp/MockRootLoaderTagLibraryResolver.groovy index 10c73d93716..912bafd9b18 100644 --- a/grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/ext/jsp/MockRootLoaderTagLibraryResolver.groovy +++ b/grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/pages/ext/jsp/MockRootLoaderTagLibraryResolver.groovy @@ -13,7 +13,7 @@ class MockRootLoaderTagLibraryResolver extends TagLibraryResolver { protected RootLoader resolveRootLoader() { def rootLoader = new RootLoader([] as URL[], Thread.currentThread().getContextClassLoader()) - def res = new FileSystemResource("../lib/taglibs/standard/1.1.2/jars/standard-1.1.2.jar") + def res = new FileSystemResource("../lib/taglibs/standard/1.1.2/jar/standard-1.1.2.jar") rootLoader.addURL res.getURL() return rootLoader }