Upgrade integration tests to use Postgres instead of H2

CJSCommonPlatform · Dec 11, 2018 · 534df01 · 534df01
1 parent c676a69
commit 534df01
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 87 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,26 +2,35 @@ dist: trusty
 sudo: false
 language: java
 jdk:
-- oraclejdk8
+  - oraclejdk8
 git:
   cache: 3
 cache:
   directories:
-  - "$HOME/.m2"
+    - "$HOME/.m2"
+services:
+  - postgresql
+before_script:
+  - psql -c 'create database frameworkeventstore;' -U postgres
+  - psql -c 'create database frameworkviewstore;' -U postgres
+  - psql -c 'create database frameworkfilestore;' -U postgres
+  - psql -c "CREATE USER framework WITH PASSWORD 'framework';" -U postgres
 addons:
+  postgresql: '9.5'
   sonarcloud:
     organization: cjscommonplatform
     token:
       secure: OQy5H1xpulk1pYF5w5MnHokHoIJI27k+19+GPjQfIHuo4zzBnbVxyiqBgDl4glxY40sWY50fLbBDiZCN/9x96ihsui/q2gPAOppJZpGwQ2PamqwQ0PQpxNqDhTeXzWFzd6zIH+ZasPqdBIGAsjBMzdseHhsJxHxv+ij/+KKmOF1DKmheMULlwv1fIYuWaqXVdtfkoLuZDvrIxxEVhMoz6FTmG0foHQ2YhggTC4dSHvHjN6VzS0YzHrRq1BeYmwF5JGtlC/Wm8mb++9EqftVudvjx2C/eEZ5jRi9/mrrHuslP0CaTg/RUO+i2mBoLQeFzfb3DUu5G+gIheDFHw1hAarQypAXovxooruAN91InCXJMCqc33CZeU1M7eoC3jTyD0dLPIefhS0UMfY28ZgrO/P+X3VlmX0lBBU0tmOoZFtjkH9XdN7BG1avDvfc5NmA7vlPCMJ+BQq/z6qTyxfyAfBs1hBFWKdOWKPozfwBViGo/Wk5v2TRcHDf7Gfi2WktfDE8bK65kHtSbh52obgVSvmAZzDI9qYMeROQdzElO19dDb5r4DrAeAzszZZAJZRDF+PuVwGwbWCncPvPANHTzQ5SV7atMpgXqa4vRaYHYU9FCrEIjmbTzz2DGBz1/66dXvG+1AHXGvZH3qhLh3XBPYy8ikZnxclO54BE7AQVNRfA=
     github_token:
       secure: jatqcNwt1GiQe8wZF4bDjdUvD/0PhYrd07ny0OP4bnDdSxxbOku2No55sikgmYkbtNB07sj8ixv4zzfD0f6pzm4RwEii7CTSqSej8ZYPeOT2RpF8fAWh3a2jCF0p4v9DWV3DfHHjd+636dRPhmtHIrivCdxZgcphZ+pESVmz+okegqzf9sHC9+UoE7ue99l3uWlrDsGw4ODAaSqPuOha8jg1Rmmh17M+/4z0OamNkHpWipw6AV+oK2fqre4tMwuo3DMc3gaVhrRnuf1vQi3TV9dXq+d/jLOFAEA4/E5bAnd1M9ZYRqH8QLiHETb4DGkXBaH+pcbqdIPdwkz7Yo3OEfWTeV0dOya5F9y5XeDkNq1jHKOtjOMFQ1t1W1VVzJd667KJs+XXtFmgwYRBdzOPX8Lq1+OvoM+vLO+2KUBXISodO6XJfj9HZSdKoL2kAiwhOXWMfSqsK4Jf+E3upJKPtrx2hQEXyFPmHHpPTzglnVeFXWwNPZob3Sn778wwZShKVdTsB/THF9KGuVLFUYbJLPGZnI625pCXcr6CA+T/8B0FAVnsXf5S6tRT/rMfbIgDojM0KIAfp/wjDVrwrDVCr4DJrKWfuRcu042MksUphKaC6MWXTgapZCp9OV5aCiUJY17zd3R6uvaL4+fOGBBdSRdt8LwHqkZE/XZaQQGDeX4=
 before_install:
