[ISSUE #393]:perf topic name in test file (#394)

close #393
apache · Jun 22, 2021 · 191eff2 · 191eff2
1 parent bf43f63
commit 191eff2
Show file tree

Hide file tree

Showing 20 changed files with 37 additions and 37 deletions.
diff --git a/docs/cn/instructions/eventmesh-sdk-java-quickstart.zh-CN.md b/docs/cn/instructions/eventmesh-sdk-java-quickstart.zh-CN.md
@@ -16,7 +16,7 @@ TCP 和 Http 示例都在**eventmesh-test**模块下
 
 <h4>异步消息</h4>
 
-- 创建主题FT0-e-80010000-01-1,可以通过rocketmq-console或者rocketmq tools 命令
+- 创建主题TEST-TOPIC-TCP-ASYNC,可以通过rocketmq-console或者rocketmq tools 命令
 
 - 启动消费者，订阅上一步骤已经创建的Topic
 
@@ -32,7 +32,7 @@ TCP 和 Http 示例都在**eventmesh-test**模块下
 
 <h4>广播消息</h4>
 
-- 创建主题FT0-e-80030000-01-3,可以通过rocketmq-console或者rocketmq tools 命令
+- 创建主题TEST-TOPIC-TCP-BROADCAST,可以通过rocketmq-console或者rocketmq tools 命令
 
 - 启动消费端，订阅上一步骤已经创建的Topic
 
@@ -56,7 +56,7 @@ TCP 和 Http 示例都在**eventmesh-test**模块下
 
 > 生产者将事件发送给下游即可，无需等待响应
 
-- 创建主题FT0-e-80010001-01-1,可以通过rocketmq-console或者rocketmq tools 命令
+- 创建主题TEST-TOPIC-HTTP-ASYNC,可以通过rocketmq-console或者rocketmq tools 命令
 
 - 启动消费端，订阅Topic
 

diff --git a/docs/en/instructions/eventmesh-sdk-java-quickstart.md b/docs/en/instructions/eventmesh-sdk-java-quickstart.md
@@ -17,7 +17,7 @@ the `resources` directory
 
 #### Async msg
 
-- create topic FT0-e-80010000-01-1 on rocketmq-console
+- create topic TEST-TOPIC-TCP-ASYNC on rocketmq-console
 
 - start consumer ,subscribe topic in previous step.
 
@@ -33,7 +33,7 @@ Run the main method of org.apache.eventmesh.tcp.demo.AsyncPublish
 
 #### Broadcast msg
 
-- create topic FT0-e-80030000-01-3 on rocketmq-console
+- create topic TEST-TOPIC-TCP-BROADCAST on rocketmq-console
 
 - start consumer ,subscribe topic in previous step.
 
@@ -57,7 +57,7 @@ Run the main method of org.apache.eventmesh.tcp.demo.AsyncPublishBroadcast
 
 > producer send the event to consumer and don't need waiting response msg from consumer
 
-- create topic FT0-e-80010001-01-1 on rocketmq-console
+- create topic TEST-TOPIC-HTTP-ASYNC on rocketmq-console
 
 - start consumer, subscribe topic
 

diff --git a/eventmesh-runtime/src/test/java/client/common/ClientConstants.java b/eventmesh-runtime/src/test/java/client/common/ClientConstants.java
@@ -27,7 +27,7 @@ public interface ClientConstants {
 
     long DEFAULT_TIMEOUT_IN_MILLISECONDS = 3000;
 
-    String SYNC_TOPIC = "FT0-s-80000000-01-0";
-    String ASYNC_TOPIC = "FT0-e-80010000-01-1";
-    String BROADCAST_TOPIC = "FT0-e-80030000-01-3";
+    String SYNC_TOPIC = "TEST-TOPIC-TCP-SYNC";
+    String ASYNC_TOPIC = "TEST-TOPIC-TCP-ASYNC";
+    String BROADCAST_TOPIC = "TEST-TOPIC-TCP-BROADCAST";
 }
diff --git a/eventmesh-runtime/src/test/java/client/common/MessageUtils.java b/eventmesh-runtime/src/test/java/client/common/MessageUtils.java
@@ -169,10 +169,10 @@ public static UserAgent generateSubServer() {
     public static Subscription generateSubscription() {
         Subscription subscription = new Subscription();
         List<SubscriptionItem> subscriptionItems = new ArrayList<>();
-        subscriptionItems.add(new SubscriptionItem("FT0-s-80000000-01-0", SubscriptionMode.CLUSTERING, SubcriptionType.SYNC));
-        subscriptionItems.add(new SubscriptionItem("FT0-s-80000000-02-0", SubscriptionMode.CLUSTERING, SubcriptionType.SYNC));
-        subscriptionItems.add(new SubscriptionItem("FT0-s-80000000-03-0", SubscriptionMode.CLUSTERING, SubcriptionType.SYNC));
-        subscriptionItems.add(new SubscriptionItem("FT0-s-80000000-04-0", SubscriptionMode.CLUSTERING, SubcriptionType.SYNC));
+        subscriptionItems.add(new SubscriptionItem("TEST-TOPIC-TCP-SYNC", SubscriptionMode.CLUSTERING, SubcriptionType.SYNC));
+        subscriptionItems.add(new SubscriptionItem("TEST-TOPIC-TCP-SYNC2", SubscriptionMode.CLUSTERING, SubcriptionType.SYNC));
+        subscriptionItems.add(new SubscriptionItem("TEST-TOPIC-TCP-SYNC3", SubscriptionMode.CLUSTERING, SubcriptionType.SYNC));
+        subscriptionItems.add(new SubscriptionItem("TEST-TOPIC-TCP-SYNC4", SubscriptionMode.CLUSTERING, SubcriptionType.SYNC));
         subscription.setTopicList(subscriptionItems);
         return subscription;
     }

diff --git a/eventmesh-runtime/src/test/java/demo/CCSubClient.java b/eventmesh-runtime/src/test/java/demo/CCSubClient.java
@@ -36,7 +36,7 @@ public static void main(String[] args) throws Exception {
         subClient.init();
         subClient.heartbeat();
         subClient.listen();
-        subClient.justSubscribe("FT0-s-80000000-01-0", SubscriptionMode.CLUSTERING, SubcriptionType.SYNC);
+        subClient.justSubscribe("TEST-TOPIC-TCP-SYNC", SubscriptionMode.CLUSTERING, SubcriptionType.SYNC);
         subClient.registerBusiHandler(new ReceiveMsgHook() {
             @Override
             public void handle(Package msg, ChannelHandlerContext ctx) {

diff --git a/eventmesh-runtime/src/test/java/demo/CClientDemo.java b/eventmesh-runtime/src/test/java/demo/CClientDemo.java
@@ -37,9 +37,9 @@ public class CClientDemo {
 
     public static Logger logger = LoggerFactory.getLogger(CClientDemo.class);
 
-    private static final String SYNC_TOPIC = "FT0-s-80000000-01-0";
-    private static final String ASYNC_TOPIC = "FT0-e-80010000-01-1";
-    private static final String BROADCAST_TOPIC = "FT0-e-80030000-01-3";
+    private static final String SYNC_TOPIC = "TEST-TOPIC-TCP-SYNC";
+    private static final String ASYNC_TOPIC = "TEST-TOPIC-TCP-ASYNC";
+    private static final String BROADCAST_TOPIC = "TEST-TOPIC-TCP-BROADCAST";
 
 
     public static void main(String[] args) throws Exception {
@@ -53,7 +53,7 @@ public static void main(String[] args) throws Exception {
 //            Package rr = null;
 //            AccessMessage rrMessage = null;
 //            try {
-//                rr = client.rr(MessageUtils.rrMesssage("FT0-s-80000000-01-0"), 3000);
+//                rr = client.rr(MessageUtils.rrMesssage("TEST-TOPIC-TCP-SYNC"), 3000);
 //                Thread.sleep(100);
 //                //rrMessage = (AccessMessage) rr.getBody();
 //                System.err.println(         "rr-reply-------------------------------------------------" + rr.toString());
@@ -72,7 +72,7 @@ public void handle(Package msg, ChannelHandlerContext ctx) {
         for (int i = 0; i < 10000; i++) {
 //            ThreadUtil.randomSleep(0,200);
             //广播消息
-            client.broadcast(MessageUtils.broadcastMessage("FT0-e-80030000-01-3", i), 5000);
+            client.broadcast(MessageUtils.broadcastMessage("TEST-TOPIC-TCP-BROADCAST", i), 5000);
             //异步消息
             client.publish(MessageUtils.asyncMessage(ASYNC_TOPIC, i), 5000);
         }

diff --git a/eventmesh-runtime/src/test/java/demo/SyncPubClient.java b/eventmesh-runtime/src/test/java/demo/SyncPubClient.java
@@ -31,7 +31,7 @@ public static void main(String[] args) throws Exception {
         pubClient.heartbeat();
 
         for (int i = 0; i < 100; i++) {
-            Package rr = pubClient.rr(MessageUtils.rrMesssage("FT0-s-80000000-01-0", i), 3000);
+            Package rr = pubClient.rr(MessageUtils.rrMesssage("TEST-TOPIC-TCP-SYNC", i), 3000);
             if (rr.getBody() instanceof EventMeshMessage) {
                 String body = ((EventMeshMessage) rr.getBody()).getBody();
                 System.err.println("rrMessage: " + body + "             " + "rr-reply-------------------------------------------------" + rr.toString());

diff --git a/...sh-sdk-java/src/test/java/org/apache/eventmesh/client/http/demo/AsyncPublishInstance.java b/...sh-sdk-java/src/test/java/org/apache/eventmesh/client/http/demo/AsyncPublishInstance.java
@@ -39,7 +39,7 @@ public static void main(String[] args) throws Exception {
 //            String eventMeshIPPort = args[0];
             String eventMeshIPPort = "";
 //            final String topic = args[1];
-            final String topic = "FT0-e-80010000-01-1";
+            final String topic = "TEST-TOPIC-HTTP-ASYNC";
             if (StringUtils.isBlank(eventMeshIPPort)) {
                 // if has multi value, can config as: 127.0.0.1:10105;127.0.0.2:10105
                 eventMeshIPPort = "127.0.0.1:10105";

diff --git a/...dk-java/src/test/java/org/apache/eventmesh/client/http/demo/AsyncSyncRequestInstance.java b/...dk-java/src/test/java/org/apache/eventmesh/client/http/demo/AsyncSyncRequestInstance.java
@@ -40,7 +40,7 @@ public static void main(String[] args) throws Exception {
 //            String eventMeshIPPort = args[0];
             String eventMeshIPPort = "";
 //            final String topic = args[1];
-            final String topic = "FT0-e-80010000-01-1";
+            final String topic = "TEST-TOPIC-HTTP-ASYNC";
             if (StringUtils.isBlank(eventMeshIPPort)) {
                 // if has multi value, can config as: 127.0.0.1:10105;127.0.0.2:10105
                 eventMeshIPPort = "127.0.0.1:10105";

diff --git a/...-java/src/test/java/org/apache/eventmesh/client/tcp/common/EventMeshTestCaseTopicSet.java b/...-java/src/test/java/org/apache/eventmesh/client/tcp/common/EventMeshTestCaseTopicSet.java
@@ -23,12 +23,12 @@
 public class EventMeshTestCaseTopicSet {
 
     //    public static final String TOPIC_PRX_WQ2ClientBroadCast = "topic-broadcast-test";
-    public static final String TOPIC_PRX_WQ2ClientBroadCast = "FT0-e-80030001-01-3";
+    public static final String TOPIC_PRX_WQ2ClientBroadCast = "TEST-TOPIC-TCP-BROADCAST";
 
     //    public static final String TOPIC_PRX_SyncSubscribeTest = "topic-sync-test";
-    public static final String TOPIC_PRX_SyncSubscribeTest = "FT0-s-80000000-01-0";
+    public static final String TOPIC_PRX_SyncSubscribeTest = "TEST-TOPIC-TCP-SYNC";
 
     //    public static final String TOPIC_PRX_WQ2ClientUniCast = "topic-async-test";
-    public static final String TOPIC_PRX_WQ2ClientUniCast = "FT0-e-80010000-01-1";
+    public static final String TOPIC_PRX_WQ2ClientUniCast = "TEST-TOPIC-TCP-ASYNC";
 
 }
diff --git a/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/tcp/demo/AsyncSubscribe.java b/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/tcp/demo/AsyncSubscribe.java
@@ -47,7 +47,7 @@ public static void main(String[] agrs) throws Exception {
             client.init();
             client.heartbeat();
 
-            client.subscribe("FT0-e-80010000-01-1", SubscriptionMode.CLUSTERING, SubcriptionType.ASYNC);
+            client.subscribe("TEST-TOPIC-TCP-ASYNC", SubscriptionMode.CLUSTERING, SubcriptionType.ASYNC);
             client.registerSubBusiHandler(handler);
 
             client.listen();

diff --git a/...-sdk-java/src/test/java/org/apache/eventmesh/client/tcp/demo/AsyncSubscribeBroadcast.java b/...-sdk-java/src/test/java/org/apache/eventmesh/client/tcp/demo/AsyncSubscribeBroadcast.java
@@ -47,7 +47,7 @@ public static void main(String[] agrs) throws Exception {
             client.init();
             client.heartbeat();
 
-            client.subscribe("FT0-e-80030001-01-3", SubscriptionMode.BROADCASTING, SubcriptionType.ASYNC);
+            client.subscribe("TEST-TOPIC-TCP-BROADCAST", SubscriptionMode.BROADCASTING, SubcriptionType.ASYNC);
             client.registerSubBusiHandler(handler);
 
             client.listen();

diff --git a/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/tcp/demo/SyncResponse.java b/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/tcp/demo/SyncResponse.java
@@ -45,7 +45,7 @@ public static void main(String[] agrs) throws Exception {
             client.init();
             client.heartbeat();
 
-            client.subscribe("FT0-s-80000000-01-0", SubscriptionMode.CLUSTERING, SubcriptionType.SYNC);
+            client.subscribe("TEST-TOPIC-TCP-SYNC", SubscriptionMode.CLUSTERING, SubcriptionType.SYNC);
             //同步RR消息
             client.registerSubBusiHandler(handler);
 

diff --git a/eventmesh-test/src/main/java/org/apache/eventmesh/http/demo/AsyncPublishInstance.java b/eventmesh-test/src/main/java/org/apache/eventmesh/http/demo/AsyncPublishInstance.java
@@ -48,7 +48,7 @@ public static void main(String[] args) throws Exception {
 //            String eventMeshIPPort = args[0];
             String eventMeshIPPort = eventMeshIp + ":" + eventMeshHttpPort;
 //            final String topic = args[1];
-            final String topic = "FT0-e-80010001-01-1";
+            final String topic = "TEST-TOPIC-HTTP-ASYNC";
             if (StringUtils.isBlank(eventMeshIPPort)) {
                 // if has multi value, can config as: 127.0.0.1:10105;127.0.0.2:10105
                 eventMeshIPPort = "127.0.0.1:10105";

diff --git a/eventmesh-test/src/main/java/org/apache/eventmesh/http/demo/AsyncSyncRequestInstance.java b/eventmesh-test/src/main/java/org/apache/eventmesh/http/demo/AsyncSyncRequestInstance.java
@@ -46,7 +46,7 @@ public static void main(String[] args) throws Exception {
 //            String eventMeshIPPort = args[0];
             String eventMeshIPPort = eventMeshIp + ":" + eventMeshHttpPort;
 //            final String topic = args[1];
-            final String topic = "FT0-e-80010000-01-1";
+            final String topic = "TEST-TOPIC-TCP-ASYNC";
             if (StringUtils.isBlank(eventMeshIPPort)) {
                 // if has multi value, can config as: 127.0.0.1:10105;127.0.0.2:10105
                 eventMeshIPPort = "127.0.0.1:10105";

diff --git a/eventmesh-test/src/main/java/org/apache/eventmesh/http/demo/sub/service/SubService.java b/eventmesh-test/src/main/java/org/apache/eventmesh/http/demo/sub/service/SubService.java
@@ -52,7 +52,7 @@ public class SubService implements InitializingBean {
 
     final Properties properties = Utils.readPropertiesFile("application.properties");
 
-    final List<SubscriptionItem> topicList = Arrays.asList(new SubscriptionItem("FT0-e-80010001-01-1", SubscriptionMode.CLUSTERING, SubcriptionType.ASYNC));
+    final List<SubscriptionItem> topicList = Arrays.asList(new SubscriptionItem("TEST-TOPIC-HTTP-ASYNC", SubscriptionMode.CLUSTERING, SubcriptionType.ASYNC));
     final String localIp = IPUtil.getLocalAddress();
     final String localPort = properties.getProperty("server.port");
     final String eventMeshIp = properties.getProperty("eventmesh.ip");

diff --git a/eventmesh-test/src/main/java/org/apache/eventmesh/tcp/common/EventMeshTestCaseTopicSet.java b/eventmesh-test/src/main/java/org/apache/eventmesh/tcp/common/EventMeshTestCaseTopicSet.java
@@ -23,12 +23,12 @@
 public class EventMeshTestCaseTopicSet {
 
     //    public static final String TOPIC_PRX_WQ2ClientBroadCast = "topic-broadcast-test";
-    public static final String TOPIC_PRX_WQ2ClientBroadCast = "FT0-e-80030000-01-3";
+    public static final String TOPIC_PRX_WQ2ClientBroadCast = "TEST-TOPIC-TCP-BROADCAST";
 
     //    public static final String TOPIC_PRX_SyncSubscribeTest = "topic-sync-test";
-    public static final String TOPIC_PRX_SyncSubscribeTest = "FT0-s-80000000-01-0";
+    public static final String TOPIC_PRX_SyncSubscribeTest = "TEST-TOPIC-TCP-SYNC";
 
     //    public static final String TOPIC_PRX_WQ2ClientUniCast = "topic-async-test";
-    public static final String TOPIC_PRX_WQ2ClientUniCast = "FT0-e-80010000-01-1";
+    public static final String TOPIC_PRX_WQ2ClientUniCast = "TEST-TOPIC-TCP-ASYNC";
 
 }
diff --git a/eventmesh-test/src/main/java/org/apache/eventmesh/tcp/demo/AsyncSubscribe.java b/eventmesh-test/src/main/java/org/apache/eventmesh/tcp/demo/AsyncSubscribe.java
@@ -52,7 +52,7 @@ public static void main(String[] agrs) throws Exception {
             client.init();
             client.heartbeat();
 
-            client.subscribe("FT0-e-80010000-01-1", SubscriptionMode.CLUSTERING, SubcriptionType.ASYNC);
+            client.subscribe("TEST-TOPIC-TCP-ASYNC", SubscriptionMode.CLUSTERING, SubcriptionType.ASYNC);
             client.registerSubBusiHandler(handler);
 
             client.listen();

diff --git a/eventmesh-test/src/main/java/org/apache/eventmesh/tcp/demo/AsyncSubscribeBroadcast.java b/eventmesh-test/src/main/java/org/apache/eventmesh/tcp/demo/AsyncSubscribeBroadcast.java
@@ -52,7 +52,7 @@ public static void main(String[] agrs) throws Exception {
             client.init();
             client.heartbeat();
 
-            client.subscribe("FT0-e-80030000-01-3", SubscriptionMode.BROADCASTING, SubcriptionType.ASYNC);
+            client.subscribe("TEST-TOPIC-TCP-BROADCAST", SubscriptionMode.BROADCASTING, SubcriptionType.ASYNC);
             client.registerSubBusiHandler(handler);
 
             client.listen();

diff --git a/eventmesh-test/src/main/java/org/apache/eventmesh/tcp/demo/SyncResponse.java b/eventmesh-test/src/main/java/org/apache/eventmesh/tcp/demo/SyncResponse.java
@@ -46,7 +46,7 @@ public static void main(String[] agrs) throws Exception {
             client.init();
             client.heartbeat();
 
-            client.subscribe("FT0-s-80000000-01-0", SubscriptionMode.CLUSTERING, SubcriptionType.SYNC);
+            client.subscribe("TEST-TOPIC-TCP-SYNC", SubscriptionMode.CLUSTERING, SubcriptionType.SYNC);
             //同步RR消息
             client.registerSubBusiHandler(handler);