This is an automated email from the ASF dual-hosted git repository.
jooks pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new c6ac313d0c [type: refactor] change e2e syn (#5046)
c6ac313d0c is described below
commit c6ac313d0c0a3f75e5da0252048fe69b52d5984f
Author: SeaChess <[email protected]>
AuthorDate: Sat Aug 19 09:53:47 2023 +0800
[type: refactor] change e2e syn (#5046)
* change syn
* change syn01
---
.../testcase/alibabadubbo/AlibabaDubboPluginTest.java | 17 ++++++-----------
.../e2e/testcase/alibabadubbo/DataSynHttpTest.java | 14 ++++++++++----
.../e2e/testcase/alibabadubbo/DataSynNacosTest.java | 14 ++++++++++----
.../e2e/testcase/alibabadubbo/DataSynZookeeperTest.java | 14 ++++++++++----
.../e2e/testcase/apachedubbo/ApacheDubboPluginTest.java | 16 ++++++----------
.../e2e/testcase/apachedubbo/DataSynHttpTest.java | 14 ++++++++++----
.../e2e/testcase/apachedubbo/DataSynNacosTest.java | 14 ++++++++++----
.../e2e/testcase/apachedubbo/DataSynZookeeperTest.java | 14 ++++++++++----
.../shenyu/e2e/testcase/grpc/DataSynHttpTest.java | 14 ++++++++++----
.../shenyu/e2e/testcase/grpc/DataSynNacosTest.java | 14 ++++++++++----
.../shenyu/e2e/testcase/grpc/DataSynZookeeperTest.java | 14 ++++++++++----
.../apache/shenyu/e2e/testcase/grpc/GrpcPluginTest.java | 16 ++++++----------
.../shenyu/e2e/testcase/motan/DataSynHttpTest.java | 14 ++++++++++----
.../shenyu/e2e/testcase/motan/DataSynNacosTest.java | 14 ++++++++++----
.../shenyu/e2e/testcase/motan/DataSynZookeeperTest.java | 14 ++++++++++----
.../shenyu/e2e/testcase/motan/MotanPluginTest.java | 14 +++++---------
.../shenyu/e2e/testcase/sofa/DataSynHttpTest.java | 14 ++++++++++----
.../shenyu/e2e/testcase/sofa/DataSynNacosTest.java | 14 ++++++++++----
.../shenyu/e2e/testcase/sofa/DataSynZookeeperTest.java | 14 ++++++++++----
.../apache/shenyu/e2e/testcase/sofa/SofaPluginTest.java | 14 +++++---------
.../e2e/testcase/springcloud/DataSynHttpTest.java | 14 ++++++++++----
.../e2e/testcase/springcloud/DataSynNacosTest.java | 14 ++++++++++----
.../e2e/testcase/springcloud/DataSynZookeeperTest.java | 14 ++++++++++----
.../e2e/testcase/springcloud/SpringCloudPluginTest.java | 17 ++++++-----------
24 files changed, 214 insertions(+), 132 deletions(-)
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/AlibabaDubboPluginTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/AlibabaDubboPluginTest.java
index faa251bf2b..02b0ef1995 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/AlibabaDubboPluginTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/AlibabaDubboPluginTest.java
@@ -80,25 +80,20 @@ public class AlibabaDubboPluginTest {
adminClient.login();
Thread.sleep(10000);
List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
+ List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
+ Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
+ List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
List<MetaDataDTO> metaDataDTOList = adminClient.listAllMetaData();
+ Assertions.assertEquals(metaDataDTOList.size(),
metaDataCacheList.size());
+ List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
List<RuleDTO> ruleDTOList = adminClient.listAllRules();
- Assertions.assertEquals(1, selectorDTOList.size());
- Assertions.assertEquals(25, metaDataDTOList.size());
- Assertions.assertEquals(25, ruleDTOList.size());
-
+ Assertions.assertEquals(ruleDTOList.size(), ruleCacheList.size());
for (SelectorDTO selectorDTO :selectorDTOList) {
if (selectorDTO.getHandle() != null &&
!selectorDTO.getHandle().equals("")) {
AlibabaDubboPluginCases.verifierUri(selectorDTO.getHandle());
}
}
- List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
- List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
- List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
- Assertions.assertEquals(1, selectorCacheList.size());
- Assertions.assertEquals(25, metaDataCacheList.size());
- Assertions.assertEquals(25, ruleCacheList.size());
-
MultiValueMap<String, String> formData = new LinkedMultiValueMap<>();
formData.add("id", "6");
formData.add("name", "dubbo");
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynHttpTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynHttpTest.java
index aac495b5e9..b59b12da60 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynHttpTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynHttpTest.java
@@ -25,6 +25,9 @@ import
org.apache.shenyu.e2e.engine.config.ShenYuEngineConfigure;
import org.apache.shenyu.e2e.model.data.MetaData;
import org.apache.shenyu.e2e.model.data.RuleCacheData;
import org.apache.shenyu.e2e.model.data.SelectorCacheData;
+import org.apache.shenyu.e2e.model.response.MetaDataDTO;
+import org.apache.shenyu.e2e.model.response.RuleDTO;
+import org.apache.shenyu.e2e.model.response.SelectorDTO;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -64,11 +67,14 @@ public class DataSynHttpTest {
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
Thread.sleep(10000);
- List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
+ Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
+ List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ List<MetaDataDTO> metaDataDTOList = adminClient.listAllMetaData();
+ Assertions.assertEquals(metaDataDTOList.size(),
metaDataCacheList.size());
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
- Assertions.assertEquals(1, selectorCacheList.size());
- Assertions.assertEquals(25, metaDataCacheList.size());
- Assertions.assertEquals(25, ruleCacheList.size());
+ List<RuleDTO> ruleDTOList = adminClient.listAllRules();
+ Assertions.assertEquals(ruleDTOList.size(), ruleCacheList.size());
}
}
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynNacosTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynNacosTest.java
index b73fb8c04e..06d00d44c7 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynNacosTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynNacosTest.java
@@ -26,6 +26,9 @@ import
org.apache.shenyu.e2e.engine.config.ShenYuEngineConfigure;
import org.apache.shenyu.e2e.model.data.MetaData;
import org.apache.shenyu.e2e.model.data.RuleCacheData;
import org.apache.shenyu.e2e.model.data.SelectorCacheData;
+import org.apache.shenyu.e2e.model.response.MetaDataDTO;
+import org.apache.shenyu.e2e.model.response.RuleDTO;
+import org.apache.shenyu.e2e.model.response.SelectorDTO;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -65,11 +68,14 @@ public class DataSynNacosTest {
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
Thread.sleep(10000);
- List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
+ Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
+ List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ List<MetaDataDTO> metaDataDTOList = adminClient.listAllMetaData();
+ Assertions.assertEquals(metaDataDTOList.size(),
metaDataCacheList.size());
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
- Assertions.assertEquals(1, selectorCacheList.size());
- Assertions.assertEquals(25, metaDataCacheList.size());
- Assertions.assertEquals(25, ruleCacheList.size());
+ List<RuleDTO> ruleDTOList = adminClient.listAllRules();
+ Assertions.assertEquals(ruleDTOList.size(), ruleCacheList.size());
}
}
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynZookeeperTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynZookeeperTest.java
index f649b31027..0a308948d4 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynZookeeperTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynZookeeperTest.java
@@ -25,6 +25,9 @@ import
org.apache.shenyu.e2e.engine.config.ShenYuEngineConfigure;
import org.apache.shenyu.e2e.model.data.MetaData;
import org.apache.shenyu.e2e.model.data.RuleCacheData;
import org.apache.shenyu.e2e.model.data.SelectorCacheData;
+import org.apache.shenyu.e2e.model.response.MetaDataDTO;
+import org.apache.shenyu.e2e.model.response.RuleDTO;
+import org.apache.shenyu.e2e.model.response.SelectorDTO;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -64,12 +67,15 @@ public class DataSynZookeeperTest {
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
Thread.sleep(10000);
- List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
+ Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
+ List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ List<MetaDataDTO> metaDataDTOList = adminClient.listAllMetaData();
+ Assertions.assertEquals(metaDataDTOList.size(),
metaDataCacheList.size());
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
- Assertions.assertEquals(1, selectorCacheList.size());
- Assertions.assertEquals(25, metaDataCacheList.size());
- Assertions.assertEquals(25, ruleCacheList.size());
+ List<RuleDTO> ruleDTOList = adminClient.listAllRules();
+ Assertions.assertEquals(ruleDTOList.size(), ruleCacheList.size());
}
}
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/ApacheDubboPluginTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/ApacheDubboPluginTest.java
index 84c7be05ef..52f1f64879 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/ApacheDubboPluginTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/ApacheDubboPluginTest.java
@@ -80,11 +80,14 @@ public class ApacheDubboPluginTest {
adminClient.login();
Thread.sleep(10000);
List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
+ List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
+ Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
+ List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
List<MetaDataDTO> metaDataDTOList = adminClient.listAllMetaData();
+ Assertions.assertEquals(metaDataDTOList.size(),
metaDataCacheList.size());
+ List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
List<RuleDTO> ruleDTOList = adminClient.listAllRules();
- Assertions.assertEquals(1, selectorDTOList.size());
- Assertions.assertEquals(12, metaDataDTOList.size());
- Assertions.assertEquals(12, ruleDTOList.size());
+ Assertions.assertEquals(ruleDTOList.size(), ruleCacheList.size());
for (SelectorDTO selectorDTO :selectorDTOList) {
if (selectorDTO.getHandle() != null &&
!selectorDTO.getHandle().equals("")) {
@@ -92,13 +95,6 @@ public class ApacheDubboPluginTest {
}
}
- List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
- List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
- List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
- Assertions.assertEquals(1, selectorCacheList.size());
- Assertions.assertEquals(12, metaDataCacheList.size());
- Assertions.assertEquals(12, ruleCacheList.size());
-
MultiValueMap<String, String> formData = new LinkedMultiValueMap<>();
formData.add("id", "6");
formData.add("name", "dubbo");
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynHttpTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynHttpTest.java
index 81e3e42ebd..8b2813182f 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynHttpTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynHttpTest.java
@@ -25,6 +25,9 @@ import
org.apache.shenyu.e2e.engine.config.ShenYuEngineConfigure;
import org.apache.shenyu.e2e.model.data.MetaData;
import org.apache.shenyu.e2e.model.data.RuleCacheData;
import org.apache.shenyu.e2e.model.data.SelectorCacheData;
+import org.apache.shenyu.e2e.model.response.MetaDataDTO;
+import org.apache.shenyu.e2e.model.response.RuleDTO;
+import org.apache.shenyu.e2e.model.response.SelectorDTO;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -64,11 +67,14 @@ public class DataSynHttpTest {
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
Thread.sleep(10000);
- List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
+ Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
+ List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ List<MetaDataDTO> metaDataDTOList = adminClient.listAllMetaData();
+ Assertions.assertEquals(metaDataDTOList.size(),
metaDataCacheList.size());
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
- Assertions.assertEquals(1, selectorCacheList.size());
- Assertions.assertEquals(12, metaDataCacheList.size());
- Assertions.assertEquals(12, ruleCacheList.size());
+ List<RuleDTO> ruleDTOList = adminClient.listAllRules();
+ Assertions.assertEquals(ruleDTOList.size(), ruleCacheList.size());
}
}
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynNacosTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynNacosTest.java
index 5f0b49d230..dc31b2e46c 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynNacosTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynNacosTest.java
@@ -26,6 +26,9 @@ import
org.apache.shenyu.e2e.engine.config.ShenYuEngineConfigure;
import org.apache.shenyu.e2e.model.data.MetaData;
import org.apache.shenyu.e2e.model.data.RuleCacheData;
import org.apache.shenyu.e2e.model.data.SelectorCacheData;
+import org.apache.shenyu.e2e.model.response.MetaDataDTO;
+import org.apache.shenyu.e2e.model.response.RuleDTO;
+import org.apache.shenyu.e2e.model.response.SelectorDTO;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -65,11 +68,14 @@ public class DataSynNacosTest {
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
Thread.sleep(10000);
- List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
+ Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
+ List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ List<MetaDataDTO> metaDataDTOList = adminClient.listAllMetaData();
+ Assertions.assertEquals(metaDataDTOList.size(),
metaDataCacheList.size());
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
- Assertions.assertEquals(1, selectorCacheList.size());
- Assertions.assertEquals(12, metaDataCacheList.size());
- Assertions.assertEquals(12, ruleCacheList.size());
+ List<RuleDTO> ruleDTOList = adminClient.listAllRules();
+ Assertions.assertEquals(ruleDTOList.size(), ruleCacheList.size());
}
}
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynZookeeperTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynZookeeperTest.java
index f40fcca053..c51b4f3cda 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynZookeeperTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynZookeeperTest.java
@@ -25,6 +25,9 @@ import
org.apache.shenyu.e2e.engine.config.ShenYuEngineConfigure;
import org.apache.shenyu.e2e.model.data.MetaData;
import org.apache.shenyu.e2e.model.data.RuleCacheData;
import org.apache.shenyu.e2e.model.data.SelectorCacheData;
+import org.apache.shenyu.e2e.model.response.MetaDataDTO;
+import org.apache.shenyu.e2e.model.response.RuleDTO;
+import org.apache.shenyu.e2e.model.response.SelectorDTO;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -64,12 +67,15 @@ public class DataSynZookeeperTest {
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
Thread.sleep(10000);
- List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
+ Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
+ List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ List<MetaDataDTO> metaDataDTOList = adminClient.listAllMetaData();
+ Assertions.assertEquals(metaDataDTOList.size(),
metaDataCacheList.size());
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
- Assertions.assertEquals(1, selectorCacheList.size());
- Assertions.assertEquals(12, metaDataCacheList.size());
- Assertions.assertEquals(12, ruleCacheList.size());
+ List<RuleDTO> ruleDTOList = adminClient.listAllRules();
+ Assertions.assertEquals(ruleDTOList.size(), ruleCacheList.size());
}
}
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-grpc/src/test/java/org/apache/shenyu/e2e/testcase/grpc/DataSynHttpTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-grpc/src/test/java/org/apache/shenyu/e2e/testcase/grpc/DataSynHttpTest.java
index 1ce098ffbe..549abb9fbc 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-grpc/src/test/java/org/apache/shenyu/e2e/testcase/grpc/DataSynHttpTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-grpc/src/test/java/org/apache/shenyu/e2e/testcase/grpc/DataSynHttpTest.java
@@ -25,6 +25,9 @@ import
org.apache.shenyu.e2e.engine.config.ShenYuEngineConfigure;
import org.apache.shenyu.e2e.model.data.MetaData;
import org.apache.shenyu.e2e.model.data.RuleCacheData;
import org.apache.shenyu.e2e.model.data.SelectorCacheData;
+import org.apache.shenyu.e2e.model.response.MetaDataDTO;
+import org.apache.shenyu.e2e.model.response.RuleDTO;
+import org.apache.shenyu.e2e.model.response.SelectorDTO;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -64,11 +67,14 @@ public class DataSynHttpTest {
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
Thread.sleep(10000);
- List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ final List<SelectorDTO> selectorDTOList =
adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
+ Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
+ final List<MetaDataDTO> metaDataDTOList =
adminClient.listAllMetaData();
+ List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ Assertions.assertEquals(metaDataDTOList.size(),
metaDataCacheList.size());
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
- Assertions.assertEquals(1, selectorCacheList.size());
- Assertions.assertEquals(9, metaDataCacheList.size());
- Assertions.assertEquals(9, ruleCacheList.size());
+ final List<RuleDTO> ruleDTOList = adminClient.listAllRules();
+ Assertions.assertEquals(ruleDTOList.size(), ruleCacheList.size());
}
}
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-grpc/src/test/java/org/apache/shenyu/e2e/testcase/grpc/DataSynNacosTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-grpc/src/test/java/org/apache/shenyu/e2e/testcase/grpc/DataSynNacosTest.java
index 887875914a..7cc6971e16 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-grpc/src/test/java/org/apache/shenyu/e2e/testcase/grpc/DataSynNacosTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-grpc/src/test/java/org/apache/shenyu/e2e/testcase/grpc/DataSynNacosTest.java
@@ -26,6 +26,9 @@ import
org.apache.shenyu.e2e.engine.config.ShenYuEngineConfigure;
import org.apache.shenyu.e2e.model.data.MetaData;
import org.apache.shenyu.e2e.model.data.RuleCacheData;
import org.apache.shenyu.e2e.model.data.SelectorCacheData;
+import org.apache.shenyu.e2e.model.response.MetaDataDTO;
+import org.apache.shenyu.e2e.model.response.RuleDTO;
+import org.apache.shenyu.e2e.model.response.SelectorDTO;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -65,11 +68,14 @@ public class DataSynNacosTest {
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
Thread.sleep(10000);
- List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ final List<SelectorDTO> selectorDTOList =
adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
+ Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
+ final List<MetaDataDTO> metaDataDTOList =
adminClient.listAllMetaData();
+ List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ Assertions.assertEquals(metaDataDTOList.size(),
metaDataCacheList.size());
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
- Assertions.assertEquals(1, selectorCacheList.size());
- Assertions.assertEquals(9, metaDataCacheList.size());
- Assertions.assertEquals(9, ruleCacheList.size());
+ final List<RuleDTO> ruleDTOList = adminClient.listAllRules();
+ Assertions.assertEquals(ruleDTOList.size(), ruleCacheList.size());
}
}
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-grpc/src/test/java/org/apache/shenyu/e2e/testcase/grpc/DataSynZookeeperTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-grpc/src/test/java/org/apache/shenyu/e2e/testcase/grpc/DataSynZookeeperTest.java
index 5b3a7433c4..e7f18233dd 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-grpc/src/test/java/org/apache/shenyu/e2e/testcase/grpc/DataSynZookeeperTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-grpc/src/test/java/org/apache/shenyu/e2e/testcase/grpc/DataSynZookeeperTest.java
@@ -25,6 +25,9 @@ import
org.apache.shenyu.e2e.engine.config.ShenYuEngineConfigure;
import org.apache.shenyu.e2e.model.data.MetaData;
import org.apache.shenyu.e2e.model.data.RuleCacheData;
import org.apache.shenyu.e2e.model.data.SelectorCacheData;
+import org.apache.shenyu.e2e.model.response.MetaDataDTO;
+import org.apache.shenyu.e2e.model.response.RuleDTO;
+import org.apache.shenyu.e2e.model.response.SelectorDTO;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -64,12 +67,15 @@ public class DataSynZookeeperTest {
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
Thread.sleep(10000);
- List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ final List<SelectorDTO> selectorDTOList =
adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
+ Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
+ final List<MetaDataDTO> metaDataDTOList =
adminClient.listAllMetaData();
+ List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ Assertions.assertEquals(metaDataDTOList.size(),
metaDataCacheList.size());
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
- Assertions.assertEquals(1, selectorCacheList.size());
- Assertions.assertEquals(9, metaDataCacheList.size());
- Assertions.assertEquals(9, ruleCacheList.size());
+ final List<RuleDTO> ruleDTOList = adminClient.listAllRules();
+ Assertions.assertEquals(ruleDTOList.size(), ruleCacheList.size());
}
}
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-grpc/src/test/java/org/apache/shenyu/e2e/testcase/grpc/GrpcPluginTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-grpc/src/test/java/org/apache/shenyu/e2e/testcase/grpc/GrpcPluginTest.java
index fd04270c3b..57b25b3f65 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-grpc/src/test/java/org/apache/shenyu/e2e/testcase/grpc/GrpcPluginTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-grpc/src/test/java/org/apache/shenyu/e2e/testcase/grpc/GrpcPluginTest.java
@@ -84,22 +84,18 @@ public class GrpcPluginTest {
adminClient.login();
Thread.sleep(10000);
final List<SelectorDTO> selectorDTOList =
adminClient.listAllSelectors();
+ List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
+ Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
final List<MetaDataDTO> metaDataDTOList =
adminClient.listAllMetaData();
- final List<RuleDTO> ruleDTOList = adminClient.listAllRules();
+ List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ Assertions.assertEquals(metaDataDTOList.size(),
metaDataCacheList.size());
selectorId = selectorDTOList.get(0).getId();
selectorIds.add(selectorId);
SelectorDTO selector = adminClient.getSelector(selectorId);
condictionId = selector.getConditionList().get(0).getId();
- Assertions.assertEquals(1, selectorDTOList.size());
- Assertions.assertEquals(9, metaDataDTOList.size());
- Assertions.assertEquals(9, ruleDTOList.size());
-
- List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
- List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
- Assertions.assertEquals(1, selectorCacheList.size());
- Assertions.assertEquals(9, metaDataCacheList.size());
- Assertions.assertEquals(9, ruleCacheList.size());
+ final List<RuleDTO> ruleDTOList = adminClient.listAllRules();
+ Assertions.assertEquals(ruleDTOList.size(), ruleCacheList.size());
MultiValueMap<String, String> formData = new LinkedMultiValueMap<>();
formData.add("id", "15");
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/DataSynHttpTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/DataSynHttpTest.java
index a07863d321..a5db47882d 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/DataSynHttpTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/DataSynHttpTest.java
@@ -25,6 +25,9 @@ import
org.apache.shenyu.e2e.engine.config.ShenYuEngineConfigure;
import org.apache.shenyu.e2e.model.data.MetaData;
import org.apache.shenyu.e2e.model.data.RuleCacheData;
import org.apache.shenyu.e2e.model.data.SelectorCacheData;
+import org.apache.shenyu.e2e.model.response.MetaDataDTO;
+import org.apache.shenyu.e2e.model.response.RuleDTO;
+import org.apache.shenyu.e2e.model.response.SelectorDTO;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -64,11 +67,14 @@ public class DataSynHttpTest {
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
Thread.sleep(10000);
- List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
+ Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
+ List<MetaDataDTO> metaDataDTOList = adminClient.listAllMetaData();
+ List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ Assertions.assertEquals(metaDataDTOList.size(),
metaDataCacheList.size());
+ List<RuleDTO> ruleDTOList = adminClient.listAllRules();
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
- Assertions.assertEquals(1, selectorCacheList.size());
- Assertions.assertEquals(5, metaDataCacheList.size());
- Assertions.assertEquals(5, ruleCacheList.size());
+ Assertions.assertEquals(ruleDTOList.size(), ruleCacheList.size());
}
}
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/DataSynNacosTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/DataSynNacosTest.java
index 73785448f5..7a6b712eb3 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/DataSynNacosTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/DataSynNacosTest.java
@@ -26,6 +26,9 @@ import
org.apache.shenyu.e2e.engine.config.ShenYuEngineConfigure;
import org.apache.shenyu.e2e.model.data.MetaData;
import org.apache.shenyu.e2e.model.data.RuleCacheData;
import org.apache.shenyu.e2e.model.data.SelectorCacheData;
+import org.apache.shenyu.e2e.model.response.MetaDataDTO;
+import org.apache.shenyu.e2e.model.response.RuleDTO;
+import org.apache.shenyu.e2e.model.response.SelectorDTO;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -65,11 +68,14 @@ public class DataSynNacosTest {
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
Thread.sleep(10000);
- List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
+ Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
+ List<MetaDataDTO> metaDataDTOList = adminClient.listAllMetaData();
+ List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ Assertions.assertEquals(metaDataDTOList.size(),
metaDataCacheList.size());
+ List<RuleDTO> ruleDTOList = adminClient.listAllRules();
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
- Assertions.assertEquals(1, selectorCacheList.size());
- Assertions.assertEquals(5, metaDataCacheList.size());
- Assertions.assertEquals(5, ruleCacheList.size());
+ Assertions.assertEquals(ruleDTOList.size(), ruleCacheList.size());
}
}
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/DataSynZookeeperTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/DataSynZookeeperTest.java
index 22a031ce95..704eecaba2 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/DataSynZookeeperTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/DataSynZookeeperTest.java
@@ -25,6 +25,9 @@ import
org.apache.shenyu.e2e.engine.config.ShenYuEngineConfigure;
import org.apache.shenyu.e2e.model.data.MetaData;
import org.apache.shenyu.e2e.model.data.RuleCacheData;
import org.apache.shenyu.e2e.model.data.SelectorCacheData;
+import org.apache.shenyu.e2e.model.response.MetaDataDTO;
+import org.apache.shenyu.e2e.model.response.RuleDTO;
+import org.apache.shenyu.e2e.model.response.SelectorDTO;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -64,12 +67,15 @@ public class DataSynZookeeperTest {
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
Thread.sleep(10000);
- List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
+ Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
+ List<MetaDataDTO> metaDataDTOList = adminClient.listAllMetaData();
+ List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ Assertions.assertEquals(metaDataDTOList.size(),
metaDataCacheList.size());
+ List<RuleDTO> ruleDTOList = adminClient.listAllRules();
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
- Assertions.assertEquals(1, selectorCacheList.size());
- Assertions.assertEquals(5, metaDataCacheList.size());
- Assertions.assertEquals(5, ruleCacheList.size());
+ Assertions.assertEquals(ruleDTOList.size(), ruleCacheList.size());
}
}
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/MotanPluginTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/MotanPluginTest.java
index be8486a89d..f868e68d74 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/MotanPluginTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/MotanPluginTest.java
@@ -82,18 +82,14 @@ public class MotanPluginTest {
adminClient.login();
Thread.sleep(10000);
List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
+ List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
+ Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
List<MetaDataDTO> metaDataDTOList = adminClient.listAllMetaData();
- List<RuleDTO> ruleDTOList = adminClient.listAllRules();
- Assertions.assertEquals(1, selectorDTOList.size());
- Assertions.assertEquals(5, metaDataDTOList.size());
- Assertions.assertEquals(5, ruleDTOList.size());
-
List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
- List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
+ Assertions.assertEquals(metaDataDTOList.size(),
metaDataCacheList.size());
+ List<RuleDTO> ruleDTOList = adminClient.listAllRules();
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
- Assertions.assertEquals(1, selectorCacheList.size());
- Assertions.assertEquals(5, metaDataCacheList.size());
- Assertions.assertEquals(5, ruleCacheList.size());
+ Assertions.assertEquals(ruleDTOList.size(), ruleCacheList.size());
MultiValueMap<String, String> formData = new LinkedMultiValueMap<>();
formData.add("id", "17");
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynHttpTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynHttpTest.java
index 395270344c..8050b730c2 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynHttpTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynHttpTest.java
@@ -25,6 +25,9 @@ import
org.apache.shenyu.e2e.engine.config.ShenYuEngineConfigure;
import org.apache.shenyu.e2e.model.data.MetaData;
import org.apache.shenyu.e2e.model.data.RuleCacheData;
import org.apache.shenyu.e2e.model.data.SelectorCacheData;
+import org.apache.shenyu.e2e.model.response.MetaDataDTO;
+import org.apache.shenyu.e2e.model.response.RuleDTO;
+import org.apache.shenyu.e2e.model.response.SelectorDTO;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -64,11 +67,14 @@ public class DataSynHttpTest {
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
Thread.sleep(10000);
- List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
+ Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
+ List<MetaDataDTO> metaDataDTOList = adminClient.listAllMetaData();
+ List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ Assertions.assertEquals(metaDataDTOList.size(),
metaDataCacheList.size());
+ List<RuleDTO> ruleDTOList = adminClient.listAllRules();
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
- Assertions.assertEquals(1, selectorCacheList.size());
- Assertions.assertEquals(12, metaDataCacheList.size());
- Assertions.assertEquals(12, ruleCacheList.size());
+ Assertions.assertEquals(ruleDTOList.size(), ruleCacheList.size());
}
}
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynNacosTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynNacosTest.java
index 23fb95a370..a2c2b10df0 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynNacosTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynNacosTest.java
@@ -26,6 +26,9 @@ import
org.apache.shenyu.e2e.engine.config.ShenYuEngineConfigure;
import org.apache.shenyu.e2e.model.data.MetaData;
import org.apache.shenyu.e2e.model.data.RuleCacheData;
import org.apache.shenyu.e2e.model.data.SelectorCacheData;
+import org.apache.shenyu.e2e.model.response.MetaDataDTO;
+import org.apache.shenyu.e2e.model.response.RuleDTO;
+import org.apache.shenyu.e2e.model.response.SelectorDTO;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -65,11 +68,14 @@ public class DataSynNacosTest {
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
Thread.sleep(10000);
- List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
+ Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
+ List<MetaDataDTO> metaDataDTOList = adminClient.listAllMetaData();
+ List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ Assertions.assertEquals(metaDataDTOList.size(),
metaDataCacheList.size());
+ List<RuleDTO> ruleDTOList = adminClient.listAllRules();
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
- Assertions.assertEquals(1, selectorCacheList.size());
- Assertions.assertEquals(12, metaDataCacheList.size());
- Assertions.assertEquals(12, ruleCacheList.size());
+ Assertions.assertEquals(ruleDTOList.size(), ruleCacheList.size());
}
}
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynZookeeperTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynZookeeperTest.java
index 2e641e0d4b..ebc6ff5ea1 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynZookeeperTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynZookeeperTest.java
@@ -25,6 +25,9 @@ import
org.apache.shenyu.e2e.engine.config.ShenYuEngineConfigure;
import org.apache.shenyu.e2e.model.data.MetaData;
import org.apache.shenyu.e2e.model.data.RuleCacheData;
import org.apache.shenyu.e2e.model.data.SelectorCacheData;
+import org.apache.shenyu.e2e.model.response.MetaDataDTO;
+import org.apache.shenyu.e2e.model.response.RuleDTO;
+import org.apache.shenyu.e2e.model.response.SelectorDTO;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -64,12 +67,15 @@ public class DataSynZookeeperTest {
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
Thread.sleep(10000);
- List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
+ Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
+ List<MetaDataDTO> metaDataDTOList = adminClient.listAllMetaData();
+ List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ Assertions.assertEquals(metaDataDTOList.size(),
metaDataCacheList.size());
+ List<RuleDTO> ruleDTOList = adminClient.listAllRules();
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
- Assertions.assertEquals(1, selectorCacheList.size());
- Assertions.assertEquals(12, metaDataCacheList.size());
- Assertions.assertEquals(12, ruleCacheList.size());
+ Assertions.assertEquals(ruleDTOList.size(), ruleCacheList.size());
}
}
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/SofaPluginTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/SofaPluginTest.java
index 31956a0e63..7371622e5d 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/SofaPluginTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/SofaPluginTest.java
@@ -80,18 +80,14 @@ public class SofaPluginTest {
adminClient.login();
Thread.sleep(10000);
List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
+ List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
+ Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
List<MetaDataDTO> metaDataDTOList = adminClient.listAllMetaData();
- List<RuleDTO> ruleDTOList = adminClient.listAllRules();
- Assertions.assertEquals(1, selectorDTOList.size());
- Assertions.assertEquals(12, metaDataDTOList.size());
- Assertions.assertEquals(12, ruleDTOList.size());
-
List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
- List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
+ Assertions.assertEquals(metaDataDTOList.size(),
metaDataCacheList.size());
+ List<RuleDTO> ruleDTOList = adminClient.listAllRules();
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
- Assertions.assertEquals(1, selectorCacheList.size());
- Assertions.assertEquals(12, metaDataCacheList.size());
- Assertions.assertEquals(12, ruleCacheList.size());
+ Assertions.assertEquals(ruleDTOList.size(), ruleCacheList.size());
MultiValueMap<String, String> formData = new LinkedMultiValueMap<>();
formData.add("id", "11");
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/DataSynHttpTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/DataSynHttpTest.java
index 403caaf403..2a064bc621 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/DataSynHttpTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/DataSynHttpTest.java
@@ -25,6 +25,9 @@ import
org.apache.shenyu.e2e.engine.config.ShenYuEngineConfigure;
import org.apache.shenyu.e2e.model.data.MetaData;
import org.apache.shenyu.e2e.model.data.RuleCacheData;
import org.apache.shenyu.e2e.model.data.SelectorCacheData;
+import org.apache.shenyu.e2e.model.response.MetaDataDTO;
+import org.apache.shenyu.e2e.model.response.RuleDTO;
+import org.apache.shenyu.e2e.model.response.SelectorDTO;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -65,11 +68,14 @@ public class DataSynHttpTest {
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
Thread.sleep(10000);
- List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
+ Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
+ List<MetaDataDTO> metaDataDTOList = adminClient.listAllMetaData();
+ List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ Assertions.assertEquals(metaDataDTOList.size(),
metaDataCacheList.size());
+ List<RuleDTO> ruleDTOList = adminClient.listAllRules();
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
- Assertions.assertEquals(2, selectorCacheList.size());
- Assertions.assertEquals(13, metaDataCacheList.size());
- Assertions.assertEquals(14, ruleCacheList.size());
+ Assertions.assertEquals(ruleDTOList.size(), ruleCacheList.size());
}
}
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/DataSynNacosTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/DataSynNacosTest.java
index f6a44e2d5c..e81e4c92a8 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/DataSynNacosTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/DataSynNacosTest.java
@@ -26,6 +26,9 @@ import
org.apache.shenyu.e2e.engine.config.ShenYuEngineConfigure;
import org.apache.shenyu.e2e.model.data.MetaData;
import org.apache.shenyu.e2e.model.data.RuleCacheData;
import org.apache.shenyu.e2e.model.data.SelectorCacheData;
+import org.apache.shenyu.e2e.model.response.MetaDataDTO;
+import org.apache.shenyu.e2e.model.response.RuleDTO;
+import org.apache.shenyu.e2e.model.response.SelectorDTO;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -66,11 +69,14 @@ public class DataSynNacosTest {
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
Thread.sleep(10000);
- List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
+ Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
+ List<MetaDataDTO> metaDataDTOList = adminClient.listAllMetaData();
+ List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ Assertions.assertEquals(metaDataDTOList.size(),
metaDataCacheList.size());
+ List<RuleDTO> ruleDTOList = adminClient.listAllRules();
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
- Assertions.assertEquals(2, selectorCacheList.size());
- Assertions.assertEquals(13, metaDataCacheList.size());
- Assertions.assertEquals(14, ruleCacheList.size());
+ Assertions.assertEquals(ruleDTOList.size(), ruleCacheList.size());
}
}
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/DataSynZookeeperTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/DataSynZookeeperTest.java
index 6a7dbb2943..67916a8b14 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/DataSynZookeeperTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/DataSynZookeeperTest.java
@@ -25,6 +25,9 @@ import
org.apache.shenyu.e2e.engine.config.ShenYuEngineConfigure;
import org.apache.shenyu.e2e.model.data.MetaData;
import org.apache.shenyu.e2e.model.data.RuleCacheData;
import org.apache.shenyu.e2e.model.data.SelectorCacheData;
+import org.apache.shenyu.e2e.model.response.MetaDataDTO;
+import org.apache.shenyu.e2e.model.response.RuleDTO;
+import org.apache.shenyu.e2e.model.response.SelectorDTO;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -65,12 +68,15 @@ public class DataSynZookeeperTest {
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
Thread.sleep(10000);
- List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
+ Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
+ List<MetaDataDTO> metaDataDTOList = adminClient.listAllMetaData();
+ List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
+ Assertions.assertEquals(metaDataDTOList.size(),
metaDataCacheList.size());
+ List<RuleDTO> ruleDTOList = adminClient.listAllRules();
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
- Assertions.assertEquals(2, selectorCacheList.size());
- Assertions.assertEquals(13, metaDataCacheList.size());
- Assertions.assertEquals(14, ruleCacheList.size());
+ Assertions.assertEquals(ruleDTOList.size(), ruleCacheList.size());
}
}
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/SpringCloudPluginTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/SpringCloudPluginTest.java
index b1d9d5cf37..39396fa138 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/SpringCloudPluginTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/SpringCloudPluginTest.java
@@ -73,24 +73,19 @@ public class SpringCloudPluginTest {
adminClient.login();
Thread.sleep(10000);
List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
- List<MetaDataDTO> metaDataDTOList = adminClient.listAllMetaData();
- List<RuleDTO> ruleDTOList = adminClient.listAllRules();
- Assertions.assertEquals(2, selectorDTOList.size());
- Assertions.assertEquals(13, metaDataDTOList.size());
- Assertions.assertEquals(14, ruleDTOList.size());
-
+ List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
+ Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
for (SelectorDTO selectorDTO : selectorDTOList) {
if (selectorDTO.getHandle() != null &&
!"".equals(selectorDTO.getHandle())) {
SpringCloudPluginCases.verifierUri(selectorDTO.getHandle());
}
}
-
+ List<MetaDataDTO> metaDataDTOList = adminClient.listAllMetaData();
List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
- List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
+ Assertions.assertEquals(metaDataDTOList.size(),
metaDataCacheList.size());
+ List<RuleDTO> ruleDTOList = adminClient.listAllRules();
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
- Assertions.assertEquals(2, selectorCacheList.size());
- Assertions.assertEquals(13, metaDataCacheList.size());
- Assertions.assertEquals(14, ruleCacheList.size());
+ Assertions.assertEquals(ruleDTOList.size(), ruleCacheList.size());
MultiValueMap<String, String> formData = new LinkedMultiValueMap<>();
formData.add("id", "8");
