Fix flaky Spring tests due to schema resolution (#1735)

spockframework · Aug 9, 2023 · f0e2790 · f0e2790
1 parent 54fcb15
commit f0e2790
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 6 deletions.
diff --git a/config/nohttp/allowlist.lines b/config/nohttp/allowlist.lines
@@ -7,3 +7,6 @@
 
 // XMLNS
 ^http://www.spockframework.org/spring$
+
+// Spring schemas from the Spring library classpath
+^http://www.springframework.org/schema/beans/spring-beans-2.5.xsd$
diff --git a/spock-spring/src/test/resources/org/spockframework/spring/InjectionExamples-context.xml b/spock-spring/src/test/resources/org/spockframework/spring/InjectionExamples-context.xml
@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-           https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
   <bean id="myService1" class="org.spockframework.spring.Service1">
     <constructor-arg ref="myService2" />

diff --git a/spock-spring/src/test/resources/org/spockframework/spring/MockExamples-context.xml b/spock-spring/src/test/resources/org/spockframework/spring/MockExamples-context.xml
@@ -3,7 +3,7 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:spock="http://www.spockframework.org/spring"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-           https://www.springframework.org/schema/beans/spring-beans.xsd
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
            http://www.spockframework.org/spring https://www.spockframework.org/spring/spock.xsd">
 
   <spock:mock id="serviceMock" class="org.spockframework.spring.IService1"/>

diff --git a/spock-spring/src/test/resources/org/spockframework/spring/ScopedBeansMock-context.xml b/spock-spring/src/test/resources/org/spockframework/spring/ScopedBeansMock-context.xml
@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-           https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 
   <bean id="service2Request" class="org.spockframework.spring.xml.SpockMockFactoryBean" scope="request">

diff --git a/spock-spring/src/test/resources/org/spockframework/spring/ScopedBeansThrowing-context.xml b/spock-spring/src/test/resources/org/spockframework/spring/ScopedBeansThrowing-context.xml
@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-           https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
   <bean id="service1request" class="org.spockframework.spring.xml.SpockMockFactoryBean" scope="request">
     <constructor-arg value="org.spockframework.spring.IService1"/>

diff --git a/spock-spring/src/test/resources/org/spockframework/spring/TransactionalExample-context.xml b/spock-spring/src/test/resources/org/spockframework/spring/TransactionalExample-context.xml
@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-           https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
   <bean id="dataSource" class="org.springframework.jdbc.datasource.SingleConnectionDataSource">
     <property name="url" value="jdbc:h2:mem:"/>

diff --git a/...ng/src/test/resources/org/spockframework/spring/TransactionalGroovySqlExample-context.xml b/...ng/src/test/resources/org/spockframework/spring/TransactionalGroovySqlExample-context.xml
@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-           https://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
   <bean id="dataSource" class="org.springframework.jdbc.datasource.SingleConnectionDataSource">
     <property name="url" value="jdbc:h2:mem:"/>