Merge pull request #190 from gabilang/enable-choreo-ext-tests

Enable choreo-extension tests
ballerina-platform · Sep 20, 2023 · 9fbdab5 · 9fbdab5
2 parents fa3b16c + 5a4e02b
commit 9fbdab5
Show file tree

Hide file tree

Showing 13 changed files with 142 additions and 117 deletions.
diff --git a/build.gradle b/build.gradle
@@ -91,6 +91,7 @@ subprojects {
         ballerinaStdLibs "io.ballerina.stdlib:file-ballerina:${stdlibFileVersion}"
         ballerinaStdLibs "io.ballerina.stdlib:crypto-ballerina:${stdlibCryptoVersion}"
         ballerinaStdLibs "io.ballerina.stdlib:log-ballerina:${stdlibLogVersion}"
+        ballerinaStdLibs "io.ballerina.stdlib:constraint-ballerina:${stdlibConstraintVersion}"
         ballerinaStdLibs "io.ballerina.stdlib:mime-ballerina:${stdlibMimeVersion}"
         ballerinaStdLibs "io.ballerina.stdlib:cache-ballerina:${stdlibCacheVersion}"
         ballerinaStdLibs "io.ballerina.stdlib:auth-ballerina:${stdlibAuthVersion}"

diff --git a/choreo-extension-ballerina/Dependencies.toml b/choreo-extension-ballerina/Dependencies.toml
@@ -5,12 +5,12 @@
 
 [ballerina]
 dependencies-toml-version = "2"
-distribution-version = "2201.8.0-20230726-145300-b2bdf796"
+distribution-version = "2201.8.0-20230830-220400-8a7556d8"
 
 [[package]]
 org = "ballerina"
 name = "io"
-version = "1.5.0"
+version = "1.6.0"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "lang.value"}
@@ -38,7 +38,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "observe"
-version = "1.1.0"
+version = "1.2.0"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]

diff --git a/choreo-extension-ballerina/build.gradle b/choreo-extension-ballerina/build.gradle
@@ -178,8 +178,15 @@ task ballerinaBuild {
     dependsOn configurations.nativeJar
     dependsOn configurations.externalJars
     dependsOn(":choreo-extension-ballerina:compileJava")
+    dependsOn(":choreo-extension-ballerina:compileTestJava")
     dependsOn(":choreo-extension-ballerina:jar")
     dependsOn(":choreo-extension-ballerina:processResources")
+    dependsOn(":choreo-extension-ballerina:test")
+    dependsOn(":choreo-extension-ballerina:processTestResources")
+    dependsOn(":choreo-extension-ballerina:checkstyleMain")
+    dependsOn(":choreo-extension-ballerina:checkstyleTest")
+    dependsOn(":choreo-extension-ballerina:spotbugsMain")
+    dependsOn(":choreo-extension-ballerina:spotbugsTest")
 
     finalizedBy revertTomlFile
     finalizedBy ":commitTomlFiles"

diff --git a/choreo-extension-tests/src/test/java/io/ballerina/observe/choreo/BaseTestCase.java b/choreo-extension-tests/src/test/java/io/ballerina/observe/choreo/BaseTestCase.java
@@ -150,7 +150,7 @@ public void initializeTestInBaseTestCase() throws IOException {
         for (String call : calls) {
             HttpResponse response = HttpClientRequest.doPost(PERISCOPE_CALLS_SERVICE + "/" + call + "/calls", "[]",
                     Collections.singletonMap("Content-Type", "application/json"));
-            Assert.assertEquals(response.getResponseCode(), 200);
+            Assert.assertEquals(response.getResponseCode(), 201);
         }
     }
 

diff --git a/...o-extension-tests/src/test/java/io/ballerina/observe/choreo/GeneralExtensionTestCase.java b/...o-extension-tests/src/test/java/io/ballerina/observe/choreo/GeneralExtensionTestCase.java
@@ -127,7 +127,8 @@ public void testMissingNodeId() throws Exception {
         Assert.assertEquals(recordedTest.getRegisterCalls().get(0).getRequest().getNodeId(), getNodeIdFromFileSystem());
     }
 
-    @Test(groups = "linux-only")
+    // TODO: Fix this test - tracking issue: #191
+    @Test(groups = "linux-only", enabled = false)
     public void testContainerizedMode() throws Exception {
         Map<String, String> envVars = new HashMap<>();
         envVars.put("CHOREO_EXT_CONTAINERIZED_MODE", "true");

diff --git a/choreo-extension-tests/src/test/resources/bal/choreo_ext_test/Dependencies.toml b/choreo-extension-tests/src/test/resources/bal/choreo_ext_test/Dependencies.toml
@@ -5,34 +5,43 @@
 
 [ballerina]
 dependencies-toml-version = "2"
+distribution-version = "2201.8.0-20230830-220400-8a7556d8"
 
 [[package]]
 org = "ballerina"
 name = "auth"
-version = "2.2.1"
+version = "2.10.0"
 dependencies = [
 	{org = "ballerina", name = "crypto"},
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "lang.array"},
 	{org = "ballerina", name = "lang.string"},
-	{org = "ballerina", name = "log"},
-	{org = "ballerina", name = "regex"}
+	{org = "ballerina", name = "log"}
 ]
 
 [[package]]
 org = "ballerina"
 name = "cache"
-version = "3.2.1"
+version = "3.7.0"
 dependencies = [
+	{org = "ballerina", name = "constraint"},
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "task"},
 	{org = "ballerina", name = "time"}
 ]
 
