Merge pull request #7552 from mandy-chessell/code2023

Add tests to gradle build
odpi · Mar 22, 2023 · adb4243 · adb4243
2 parents 901c884 + 21860ea
commit adb4243
Show file tree

Hide file tree

Showing 6 changed files with 184 additions and 186 deletions.
diff --git a/open-metadata-test/open-metadata-fvt/access-services-fvt/community-profile-fvt/build.gradle b/open-metadata-test/open-metadata-fvt/access-services-fvt/community-profile-fvt/build.gradle
@@ -26,7 +26,7 @@ dependencies {
     testImplementation project(':open-metadata-distribution:open-metadata-assemblies')
     testImplementation 'org.junit.jupiter:junit-jupiter-api'
     testImplementation 'org.junit.jupiter:junit-jupiter-engine'
-    compile localGroovy()
+    testImplementation localGroovy()
     compileOnly 'com.fasterxml.jackson.core:jackson-annotations'
     testImplementation("org.junit.jupiter:junit-jupiter-params")
     implementation project(':open-metadata-implementation:adapters:authentication-plugins:http-helper')
@@ -35,13 +35,12 @@ dependencies {
 
 }
 
-description = 'ProjectProperties Profile OMAS FVT'
+description = 'Community Profile OMAS FVT'
 
 java {
     withJavadocJar()
 }
 
-
 // Local properties to use
 ext
         {
@@ -73,7 +72,6 @@ task startServer(dependsOn: ['cleanData',':open-metadata-distribution:open-metad
     stopAfter = test
     waitForPort = 10441
     timeout = 180
-
     //waitForOutput = 'has started'
 }
 
@@ -85,23 +83,11 @@ task configServer(dependsOn: ['startServer','classes'], type: JavaExec) {
     systemProperties = [
             'name': 'Egeria chassis',
             'baseURL': 'https://localhost:10441',
-            'servermem': 'serverinmem',
-            'delay': '2',
+            'server': 'fvtServer',
             'user': 'testUser'
     ]
 }
 
-task prepareDirs {
-    mustRunAfter clean
-    doLast {
-        mkdir layout.buildDirectory.dir('run')
-    }
-}
-
-task cleanData(type: Delete) {
-    delete files("${buildDir}/run/data")
-}
-
 // The actual tests (Integration only)
 test {
     description 'Run Integration Tests'
@@ -113,7 +99,18 @@ test {
     useJUnitPlatform()
     testLogging.showStandardStreams = true
     dependsOn configServer
-errorOutput = layout.buildDirectory.file("chassis-error.log")
+
+}
+
+task prepareDirs {
+    mustRunAfter clean
+    doLast {
+        mkdir layout.buildDirectory.dir('run')
+    }
+}
+
+task cleanData(type: Delete) {
+    delete files("${buildDir}/run/data")
 }
 
 // Resolves logging conflict with Jena

diff --git a/open-metadata-test/open-metadata-fvt/access-services-fvt/discovery-engine-fvt/build.gradle b/open-metadata-test/open-metadata-fvt/access-services-fvt/discovery-engine-fvt/build.gradle
@@ -18,16 +18,18 @@ dependencies {
     implementation project(':open-metadata-implementation:access-services:discovery-engine:discovery-engine-client')
     implementation project(':open-metadata-implementation:frameworks:audit-log-framework')
     implementation project(':open-metadata-implementation:frameworks:open-connector-framework')
+    implementation project(':open-metadata-implementation:frameworks:open-discovery-framework')
     implementation project(':open-metadata-implementation:repository-services:repository-services-apis')
     implementation project(':open-metadata-implementation:admin-services:admin-services-api')
     implementation project(':open-metadata-implementation:common-services:ffdc-services')
+    implementation project(':open-metadata-implementation:framework-services:ocf-metadata-management:ocf-metadata-api')
     implementation project(':open-metadata-implementation:framework-services:ocf-metadata-management:ocf-metadata-client')
     implementation project(':open-metadata-test:open-metadata-fvt:fvt-utilities')
     compileOnly 'com.fasterxml.jackson.core:jackson-annotations'
     testImplementation project(':open-metadata-distribution:open-metadata-assemblies')
     testImplementation 'org.junit.jupiter:junit-jupiter-api'
     testImplementation 'org.junit.jupiter:junit-jupiter-engine'
-    compile localGroovy()
+    testImplementation localGroovy()
     compileOnly 'com.fasterxml.jackson.core:jackson-annotations'
     testImplementation("org.junit.jupiter:junit-jupiter-params")
     implementation project(':open-metadata-implementation:adapters:authentication-plugins:http-helper')
@@ -42,7 +44,6 @@ java {
     withJavadocJar()
 }
 
-
 // Local properties to use
 ext
         {
@@ -74,7 +75,6 @@ task startServer(dependsOn: ['cleanData',':open-metadata-distribution:open-metad
     stopAfter = test
     waitForPort = 10450
     timeout = 180
-
     //waitForOutput = 'has started'
 }
 
@@ -86,23 +86,11 @@ task configServer(dependsOn: ['startServer','classes'], type: JavaExec) {
     systemProperties = [
             'name': 'Egeria chassis',
             'baseURL': 'https://localhost:10450',
-            'servermem': 'serverinmem',
-            'delay': '2',
+            'server': 'fvtServer',
             'user': 'testUser'
     ]
 }
 
-task prepareDirs {
-    mustRunAfter clean
-    doLast {
-        mkdir layout.buildDirectory.dir('run')
-    }
-}
-
-task cleanData(type: Delete) {
-    delete files("${buildDir}/run/data")
-}
-
 // The actual tests (Integration only)
 test {
     description 'Run Integration Tests'
@@ -117,6 +105,17 @@ test {
 
 }
 
+task prepareDirs {
+    mustRunAfter clean
+    doLast {
+        mkdir layout.buildDirectory.dir('run')
+    }
+}
+
+task cleanData(type: Delete) {
+    delete files("${buildDir}/run/data")
+}
+
 // Resolves logging conflict with Jena
 loggingCapabilities {
     enforceLogback()// Configuration goes here

diff --git a/open-metadata-test/open-metadata-fvt/access-services-fvt/governance-engine-fvt/build.gradle b/open-metadata-test/open-metadata-fvt/access-services-fvt/governance-engine-fvt/build.gradle
@@ -22,12 +22,14 @@ dependencies {
     implementation project(':open-metadata-implementation:admin-services:admin-services-api')
     implementation project(':open-metadata-implementation:common-services:ffdc-services')
     implementation project(':open-metadata-implementation:framework-services:ocf-metadata-management:ocf-metadata-client')
+    implementation project(':open-metadata-implementation:framework-services:gaf-metadata-management:gaf-metadata-api')
+    implementation project(':open-metadata-implementation:framework-services:gaf-metadata-management:gaf-metadata-client')
     implementation project(':open-metadata-test:open-metadata-fvt:fvt-utilities')
     compileOnly 'com.fasterxml.jackson.core:jackson-annotations'
     testImplementation project(':open-metadata-distribution:open-metadata-assemblies')
     testImplementation 'org.junit.jupiter:junit-jupiter-api'
     testImplementation 'org.junit.jupiter:junit-jupiter-engine'
-    compile localGroovy()
+    testImplementation localGroovy()
     compileOnly 'com.fasterxml.jackson.core:jackson-annotations'
     testImplementation("org.junit.jupiter:junit-jupiter-params")
     implementation project(':open-metadata-implementation:adapters:authentication-plugins:http-helper')
@@ -42,7 +44,6 @@ java {
     withJavadocJar()
 }
 
-
 // Local properties to use
 ext
         {
@@ -74,7 +75,6 @@ task startServer(dependsOn: ['cleanData',':open-metadata-distribution:open-metad
     stopAfter = test
     waitForPort = 10451
     timeout = 180
-
     //waitForOutput = 'has started'
 }
 
@@ -86,23 +86,11 @@ task configServer(dependsOn: ['startServer','classes'], type: JavaExec) {
     systemProperties = [
             'name': 'Egeria chassis',
             'baseURL': 'https://localhost:10451',
-            'servermem': 'serverinmem',
-            'delay': '2',
+            'server': 'fvtServer',
             'user': 'testUser'
     ]
 }
 
-task prepareDirs {
-    mustRunAfter clean
-    doLast {
-        mkdir layout.buildDirectory.dir('run')
-    }
-}
-
-task cleanData(type: Delete) {
-    delete files("${buildDir}/run/data")
-}
-
 // The actual tests (Integration only)
 test {
     description 'Run Integration Tests'
@@ -117,6 +105,17 @@ test {
 
 }
 
+task prepareDirs {
+    mustRunAfter clean
+    doLast {
+        mkdir layout.buildDirectory.dir('run')
+    }
+}
+
+task cleanData(type: Delete) {
+    delete files("${buildDir}/run/data")
+}
+
 // Resolves logging conflict with Jena
 loggingCapabilities {
     enforceLogback()// Configuration goes here