study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

Fix the issues of test cases

Browse Source
This commit is contained in:
mercyblitz 2019-02-22 13:26:36 +08:00
parent 0337f0fa6c
commit 6daba36e35
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestParamsMatcher.java
View File

@ -45,12 +45,12 @@ public class HttpRequestParamsMatcher extends AbstractHttpRequestMatcher {
@Override
public boolean match(HttpRequest request) {
for (ParamExpression paramExpression : expressions) {
if (!paramExpression.match(request)) {
return false;
}
}
if (paramExpression.match(request)) {
return true;
}
}
return false;
}
private static Set<ParamExpression> parseExpressions(String... params) {
Set<ParamExpression> expressions = new LinkedHashSet<>();

11
spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/RequestMetadata.java
View File

@ -240,15 +240,18 @@ public class RequestMetadata {
RequestMetadata that = (RequestMetadata) o;
return Objects.equals(method, that.method) &&
Objects.equals(path, that.path) &&
Objects.equals(params, that.params) &&
Objects.equals(headers, that.headers) &&
Objects.equals(consumes, that.consumes) &&
Objects.equals(produces, that.produces);
Objects.equals(produces, that.produces) &&
// Metadata should not compare the values
Objects.equals(getParamNames(), that.getParamNames()) &&
Objects.equals(getHeaderNames(), that.getHeaderNames());
}
@Override
public int hashCode() {
return Objects.hash(method, path, params, headers, consumes, produces);
// The values of metadata should not use for the hashCode() method
return Objects.hash(method, path, consumes, produces, getParamNames(), getHeaderNames());
}
@Override

2
spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/ProduceMediaTypeExpressionTest.java
View File

@ -35,6 +35,6 @@ public class ProduceMediaTypeExpressionTest extends AbstractMediaTypeExpressionT
Assert.assertTrue(expression.match(Arrays.asList(MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON)));
expression = createExpression(MediaType.APPLICATION_JSON_VALUE);
Assert.assertTrue(expression.match(Arrays.asList(MediaType.APPLICATION_XML)));
Assert.assertFalse(expression.match(Arrays.asList(MediaType.APPLICATION_XML)));
}
}

4
spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/metadata/RequestMetadataTest.java
View File

@ -68,8 +68,8 @@ public class RequestMetadataTest {
metadata.addHeader("d", "1").addHeader("e", "2").addHeader("f", "3");
metadata2.addHeader("d", "1").addHeader("e", "2");
Assert.assertEquals(metadata, metadata2);
Assert.assertEquals(metadata.hashCode(), metadata2.hashCode());
Assert.assertNotEquals(metadata, metadata2);
Assert.assertNotEquals(metadata.hashCode(), metadata2.hashCode());
}
// @Test