+[[package]]
+org = "ballerina"
+name = "constraint"
+version = "1.4.0"
+dependencies = [
+	{org = "ballerina", name = "jballerina.java"}
+]
+
 [[package]]
 org = "ballerina"
 name = "crypto"
-version = "2.2.1"
+version = "2.5.0"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "time"}
@@ -41,22 +50,22 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "file"
-version = "1.2.1"
+version = "1.9.0"
 dependencies = [
+	{org = "ballerina", name = "io"},
 	{org = "ballerina", name = "jballerina.java"},
-	{org = "ballerina", name = "log"},
 	{org = "ballerina", name = "os"},
-	{org = "ballerina", name = "regex"},
 	{org = "ballerina", name = "time"}
 ]
 
 [[package]]
 org = "ballerina"
 name = "http"
-version = "2.2.1"
+version = "2.10.0"
 dependencies = [
 	{org = "ballerina", name = "auth"},
 	{org = "ballerina", name = "cache"},
+	{org = "ballerina", name = "constraint"},
 	{org = "ballerina", name = "crypto"},
 	{org = "ballerina", name = "file"},
 	{org = "ballerina", name = "io"},
@@ -65,25 +74,26 @@ dependencies = [
 	{org = "ballerina", name = "lang.array"},
 	{org = "ballerina", name = "lang.decimal"},
 	{org = "ballerina", name = "lang.int"},
+	{org = "ballerina", name = "lang.regexp"},
 	{org = "ballerina", name = "lang.runtime"},
 	{org = "ballerina", name = "lang.string"},
 	{org = "ballerina", name = "lang.value"},
 	{org = "ballerina", name = "log"},
 	{org = "ballerina", name = "mime"},
 	{org = "ballerina", name = "oauth2"},
 	{org = "ballerina", name = "observe"},
-	{org = "ballerina", name = "regex"},
 	{org = "ballerina", name = "time"},
 	{org = "ballerina", name = "url"}
 ]
 modules = [
-	{org = "ballerina", packageName = "http", moduleName = "http"}
+	{org = "ballerina", packageName = "http", moduleName = "http"},
+	{org = "ballerina", packageName = "http", moduleName = "http.httpscerr"}
 ]
 
 [[package]]
 org = "ballerina"
 name = "io"
-version = "1.2.1"
+version = "1.6.0"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "lang.value"}
@@ -97,15 +107,14 @@ version = "0.0.0"
 [[package]]
 org = "ballerina"
 name = "jwt"
