Fix tests to work with latest 7.3 image

PavelDrobek · osnipso · commit 6a38620303c1 · 2020-06-16T11:52:20.000-03:00
diff --git a/services/functional-tests/maven-settings.xml b/services/functional-tests/maven-settings.xml
@@ -21,12 +21,28 @@
 
     <profiles>
         <!-- Configure the JBoss GA Maven repository -->
+	<profile>
+            <id>public-repository</id>
+            <repositories>
+                <repository>
+                    <id>central</id>
+                    <url>https://repo1.maven.org/maven2</url>
+                    <releases>
+                        <enabled>true</enabled>
+                        <updatePolicy>never</updatePolicy>
+                    </releases>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                </repository>
+            </repositories>
+        </profile>
         <profile>
             <id>jboss-ga-repository</id>
             <repositories>
                 <repository>
                     <id>jboss-ga-repository</id>
-                    <url>http://maven.repository.redhat.com/techpreview/all</url>
+                    <url>https://maven.repository.redhat.com/techpreview/all</url>
                     <releases>
                         <enabled>true</enabled>
                     </releases>
@@ -38,7 +54,7 @@
             <pluginRepositories>
                 <pluginRepository>
                     <id>jboss-ga-plugin-repository</id>
-                    <url>http://maven.repository.redhat.com/techpreview/all</url>
+                    <url>https://maven.repository.redhat.com/techpreview/all</url>
                     <releases>
                         <enabled>true</enabled>
                     </releases>
@@ -81,8 +97,9 @@
 
     <activeProfiles>
         <!-- Optionally, make the repositories active by default -->
+        <activeProfile>public-repository</activeProfile>
         <activeProfile>jboss-ga-repository</activeProfile>
         <activeProfile>jboss-earlyaccess-repository</activeProfile>
     </activeProfiles>
 
-</settings>
+</settings>
diff --git a/services/functional-tests/pom.xml b/services/functional-tests/pom.xml
@@ -11,7 +11,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <version.arquillian.bom>1.4.0.Final</version.arquillian.bom>
-        <version.infinispan.bom>8.5.2.Final-redhat-00001</version.infinispan.bom>
+        <version.infinispan.bom>9.4.6.Final-redhat-00002</version.infinispan.bom>
         <openshift-client.version>4.0.4</openshift-client.version>
         <arquillian-cube-openshift.version>1.17.1</arquillian-cube-openshift.version>
         <assertj-core.version>3.11.1</assertj-core.version>
@@ -137,10 +137,8 @@
                     <trimStackTrace>false</trimStackTrace>
                     <forkMode>once</forkMode>
                     <systemPropertyVariables>
-                        <https.protocols>TLSv1.2</https.protocols>
                         <!--Custom DNS resolver for OpenShift routes-->
-                        <sun.net.spi.nameservice.provider.1>dns,CEArquillianNameService
-                        </sun.net.spi.nameservice.provider.1>
+                        <sun.net.spi.nameservice.provider.1>dns,sun</sun.net.spi.nameservice.provider.1>
                         <sun.net.spi.nameservice.provider.2>default</sun.net.spi.nameservice.provider.2>
                         <org.apache.maven.user-settings>${org.apache.maven.user-settings}
                         </org.apache.maven.user-settings>
