Merge pull request #3566 from wso2/all-tests-yml

Fix test skipping logic for workflow builds
wso2 · Aug 23, 2024 · 54bc61e · 54bc61e
2 parents d8aa3b2 + 29a25ab
commit 54bc61e
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 34 deletions.
diff --git a/...tests/src/test/java/org/wso2/ei/dataservice/integration/test/odata/ODataETagTestCase.java b/...tests/src/test/java/org/wso2/ei/dataservice/integration/test/odata/ODataETagTestCase.java
@@ -225,7 +225,7 @@ public void validateETagConcurrentHandlingTestCaseForPatchMethod() throws Except
 
     @Test(groups = "wso2.dss", description = "etag concurrent handling with delete method test", dependsOnMethods = "validateETagConcurrentHandlingTestCaseForPatchMethod")
     public void validateETagConcurrentHandlingTestCaseForDeleteMethod() throws Exception {
-        if (System.getenv("CI_BUILD_SKIP").equals("true")) {
+        if (!Boolean.parseBoolean(System.getenv("CI_BUILD_SKIP"))) {
             System.out.println("This test is temporarily skipped for this workflow");
             String endpoint = webAppUrl + "/odata/" + serviceName + "/" + configId + "/FILES";
             String content = "{\"FILENAME\": \"WSO2PROD\" ,\"TYPE\" : \"dss\"}";
@@ -278,8 +278,7 @@ public void validateETagConcurrentHandlingTestCaseForDeleteMethod() throws Excep
     @Test(groups = "wso2.dss", description = "property modification using etag concurrent handling with put method test", dependsOnMethods = "validateETagConcurrentHandlingTestCaseForDeleteMethod")
     public void validateETagConcurrentHandlingTestCaseForUpdatePropertyWithPutMethod() throws Exception {
         // To insert values
-        if (System.getenv("CI_BUILD_SKIP").equals("true")) {
-            System.out.println("This test is temporarily skipped for this workflow");
+        if (!Boolean.parseBoolean(System.getenv("CI_BUILD_SKIP"))) {
             String endpoint = webAppUrl + "/odata/" + serviceName + "/" + configId + "/FILES";
             String content = "{\"FILENAME\": \"WSO2PROD\" ,\"TYPE\" : \"dss\"}";
             Map<String, String> headers = new HashMap<>();
@@ -333,7 +332,7 @@ public void validateETagConcurrentHandlingTestCaseForUpdatePropertyWithPutMethod
 
     @Test(groups = "wso2.dss", description = "property modification using etag concurrent handling with patch method test", dependsOnMethods = "validateETagConcurrentHandlingTestCaseForUpdatePropertyWithPutMethod")
     public void validateETagConcurrentHandlingTestCaseForUpdatePropertyWithPatchMethod() throws Exception {
-        if (System.getenv("CI_BUILD_SKIP").equals("true")) {
+        if (!Boolean.parseBoolean(System.getenv("CI_BUILD_SKIP"))) {
             System.out.println("This test is temporarily skipped for this workflow");
             String entityEndpoint = webAppUrl + "/odata/" + serviceName + "/" + configId + "/FILES(\'WSO2PROD\')";
             String endpoint = webAppUrl + "/odata/" + serviceName + "/" + configId + "/FILES(\'WSO2PROD\')/TYPE";

diff --git a/...va/org/wso2/carbon/esb/mediator/test/aggregate/AggregateWithHighMaxAndLowMinTestCase.java b/...va/org/wso2/carbon/esb/mediator/test/aggregate/AggregateWithHighMaxAndLowMinTestCase.java
@@ -158,7 +158,7 @@ public void testMoreNumberThanMaximum() throws IOException, XMLStreamException {
 
     @Test(groups = { "wso2.esb" }, description = "less number of messages than maximum count")
     public void testLessNumberThanMaximum() throws IOException, XMLStreamException {
-        if (System.getenv("CI_BUILD_SKIP").equals("true")) {
+        if (!Boolean.parseBoolean(System.getenv("CI_BUILD_SKIP"))) {
             int responseCount = 0;
 
             no_of_requests = 60;

diff --git a/...1/src/test/java/org/wso2/carbon/esb/mediator/test/foreach/ForEachJSONPayloadTestCase.java b/...1/src/test/java/org/wso2/carbon/esb/mediator/test/foreach/ForEachJSONPayloadTestCase.java
@@ -50,7 +50,7 @@ public void uploadSynapseConfig() throws Exception {
 
     @Test(groups = {"wso2.esb"}, description = "Test ForEach mediator with JSON payload")
     public void testForEachMediatorWithJSONPayload() throws Exception {
-        if (System.getenv("CI_BUILD_SKIP").equals("true")) {
+        if (!Boolean.parseBoolean(System.getenv("CI_BUILD_SKIP"))) {
             String request = "{\"getQuote\":{\"request\":[{\"symbol\":\"IBM\"},{\"symbol\":\"WSO2\"},{\"symbol\":\"MSFT\"}]}}";
 
             simpleHttpClient = new SimpleHttpClient();

diff --git a/...s-other/src/test/java/org/wso2/carbon/esb/serviceCatalog/test/ServiceCatalogTestCase.java b/...s-other/src/test/java/org/wso2/carbon/esb/serviceCatalog/test/ServiceCatalogTestCase.java
@@ -296,32 +296,34 @@ public void testMIRestart() throws IOException, AutomationUtilException, Interru
     @Test(groups = {"wso2.esb"}, description = "Test service catalog with proxy services", priority = 11)
     public void testServiceCatalogProxyServiceMetadata()
             throws CarbonException, IOException, AutomationUtilException, InterruptedException {
-        File metadataCAPP = new File(getESBResourceLocation() + File.separator
-                + SERVICE_CATALOG_FOLDER + File.separator + CAPP_WITH_PROXY_META);
-        serverConfigurationManager.copyToCarbonapps(metadataCAPP);
-        // replace server startup scripts
-        String shFile = CarbonBaseUtils.getCarbonHome() + File.separator + "bin" + File.separator + SH_FILE_NAME;
-        String batFile = CarbonBaseUtils.getCarbonHome() + File.separator + "bin" + File.separator + BAT_FILE_NAME;
-        File oldShFile = new File( shFile + ".backup");
-        File newShFile = new File(shFile);
-        if (new File(shFile).delete() && oldShFile.renameTo(newShFile)) {
-            assertTrue(newShFile.exists(), "Error while replacing default sh script");
-        }
-        File oldBatFile = new File( batFile + ".backup");
-        File newBatFile = new File(batFile);
-        if (new File(batFile).delete() && oldBatFile.renameTo(newBatFile)) {
-            assertTrue(newBatFile.exists(), "Error while replacing default bat script");
+        if (!Boolean.parseBoolean(System.getenv("CI_BUILD_SKIP"))) {
+            File metadataCAPP = new File(getESBResourceLocation() + File.separator
+                    + SERVICE_CATALOG_FOLDER + File.separator + CAPP_WITH_PROXY_META);
+            serverConfigurationManager.copyToCarbonapps(metadataCAPP);
+            // replace server startup scripts
+            String shFile = CarbonBaseUtils.getCarbonHome() + File.separator + "bin" + File.separator + SH_FILE_NAME;
+            String batFile = CarbonBaseUtils.getCarbonHome() + File.separator + "bin" + File.separator + BAT_FILE_NAME;
+            File oldShFile = new File(shFile + ".backup");
+            File newShFile = new File(shFile);
+            if (new File(shFile).delete() && oldShFile.renameTo(newShFile)) {
+                assertTrue(newShFile.exists(), "Error while replacing default sh script");
+            }
+            File oldBatFile = new File(batFile + ".backup");
+            File newBatFile = new File(batFile);
+            if (new File(batFile).delete() && oldBatFile.renameTo(newBatFile)) {
+                assertTrue(newBatFile.exists(), "Error while replacing default bat script");
+            }
+            serverConfigurationManager.restartMicroIntegrator();
+            assertTrue(Utils.checkForLog(carbonLogReader,
+                    "Successfully updated the service catalog", 10), "Did not receive the expected info log");
+            File extracted = chekAndExtractPayloadZip();
+            assertTrue(extracted.exists(), "Error occurred while extracting the ZIP");
+            File metadataFile = new File(extracted, "SampleProxyService_proxy_v1.0.0");
+            File yamlFile = new File(metadataFile, "metadata.yaml");
+            assertTrue(yamlFile.exists(), "Could not find the metadata yaml file");
+            File wsdlFile = new File(metadataFile, "definition.wsdl");
+            assertTrue(wsdlFile.exists(), "Could not find the definition wsdl file");
         }
-        serverConfigurationManager.restartMicroIntegrator();
-        assertTrue(Utils.checkForLog(carbonLogReader,
-                "Successfully updated the service catalog", 10), "Did not receive the expected info log");
-        File extracted = chekAndExtractPayloadZip();
-        assertTrue(extracted.exists(), "Error occurred while extracting the ZIP");
-        File metadataFile = new File(extracted, "SampleProxyService_proxy_v1.0.0");
-        File yamlFile = new File(metadataFile, "metadata.yaml");
-        assertTrue(yamlFile.exists(), "Could not find the metadata yaml file");
-        File wsdlFile = new File(metadataFile, "definition.wsdl");
-        assertTrue(wsdlFile.exists(), "Could not find the definition wsdl file");
     }
 
     private static File chekAndExtractPayloadZip() throws CarbonException {

diff --git a/.../test/java/org/wso2/carbon/esb/jms/transport/test/ESBJAVA1832MessageInjectorTestCase.java b/.../test/java/org/wso2/carbon/esb/jms/transport/test/ESBJAVA1832MessageInjectorTestCase.java
@@ -53,7 +53,7 @@ protected void init() throws Exception {
 
     @Test(groups = { "wso2.esb" }, description = "Test proxy service with jms transport")
     public void testMessageInjection() throws Exception {
-        if (System.getenv("CI_BUILD_SKIP").equals("true")) {
+        if (!Boolean.parseBoolean(System.getenv("CI_BUILD_SKIP"))) {
             String queueName = "jmsQueue";
             int numberOfMsgToExpect = 10;
             TimeUnit.SECONDS.sleep(15);

diff --git a/...s-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/ESBJAVA2907TestCase.java b/...s-transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/ESBJAVA2907TestCase.java
@@ -23,7 +23,7 @@ protected void init() throws Exception {
 
     @Test(groups = "wso2.esb", description = "Test adding OMElements as properties when saving messages to the MessageStore")
     public void testAddingOMElementPropertyToMessageStore() throws Exception {
-        if (System.getenv("CI_BUILD_SKIP").equals("true")) {
+        if (!Boolean.parseBoolean(System.getenv("CI_BUILD_SKIP"))) {
             AxisServiceClient client = new AxisServiceClient();
             client.sendRobust(Utils.getStockQuoteRequest("IBM"), getProxyServiceURLHttp("testPS"), "getQuote");
             Assert.assertTrue(carbonLogReader.checkForLog(GET_QUOTE_REQUEST_BODY, DEFAULT_TIMEOUT), "OMElement is not saved to the message store");

diff --git a/...transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/MSMPCronForwarderCase.java b/...transport/src/test/java/org/wso2/carbon/esb/jms/transport/test/MSMPCronForwarderCase.java
@@ -69,7 +69,7 @@ protected void init() throws Exception {
 
     @Test(groups = { "wso2.esb" }, description = "Test Cron Forwarding of message processor")
     public void testMessageProcessorCronForwader() throws Exception {
-        if (System.getenv("CI_BUILD_SKIP").equals("true")) {
+        if (!Boolean.parseBoolean(System.getenv("CI_BUILD_SKIP"))) {
             // SEND THE REQUEST
             String addUrl = getProxyServiceURLHttp("MSMPRetrytest");
             String payload = "{\"name\":\"Jack\"}";