-version = "2.2.1"
+version = "2.10.0"
 dependencies = [
 	{org = "ballerina", name = "cache"},
 	{org = "ballerina", name = "crypto"},
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "lang.int"},
 	{org = "ballerina", name = "lang.string"},
 	{org = "ballerina", name = "log"},
-	{org = "ballerina", name = "regex"},
 	{org = "ballerina", name = "time"}
 ]
 
@@ -140,14 +149,24 @@ org = "ballerina"
 name = "lang.int"
 version = "0.0.0"
 dependencies = [
-	{org = "ballerina", name = "jballerina.java"}
+	{org = "ballerina", name = "jballerina.java"},
+	{org = "ballerina", name = "lang.__internal"},
+	{org = "ballerina", name = "lang.object"}
 ]
 
 [[package]]
 org = "ballerina"
 name = "lang.object"
 version = "0.0.0"
 
+[[package]]
+org = "ballerina"
+name = "lang.regexp"
+version = "0.0.0"
+dependencies = [
+	{org = "ballerina", name = "jballerina.java"}
+]
+
 [[package]]
 org = "ballerina"
 name = "lang.runtime"
@@ -164,7 +183,8 @@ org = "ballerina"
 name = "lang.string"
 version = "0.0.0"
 dependencies = [
-	{org = "ballerina", name = "jballerina.java"}
+	{org = "ballerina", name = "jballerina.java"},
+	{org = "ballerina", name = "lang.regexp"}
 ]
 
 [[package]]
@@ -178,7 +198,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "log"
-version = "2.2.1"
+version = "2.9.0"
 dependencies = [
 	{org = "ballerina", name = "io"},
 	{org = "ballerina", name = "jballerina.java"},
@@ -189,7 +209,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "mime"
-version = "2.2.1"
+version = "2.9.0"
 dependencies = [
 	{org = "ballerina", name = "io"},
 	{org = "ballerina", name = "jballerina.java"},
@@ -199,19 +219,20 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "oauth2"
-version = "2.2.1"
+version = "2.10.0"
 dependencies = [
 	{org = "ballerina", name = "cache"},
 	{org = "ballerina", name = "crypto"},
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "log"},
-	{org = "ballerina", name = "time"}
+	{org = "ballerina", name = "time"},
+	{org = "ballerina", name = "url"}
 ]
 
 [[package]]
 org = "ballerina"
 name = "observe"
-version = "1.0.3"
+version = "1.2.0"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
@@ -223,23 +244,16 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "os"
-version = "1.2.1"
-dependencies = [
-	{org = "ballerina", name = "jballerina.java"}
-]
-
-[[package]]
-org = "ballerina"
-name = "regex"
-version = "1.2.1"
+version = "1.8.0"
 dependencies = [
+	{org = "ballerina", name = "io"},
 	{org = "ballerina", name = "jballerina.java"}
 ]
 
 [[package]]
 org = "ballerina"
 name = "task"
-version = "2.2.1"
+version = "2.5.0"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "time"}
@@ -248,15 +262,15 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "time"
-version = "2.2.1"
+version = "2.4.0"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
 
 [[package]]
 org = "ballerina"
 name = "url"
-version = "2.2.1"
+version = "2.4.0"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
@@ -291,7 +305,7 @@ modules = [
 [[package]]
 org = "ballerinax"
 name = "choreo"
-version = "0.4.12"
+version = "0.4.13"
 dependencies = [
 	{org = "ballerina", name = "io"},
 	{org = "ballerina", name = "jballerina.java"},
@@ -301,4 +315,3 @@ modules = [
 	{org = "ballerinax", packageName = "choreo", moduleName = "choreo"}
 ]
 
-