diff --git a/services/functional-tests/src/test/java/org/infinispan/online/service/caching/CachingServiceTest.java b/services/functional-tests/src/test/java/org/infinispan/online/service/caching/CachingServiceTest.java
@@ -43,7 +43,6 @@
 @RunWith(ArquillianConditionalRunner.class)
 @RequiresOpenshift
 public class CachingServiceTest {
-
    private static final String SERVICE_NAME = "cache-service";
 
    private URL restService;
@@ -60,7 +59,8 @@ public static Archive<?> deploymentApp() {
             .addPackage(CachingServiceTest.class.getPackage())
             .addPackage(ReadinessCheck.class.getPackage())
             .addPackage(ScalingTester.class.getPackage())
-            .addPackage(HotRodTester.class.getPackage());
+            .addPackage(HotRodTester.class.getPackage())
+            .addAsWebInfResource("jboss-deployment-structure.xml", "jboss-deployment-structure.xml");
    }
 
    @Before
diff --git a/services/functional-tests/src/test/java/org/infinispan/online/service/common/BasePermanentCacheTest.java b/services/functional-tests/src/test/java/org/infinispan/online/service/common/BasePermanentCacheTest.java
@@ -45,7 +45,8 @@ public static Archive<?> deploymentApp() {
          .addPackage(ReadinessCheck.class.getPackage())
          .addPackage(ScalingTester.class.getPackage())
          .addPackage(HotRodTester.class.getPackage())
-         .addPackage(BasePermanentCacheTest.class.getPackage());
+         .addPackage(BasePermanentCacheTest.class.getPackage())
+         .addAsWebInfResource("jboss-deployment-structure.xml", "jboss-deployment-structure.xml");
    }
 
    @Before
diff --git a/services/functional-tests/src/test/java/org/infinispan/online/service/datagrid/DatagridServiceTest.java b/services/functional-tests/src/test/java/org/infinispan/online/service/datagrid/DatagridServiceTest.java
@@ -47,7 +47,8 @@ public static Archive<?> deploymentApp() {
          .addPackage(DatagridServiceTest.class.getPackage())
          .addPackage(ReadinessCheck.class.getPackage())
          .addPackage(ScalingTester.class.getPackage())
-         .addPackage(HotRodTester.class.getPackage());
+         .addPackage(HotRodTester.class.getPackage())
+         .addAsWebInfResource("jboss-deployment-structure.xml", "jboss-deployment-structure.xml");
    }
 
    @Before
diff --git a/services/functional-tests/src/test/java/org/infinispan/online/service/datagrid/PersistedDataSurvivesTest.java b/services/functional-tests/src/test/java/org/infinispan/online/service/datagrid/PersistedDataSurvivesTest.java
@@ -43,7 +43,8 @@ public static Archive<?> deploymentApp() {
          .addAsLibraries(DeploymentHelper.testLibs())
          .addPackage(ReadinessCheck.class.getPackage())
          .addPackage(ScalingTester.class.getPackage())
-         .addPackage(HotRodTester.class.getPackage());
+         .addPackage(HotRodTester.class.getPackage())
+         .addAsWebInfResource("jboss-deployment-structure.xml", "jboss-deployment-structure.xml");
    }
 
    @Before
diff --git a/services/functional-tests/src/test/java/org/infinispan/online/service/datagrid/PersistedIndexSurvivesTest.java b/services/functional-tests/src/test/java/org/infinispan/online/service/datagrid/PersistedIndexSurvivesTest.java
@@ -72,7 +72,8 @@ public static Archive<?> deploymentApp() {
          .addPackage(ReadinessCheck.class.getPackage())
          .addPackage(ScalingTester.class.getPackage())
          .addPackage(HotRodTester.class.getPackage())
-         .addPackage(AnalyzerTestEntity.class.getPackage());
+         .addPackage(AnalyzerTestEntity.class.getPackage())
+         .addAsWebInfResource("jboss-deployment-structure.xml", "jboss-deployment-structure.xml");
    }
 
    @Before
diff --git a/services/functional-tests/src/test/resources/jboss-deployment-structure.xml b/services/functional-tests/src/test/resources/jboss-deployment-structure.xml
@@ -0,0 +1,11 @@
+<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.1">
+    <deployment>
+        <dependencies>
+            <system export="true">
+                <paths>
+                    <path name="sun/reflect"/>
+                </paths>
+            </system>
+        </dependencies>
+    </deployment>
+</jboss-deployment-structure>

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,8 @@ public static Archive<?> deploymentApp() {`
`45`	`45`	`.addPackage(ReadinessCheck.class.getPackage())`
`46`	`46`	`.addPackage(ScalingTester.class.getPackage())`
`47`	`47`	`.addPackage(HotRodTester.class.getPackage())`
`48`		`- .addPackage(BasePermanentCacheTest.class.getPackage());`
	`48`	`+ .addPackage(BasePermanentCacheTest.class.getPackage())`
	`49`	`+ .addAsWebInfResource("jboss-deployment-structure.xml", "jboss-deployment-structure.xml");`
`49`	`50`	`}`
`50`	`51`
`51`	`52`	`@Before`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,8 @@ public static Archive<?> deploymentApp() {`
`47`	`47`	`.addPackage(DatagridServiceTest.class.getPackage())`
`48`	`48`	`.addPackage(ReadinessCheck.class.getPackage())`
`49`	`49`	`.addPackage(ScalingTester.class.getPackage())`
`50`		`- .addPackage(HotRodTester.class.getPackage());`
	`50`	`+ .addPackage(HotRodTester.class.getPackage())`
	`51`	`+ .addAsWebInfResource("jboss-deployment-structure.xml", "jboss-deployment-structure.xml");`
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`@Before`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,8 @@ public static Archive<?> deploymentApp() {`
`43`	`43`	`.addAsLibraries(DeploymentHelper.testLibs())`
`44`	`44`	`.addPackage(ReadinessCheck.class.getPackage())`
`45`	`45`	`.addPackage(ScalingTester.class.getPackage())`
`46`		`- .addPackage(HotRodTester.class.getPackage());`
	`46`	`+ .addPackage(HotRodTester.class.getPackage())`
	`47`	`+ .addAsWebInfResource("jboss-deployment-structure.xml", "jboss-deployment-structure.xml");`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`@Before`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,8 @@ public static Archive<?> deploymentApp() {`
`72`	`72`	`.addPackage(ReadinessCheck.class.getPackage())`
`73`	`73`	`.addPackage(ScalingTester.class.getPackage())`
`74`	`74`	`.addPackage(HotRodTester.class.getPackage())`
`75`		`- .addPackage(AnalyzerTestEntity.class.getPackage());`
	`75`	`+ .addPackage(AnalyzerTestEntity.class.getPackage())`
	`76`	`+ .addAsWebInfResource("jboss-deployment-structure.xml", "jboss-deployment-structure.xml");`
`76`	`77`	`}`
`77`	`78`
`78`	`79`	`@Before`