Config refactors for Spring 3.0 Milestone release (#189)

Co-authored-by: ashakirin <[email protected]>
Co-authored-by: Andrei Shakirin <[email protected]>

Author: sanagaraj-pivotal

.github/workflows/mvn-build.yml

@@ -17,4 +17,4 @@ jobs:
           java-version: '11'
           distribution: 'adopt'
       - name: Build with Maven
-        run: mvn --update-snapshots -DskipITs verify
+        run: mvn --update-snapshots -DtrimStackTrace=false  -Dsurefire.useFile=false -DskipITs verify

applications/spring-shell/pom.xml

@@ -208,25 +208,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.6</version>
-                <executions>
-                    <execution>
-                        <id>process-test-classes</id>
-                        <phase>process-test-classes</phase>
-                        <configuration>
-                            <target>
-                                <chmod file="target/test-classes/testcode/mule-app/prepare.sh" perm="755" />
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>

applications/spring-shell/src/test/java/org/springframework/sbm/BootifySimpleMuleAppIntegrationTest.java

@@ -16,11 +16,8 @@
 package org.springframework.sbm;
 
 import com.rabbitmq.client.Channel;
-import org.jruby.RubyProcess;
 import org.junit.jupiter.api.*;
-import org.junit.jupiter.api.condition.DisabledIfEnvironmentVariable;
 import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
-import org.junit.jupiter.api.condition.DisabledOnOs;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.sbm.mule.amqp.RabbitMqChannelBuilder;
@@ -83,13 +80,6 @@ public static void afterAll() {
         }
     }
 
-    @Test
-    @Tag("integration")
-    @DisabledIfSystemProperty(named= "os.arch", matches = "aarch64", disabledReason = "imbcom/mq image not supported with Apple Silicon")
-    void t1_testWebsphereMqMigration() throws JMSException, InterruptedException {
-        checkWmqIntegration(rabbitMqContainer.getNetwork());
-    }
-
     @Test
     @Tag("integration")
     public void  t0_springIntegrationWorks() throws IOException, TimeoutException, InterruptedException {
@@ -112,10 +102,15 @@ public void  t0_springIntegrationWorks() throws IOException, TimeoutException, I
         checkSendHttpMessage(container.getContainer().getMappedPort(9081));
         checkInboundGatewayHttpMessage(container.getContainer().getMappedPort(9081));
         checkRabbitMqIntegration(ampqChannel);
+        checkDbIntegration(container.getContainer().getMappedPort(9081));
     }
 
-
-
+    @Test
+    @Tag("integration")
+    @DisabledIfSystemProperty(named= "os.arch", matches = "aarch64", disabledReason = "imbcom/mq image not supported with Apple Silicon")
+    void t1_testWebsphereMqMigration() throws JMSException, InterruptedException {
+        checkWmqIntegration(rabbitMqContainer.getNetwork());
+    }
 
     private void checkRabbitMqIntegration(Channel amqpChannel)
             throws IOException, InterruptedException {
@@ -160,6 +155,12 @@ private void checkWmqIntegration(Network rabbitMqNetwork) throws InterruptedExce
         assertThat(latchResult).isTrue();
     }
 
+    private void checkDbIntegration(int port) {
+        ResponseEntity<String> responseEntity = restTemplate.getForEntity("http://localhost:" + port + "/db", String.class);
+        assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
+        assertThat(responseEntity.getBody()).contains("{\"ID\":1,\"USERNAME\":\"TestUser\",\"PASSWORD\":\"secret\"");
+    }
+
     private void checkInboundGatewayHttpMessage(int port) {
         ResponseEntity<String> responseEntity = restTemplate.getForEntity("http://localhost:" + port + "/helloworld", String.class);
         assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);