-- git clone https://github.com/CJSCommonPlatform/travis-settings.git target/travis-settings
-- ln -sfT ${PWD}/target/travis-settings/settings.xml ${HOME}/.m2/settings.xml
+  - git clone https://github.com/CJSCommonPlatform/travis-settings.git target/travis-settings
+  - ln -sfT ${PWD}/target/travis-settings/settings.xml ${HOME}/.m2/settings.xml
 install: "${PWD}/target/travis-settings/java/install.sh -e -q -DexcludeGroupIds=uk.gov.justice.service,uk.gov.justice.services"
 script: "${PWD}/target/travis-settings/java/script-install.sh coveralls:report sonar:sonar"
 after_success: "${PWD}/target/travis-settings/java/after_success.sh"
 env:
   global:
-  - secure: XwuDzOLJPJ8Sz2/9cN57nVUoRzW6c6lNboDyveD2ec4fQhOgLdb78yYaV4e7yx31WhXyUX1GeQYKghDGgDluH5jDAeCG91/BrK4KVRAT0AC//34pGnujAJq4pNL7/w0CAcRoQXNLUsdet8tIlkmX4XaM6fokCV4RTdXm0nnICCLQegzvVIBi1Pc2pHKAxpz67aebJHXmC7fTxwtdallm+3KlBgTyhoOfXCTrnyboKYdXMs8tzDP7ro1KzOEVCVhhtR5MZfHCCbPotRewbuX+0WHmXicaBoCZrAxovxaAdjRqC5UuU1iqOV1uXUydg49QxoLy0vfzaLrVz/TQk/ac+YIdJYaR7HTjYp23XJX6i/2Tq4BZPo6EoLc7ERFIleKasJHDiHxYBD6FiWCFe+TPmfHjEsi+pTW/hK3GlLYB9jNM0/6taWiA0aP7Q0rXgRqyuHF1hIelBKHmJBpY+pJpv7IXUNGMmzzRjZX+wbLvODF18DjJpzrai2sBd53tkqBpTjYoFMPLOG9rXpEju92aym/h6I7A8fnCVxsM2Q1a+E7Ahan7YxYMFjz6bzwTg3LuPop0ZzHdJ6/yboAmsTSg2BZvZDFDaQYxPxQEH49NpfMGmN+st1EIl5NSHypO7Kmd7NwWLmymtwraPKurd+yfyp96QO6KQbwuNf71ifSSdiA=
-  - secure: fVz9tjeWQh+1QrA+gMQZiOD/PJz0txejlsg9HFhkiA4NpdXbAIhx8K/FILIAOiiWqo+V2mDYVzULMsPV3ecD4Z0RdeA0iEUZzbzl3w+IXMZpclydML8147AerDOdz2gEM/FybIrATU0ig3VLMYsgU859rKK68TGY8LiA67ad1WNV5ru02Gqc917NSvda/gUoxoZ23qy0kbDFPyElgD8k8oxzCSK1FNNAr03VKInQNGXm4w6YbCSV/VIxKLwsrs05i6zoqHzP1z8wU908KQDsHtjzIA8jEltCm107SfdZIZHRxAW4CpEhOQjMHYtmXrqCBuAkrUdQfzpGaUYtFt8gpsZFKoVwRLHpFSP6iIwQYVJGJdi2Wk015NmnAK+g3hpcypovSDS0OuC/mducMvrxdl5sw9h+FImrgnLAm7UTCfDugeS5vKN5BbJeNapcf8xOPi4oEDXIsdb8Tyq/kJsgoRB5kD90Ig7Mzp559J38YelmSeJSulzPMW2Sp+VAjlcqCLeBMURcg/eH+UTJ9EAk2DV9DJUn0jLNWS1bdY8CpCn10cgcrmNRYWLdUqRIw9cdpVy7jw55kur4KdS2fpEeOvOk3e6UkBYjIwsUacr74cGphswpvJwnYRIYOBbAN2ONceMo/LtU3wdtaIvUvckGvAWYKGzMd0NXraPIK/e0p7c=
+    - PGPORT=5432
+    - secure: XwuDzOLJPJ8Sz2/9cN57nVUoRzW6c6lNboDyveD2ec4fQhOgLdb78yYaV4e7yx31WhXyUX1GeQYKghDGgDluH5jDAeCG91/BrK4KVRAT0AC//34pGnujAJq4pNL7/w0CAcRoQXNLUsdet8tIlkmX4XaM6fokCV4RTdXm0nnICCLQegzvVIBi1Pc2pHKAxpz67aebJHXmC7fTxwtdallm+3KlBgTyhoOfXCTrnyboKYdXMs8tzDP7ro1KzOEVCVhhtR5MZfHCCbPotRewbuX+0WHmXicaBoCZrAxovxaAdjRqC5UuU1iqOV1uXUydg49QxoLy0vfzaLrVz/TQk/ac+YIdJYaR7HTjYp23XJX6i/2Tq4BZPo6EoLc7ERFIleKasJHDiHxYBD6FiWCFe+TPmfHjEsi+pTW/hK3GlLYB9jNM0/6taWiA0aP7Q0rXgRqyuHF1hIelBKHmJBpY+pJpv7IXUNGMmzzRjZX+wbLvODF18DjJpzrai2sBd53tkqBpTjYoFMPLOG9rXpEju92aym/h6I7A8fnCVxsM2Q1a+E7Ahan7YxYMFjz6bzwTg3LuPop0ZzHdJ6/yboAmsTSg2BZvZDFDaQYxPxQEH49NpfMGmN+st1EIl5NSHypO7Kmd7NwWLmymtwraPKurd+yfyp96QO6KQbwuNf71ifSSdiA=
+    - secure: fVz9tjeWQh+1QrA+gMQZiOD/PJz0txejlsg9HFhkiA4NpdXbAIhx8K/FILIAOiiWqo+V2mDYVzULMsPV3ecD4Z0RdeA0iEUZzbzl3w+IXMZpclydML8147AerDOdz2gEM/FybIrATU0ig3VLMYsgU859rKK68TGY8LiA67ad1WNV5ru02Gqc917NSvda/gUoxoZ23qy0kbDFPyElgD8k8oxzCSK1FNNAr03VKInQNGXm4w6YbCSV/VIxKLwsrs05i6zoqHzP1z8wU908KQDsHtjzIA8jEltCm107SfdZIZHRxAW4CpEhOQjMHYtmXrqCBuAkrUdQfzpGaUYtFt8gpsZFKoVwRLHpFSP6iIwQYVJGJdi2Wk015NmnAK+g3hpcypovSDS0OuC/mducMvrxdl5sw9h+FImrgnLAm7UTCfDugeS5vKN5BbJeNapcf8xOPi4oEDXIsdb8Tyq/kJsgoRB5kD90Ig7Mzp559J38YelmSeJSulzPMW2Sp+VAjlcqCLeBMURcg/eH+UTJ9EAk2DV9DJUn0jLNWS1bdY8CpCn10cgcrmNRYWLdUqRIw9cdpVy7jw55kur4KdS2fpEeOvOk3e6UkBYjIwsUacr74cGphswpvJwnYRIYOBbAN2ONceMo/LtU3wdtaIvUvckGvAWYKGzMd0NXraPIK/e0p7c=
diff --git a/event-tool/pom.xml b/event-tool/pom.xml
@@ -55,8 +55,8 @@
         </dependency>
 
         <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
         </dependency>
 
         <dependency>

