Restructure manual-attach tests

ayeshLK · Aug 7, 2024 · 209867f · 209867f
1 parent 905de47
commit 209867f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/ballerina/tests/multi_service_listener_test.bal b/ballerina/tests/multi_service_listener_test.bal
@@ -19,7 +19,7 @@ import ballerina/test;
 import ballerina/http;
 import ballerina/mime;
 
-listener Listener multiServiceListener = new(MULTIPLE_SUB_ATTACHED_PORT);
+listener Listener multiServiceListener = new(MULTIPLE_SUB_ATTACH_PORT);
 
 @SubscriberServiceConfig {
     unsubscribeOnShutdown: false
@@ -73,8 +73,8 @@ service /subscriberTwo on multiServiceListener {
     }
 }
 
-http:Client clientForServiceOne = check new (string `http://localhost:${MULTIPLE_SUB_ATTACHED_PORT}/subscriberOne`);
-http:Client clientForServiceTwo = check new (string `http://localhost:${MULTIPLE_SUB_ATTACHED_PORT}/subscriberTwo`);
+http:Client clientForServiceOne = check new (string `http://localhost:${MULTIPLE_SUB_ATTACH_PORT}/subscriberOne`);
+http:Client clientForServiceTwo = check new (string `http://localhost:${MULTIPLE_SUB_ATTACH_PORT}/subscriberTwo`);
 
 @test:Config { 
     groups: ["multiServiceListener"]

diff --git a/ballerina/tests/test_ports.bal b/ballerina/tests/test_ports.bal
@@ -22,4 +22,5 @@ const int SUB_WITH_DFLT_METHODS_PORT = BASE_PORT + 2;
 const int SUB_WITH_ADDITIONAL_ERRDETAILS_PORT = BASE_PORT + 3;
 const int SUB_WITH_OPT_TARGET_PORT = BASE_PORT + 4;
 const int SSL_ENABLED_SUB_PORT = BASE_PORT + 5;
-const int MULTIPLE_SUB_ATTACHED_PORT = BASE_PORT + 6;
+const int MULTIPLE_SUB_ATTACH_PORT = BASE_PORT + 6;
+const int MANUAL_SUB_ATTACH_PORT = BASE_PORT + 7;
diff --git a/ballerina/tests/websub_config_manual_attach_test.bal b/ballerina/tests/websub_config_manual_attach_test.bal
@@ -43,7 +43,7 @@ isolated service class SimpleWebsubService {
     }
 }
 
-listener Listener manualConfigAttachListener = new (9097);
+listener Listener manualConfigAttachListener = new (MANUAL_SUB_ATTACH_PORT);
 SimpleWebsubService simpleSubscriberServiceInstace = new;
 
 @test:BeforeGroups { value:["manualConfigAttach"] }
@@ -61,7 +61,7 @@ function afterManualConfigAttachTest() returns error? {
     check manualConfigAttachListener.gracefulStop();
 }
 
-http:Client manualConfigAttachClientEp = check new("http://localhost:9097/subscriber");
+http:Client manualConfigAttachClientEp = check new(string `http://localhost:${MANUAL_SUB_ATTACH_PORT}/subscriber`);
 
 @test:Config { 
     groups: ["manualConfigAttach"]