Initial attempt at splitting tests

.circleci/config.yml

@@ -201,6 +201,112 @@ jobs:
       - store_artifacts:
           path: ~/test-results/junit
 
+  intTestsMachine:
+    machine:
+      image: ubuntu-2004:202107-02
+    resource_class: large
+    steps:
+      # The home directory is: /home/circleci/project
+      # gpact is cloned to: /home/circleci/project/.
+      # web3j is cloned to: /home/circleci/web3j-abi
+      - prepare
+      - run:
+          name: Build web3j
+          command: |
+            # Build our Web3j
+            cd ../web3j-abi
+            ./gradlew --parallel --stacktrace --info --build-cache installDist
+      - run:
+          name: Create Relayer containers
+          working_directory: services/relayer
+          command: make docker
+      - run:
+          name: Create Message Store container
+          working_directory: services/message-store
+          command: make docker
+      - run:
+          name: Create and Start blockchains
+          working_directory: test-blockchains
+          background: true
+          command: docker-compose build && docker-compose up
+      - run: sleep 30
+      - run:
+          name: Build and test
+          command: ./gradlew test
+      - run:
+          name: Stop blockchains
+          working_directory: test-blockchains
+          command: docker-compose stop
+          when: always
+      - run:
+          name: Logs from bc31
+          working_directory: test-blockchains
+          command: |
+            docker container logs test-blockchains_bc31node1_1
+          when: always
+      - run:
+          name: Logs from bc32
+          working_directory: test-blockchains
+          command: |
+            docker container logs test-blockchains_bc32node1_1
+          when: always
+      - run:
+          name: Logs from bc33
+          working_directory: test-blockchains
+          command: |
+            docker container logs test-blockchains_bc33node1_1
+          when: always
+      - run:
+          name: Logs from observer1
+          working_directory: test-blockchains
+          command: |
+            docker container logs observer1
+          when: always
+      - run:
+          name: Logs from observer2
+          working_directory: test-blockchains
+          command: |
+            docker container logs observer2
+          when: always
+      - run:
+          name: Logs from observer3
+          working_directory: test-blockchains
+          command: |
+            docker container logs observer3
+          when: always
+      - run:
+          name: Logs from relayer
+          working_directory: test-blockchains
+          command: |
+            docker container logs relayer
+          when: always
+      - run:
+          name: Logs from dispatcher
+          working_directory: test-blockchains
+          command: |
+            docker container logs dispatcher
+          when: always
+      - run:
+          name: Logs from msgstore
+          working_directory: test-blockchains
+          command: |
+            docker container logs msgstore
+          when: always
+      - run:
+          name: Remove blockchains
+          working_directory: test-blockchains
+          command: docker-compose down
+          when: always
+      - run:
+          name: Save test results
+          command: |
+            mkdir -p ~/test-results/junit/
+            find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} ~/test-results/junit/ \;
+          when: always
+      - store_test_results:
+          path: ~/test-results
+      - store_artifacts:
+          path: ~/test-results/junit
 
 
   relayer-build:

build.gradle

@@ -38,6 +38,7 @@ allprojects {
     }
 }
 
+
 ext {
     log4JVersion = '2.17.1'
     okHttpVersion = '4.9.1'
@@ -52,6 +53,59 @@ subprojects {
     test {
         useJUnitPlatform()
     }
+
+    if (file('src/intTest').directory) {
+        sourceSets {
+            intTest {
+                compileClasspath += sourceSets.main.output + sourceSets.main.compileClasspath + sourceSets.test.compileClasspath
+                runtimeClasspath += sourceSets.main.output + sourceSets.main.runtimeClasspath + sourceSets.test.runtimeClasspath
+            }
+        }
+
+        configurations {
+            intTestImplementation.extendsFrom implementation
+            intTestRuntimeOnly.extendsFrom runtimeOnly
+        }
+
+        tasks.register('intTest', Test) {
+            description = 'Runs integration tests.'
+            group = 'verification'
+
+            testClassesDirs = sourceSets.intTest.output.classesDirs
+            classpath = sourceSets.intTest.runtimeClasspath
+            shouldRunAfter test
+            useJUnitPlatform()
+        }
+        check.dependsOn intTest
+    }
+
+    if (file('src/perfTest').directory) {
+        sourceSets {
+            perfTest {
+                compileClasspath += sourceSets.main.output + sourceSets.main.compileClasspath + sourceSets.test.compileClasspath
+                runtimeClasspath += sourceSets.main.output + sourceSets.main.runtimeClasspath + sourceSets.test.runtimeClasspath
+            }
+        }
+
+        configurations {
+            perfTestImplementation.extendsFrom implementation
+            perfTestRuntimeOnly.extendsFrom runtimeOnly
+        }
+
+        tasks.register('perfTest', Test) {
+            description = 'Runs performance tests.'
+            group = 'verification'
+
+            testClassesDirs = sourceSets.perfTest.output.classesDirs
+            classpath = sourceSets.perfTest.runtimeClasspath
+            shouldRunAfter test
+            useJUnitPlatform()
+        }
+        check.dependsOn perfTest
+    }
+
+
+
     dependencies {
         implementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: log4JVersion
         implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: log4JVersion
@@ -71,6 +125,7 @@ subprojects {
     }
 }
 
+
 task solFormat {
     dependsOn npm_run_solFormat
 }

sdk/java/build.gradle

@@ -27,7 +27,6 @@ dependencies {
     testImplementation "io.reactivex.rxjava2:rxjava:${rxJavaVersion}"
 
     testImplementation project (':common-test')
-
 }
 
 

settings.gradle

@@ -6,6 +6,7 @@ include 'contracttest'
 include 'app-gpact-erc20bridge'
 include 'app-sfc-erc20bridge'
 include 'app-sfc-erc721bridge'
+
 include 'examples-helpers'
 include 'examples-gpact-conditional'
 include 'examples-gpact-erc20bridge'
@@ -35,6 +36,7 @@ project(":app-sfc-erc20bridge").projectDir = file("applications/sfc/erc20bridge/
 project(":app-sfc-erc721bridge").projectDir = file("applications/sfc/erc721bridge/javatest")
 
 project(":examples-helpers").projectDir = file("examples/helpers")
+
 project(":examples-gpact-conditional").projectDir = file("examples/gpact/conditional/java")
 project(":examples-gpact-erc20bridge").projectDir = file("examples/gpact/erc20bridge/java")
 project(":examples-gpact-hoteltrain").projectDir = file("examples/gpact/hotel-train/java")
@@ -54,4 +56,3 @@ project(":perf-singlebc-trade").projectDir = file("performance/singlebc/trade/ja
 project(":perf-singlebc-write").projectDir = file("performance/singlebc/write/java")
 
 project(":utils-pkey").projectDir = file("utils/pkey")
-