Merge pull request #21493 from riyafa/fix-test

Fix MetricsTestCase broken by jballerina migration
ballerina-platform · Mar 5, 2020 · e4643c3 · e4643c3
2 parents f32b81b + ae86e8c
commit e4643c3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/...a-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmObservabilityGen.java b/...a-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmObservabilityGen.java
@@ -59,12 +59,15 @@ static void emitStartObservationInvocation(MethodVisitor mv, int strandIndex, St
     }
 
     private static String cleanUpServiceName(String serviceName) {
-
-        String finalString = serviceName;
-        if (serviceName.contains("$$service$")) {
-            finalString = serviceName.replace("$$service$", "_");
+        final String serviceIdentifier = "$$service$";
+        if (serviceName.contains(serviceIdentifier)) {
+            if (serviceName.contains("$anonService$")) {
+                return serviceName.replace(serviceIdentifier, "_");
+            } else {
+                return serviceName.substring(0, serviceName.lastIndexOf(serviceIdentifier));
+            }
         }
-        return finalString;
+        return serviceName;
     }
 
     static String getFullQualifiedRemoteFunctionName(String moduleOrg, String moduleName, String funcName) {

diff --git a/...tion-test/src/test/java/org/ballerinalang/test/observability/metrics/MetricsTestCase.java b/...tion-test/src/test/java/org/ballerinalang/test/observability/metrics/MetricsTestCase.java
@@ -72,7 +72,7 @@ private void setup() throws Exception {
         addMetrics();
     }
 
-    @Test (groups = "brokenOnJBallerina")
+    @Test
     public void testMetrics() throws Exception {
         // Test Service
         await().atMost(20, TimeUnit.SECONDS)

diff --git a/tests/jballerina-integration-test/src/test/resources/testng.xml b/tests/jballerina-integration-test/src/test/resources/testng.xml
@@ -294,11 +294,6 @@
 
     <test name="ballerina-observability-tests" parallel="false">
         <parameter name="enableJBallerinaTests" value="true"/>
-        <groups>
-            <run>
-                <exclude name="brokenOnJBallerina"/>
-            </run>
-        </groups>
         <classes>
             <class name="org.ballerinalang.test.observability.tracing.TracingTestCase"/>
             <class name="org.ballerinalang.test.observability.metrics.MetricsTestCase"/>