Skip to content

Commit bb7795a

Browse files
committed
Use different URIs
1 parent 780d92c commit bb7795a

File tree

1 file changed

+10
-10
lines changed
  • shenyu-integrated-test/shenyu-integrated-test-http/src/test/java/org/apache/shenyu/integrated/test/http/combination

1 file changed

+10
-10
lines changed

shenyu-integrated-test/shenyu-integrated-test-http/src/test/java/org/apache/shenyu/integrated/test/http/combination/SentinelPluginTest.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@
4646

4747
public final class SentinelPluginTest extends AbstractPluginDataInit {
4848

49-
private static final String TEST_SENTINEL_PATH = "/http/test/sentinel/pass";
50-
5149
private static final String TEST_SENTINEL_FALLBACK_PATH = "/http/test/request/accepted";
5250

5351
@BeforeAll
@@ -59,31 +57,33 @@ public static void globalSetup() throws IOException {
5957

6058
@Test
6159
public void test() throws IOException {
60+
String uri = "/http/test/sentinel/pass";
6261
String selectorAndRulesResult =
63-
initSelectorAndRules(PluginEnum.SENTINEL.getName(), "", buildSelectorConditionList(), buildRuleLocalDataList(null));
62+
initSelectorAndRules(PluginEnum.SENTINEL.getName(), "", buildSelectorConditionList(), buildRuleLocalDataList(uri, null));
6463
assertThat(selectorAndRulesResult, is("success"));
6564

6665
Type returnType = new TypeToken<Map<String, Object>>() {
6766
}.getType();
68-
Map<String, Object> result = HttpHelper.INSTANCE.postGateway(TEST_SENTINEL_PATH, returnType);
67+
Map<String, Object> result = HttpHelper.INSTANCE.postGateway(uri, returnType);
6968
assertNotNull(result);
7069
assertEquals("pass", result.get("msg"));
71-
result = HttpHelper.INSTANCE.postGateway(TEST_SENTINEL_PATH, returnType);
70+
result = HttpHelper.INSTANCE.postGateway(uri, returnType);
7271
assertEquals("You have been restricted, please try again later!", result.get("message"));
7372
}
7473

7574
@Test
7675
public void testFallbackUri() throws IOException {
76+
String uri = "/http/test/sentinel/fallback";
7777
String selectorAndRulesResult =
78-
initSelectorAndRules(PluginEnum.SENTINEL.getName(), "", buildSelectorConditionList(), buildRuleLocalDataList(TEST_SENTINEL_FALLBACK_PATH));
78+
initSelectorAndRules(PluginEnum.SENTINEL.getName(), "", buildSelectorConditionList(), buildRuleLocalDataList(uri, TEST_SENTINEL_FALLBACK_PATH));
7979
assertThat(selectorAndRulesResult, is("success"));
8080

8181
Type returnType = new TypeToken<Map<String, Object>>() {
8282
}.getType();
83-
Map<String, Object> result = HttpHelper.INSTANCE.postGateway(TEST_SENTINEL_PATH, returnType);
83+
Map<String, Object> result = HttpHelper.INSTANCE.postGateway(uri, returnType);
8484
assertNotNull(result);
8585
assertEquals("pass", result.get("msg"));
86-
ResultBean fallbackRet = HttpHelper.INSTANCE.postGateway(TEST_SENTINEL_PATH, ResultBean.class);
86+
ResultBean fallbackRet = HttpHelper.INSTANCE.postGateway(uri, ResultBean.class);
8787
assertEquals(202, fallbackRet.getCode());
8888
}
8989

@@ -95,7 +95,7 @@ private static List<ConditionData> buildSelectorConditionList() {
9595
return Collections.singletonList(conditionData);
9696
}
9797

98-
private static List<RuleLocalData> buildRuleLocalDataList(final String fallbackUri) {
98+
private static List<RuleLocalData> buildRuleLocalDataList(final String uri, final String fallbackUri) {
9999
final RuleLocalData ruleLocalData = new RuleLocalData();
100100
SentinelHandle sentinelHandle = new SentinelHandle();
101101
sentinelHandle.setDegradeRuleCount(1d);
@@ -117,7 +117,7 @@ private static List<RuleLocalData> buildRuleLocalDataList(final String fallbackU
117117
ConditionData conditionData = new ConditionData();
118118
conditionData.setParamType(ParamTypeEnum.URI.getName());
119119
conditionData.setOperator(OperatorEnum.EQ.getAlias());
120-
conditionData.setParamValue(TEST_SENTINEL_PATH);
120+
conditionData.setParamValue(uri);
121121
ruleLocalData.setConditionDataList(Collections.singletonList(conditionData));
122122

123123
return Lists.newArrayList(ruleLocalData);

0 commit comments

Comments
 (0)