diff --git a/pom.xml b/pom.xml
@@ -30,7 +30,6 @@
 
         <wildfly.swarm.version>2017.11.0</wildfly.swarm.version>
         <version.swarm.fraction-plugin>77</version.swarm.fraction-plugin>
-        <com.h2database.version>1.4.187</com.h2database.version>
         <junit-dataprovider.version>1.13.1</junit-dataprovider.version>
     </properties>
 

diff --git a/stream-transformation-test/stream-transformation-it/pom.xml b/stream-transformation-test/stream-transformation-it/pom.xml
@@ -40,8 +40,8 @@
             <version>${framework.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -69,36 +69,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>com.edugility</groupId>
-                <artifactId>h2-maven-plugin</artifactId>
-                <configuration>
-                    <port>8092</port>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>Spawn a new H2 TCP server</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>spawn</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>Stop a spawned H2 TCP server</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>stop</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.h2database</groupId>
-                        <artifactId>h2</artifactId>
-                        <version>${com.h2database.version}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>

diff --git a/stream-transformation-test/stream-transformation-it/src/test/resources/standalone-ds.xml b/stream-transformation-test/stream-transformation-it/src/test/resources/standalone-ds.xml
@@ -129,33 +129,45 @@
                 <datasource jndi-name="java:/app/event-tool/DS.eventstore"
                             pool-name="DS.event-tool.eventstore" enabled="true"
                             use-java-context="true">
-                    <connection-url>jdbc:h2:tcp://localhost:8092/mem:eventstore;MVCC=true</connection-url>
-                    <driver>h2</driver>
+                    <connection-url>jdbc:postgresql://localhost:5432/frameworkeventstore</connection-url>
+                    <driver>postgres</driver>
                     <pool>
                         <min-pool-size>3</min-pool-size>
                         <max-pool-size>3</max-pool-size>
                         <prefill>true</prefill>
                     </pool>
                     <security>
-                        <user-name>sa</user-name>
-                        <password>sa</password>
+                        <user-name>framework</user-name>
+                        <password>framework</password>
                     </security>
                 </datasource>
-                <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
-                    <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
-                    <driver>h2</driver>
+                <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true"
+                            use-java-context="true">
+                    <connection-url>jdbc:postgresql://localhost:5432/frameworkeventstore</connection-url>
+                    <driver>postgres</driver>
+                    <pool>
+                        <min-pool-size>3</min-pool-size>
+                        <max-pool-size>3</max-pool-size>
+                        <prefill>true</prefill>
+                    </pool>
                     <security>
-                        <user-name>sa</user-name>
-                        <password>sa</password>
+                        <user-name>framework</user-name>
+                        <password>framework</password>
                     </security>
+                    <validation>
+                        <check-valid-connection-sql>select 1</check-valid-connection-sql>
+                    </validation>
                 </datasource>
                 <drivers>
-                    <driver name="h2" module="com.h2database.h2">
-                        <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
+                    <driver name="postgres" module="org.postgresql">
+                        <driver-class>org.postgresql.Driver</driver-class>
+                        <xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class>
                     </driver>
                 </drivers>
             </datasources>
         </subsystem>
+
+
         <subsystem xmlns="urn:jboss:domain:ejb3:4.0">
             <session-bean>
                 <stateless>
@@ -265,4 +277,4 @@
         <socket-binding name="txn-recovery-environment" port="4713"/>
         <socket-binding name="txn-status-manager" port="4714"/>
     </socket-binding-group>
-</server>
+</server>
diff --git a/stream-transformation-test/stream-transformation-it/src/test/resources/test.properties b/stream-transformation-test/stream-transformation-it/src/test/resources/test.properties
@@ -1,8 +1,8 @@
-db.eventstore.url=jdbc:h2:tcp://localhost:8092/mem:eventstore;MVCC=true
-db.eventstore.userName=sa
-db.eventstore.password=sa
+db.eventstore.url=jdbc:postgresql://localhost/frameworkeventstore
+db.eventstore.userName=framework
+db.eventstore.password=framework
 
-db.driver=org.h2.Driver
+db.driver=org.postgresql.Driver
 
 #Set to 'true' and remote connect on port 5005
 swarm.debug.enabled=false

diff --git a/stream-transformation-test/stream-transformation-performance-test/pom.xml b/stream-transformation-test/stream-transformation-performance-test/pom.xml
@@ -30,36 +30,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>com.edugility</groupId>
-                <artifactId>h2-maven-plugin</artifactId>
-                <configuration>
-                    <port>8092</port>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>Spawn a new H2 TCP server</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>spawn</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>Stop a spawned H2 TCP server</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>stop</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.h2database</groupId>
-                        <artifactId>h2</artifactId>
-                        <version>${com.h2database.version}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>