You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by sh...@apache.org on 2022/07/10 09:51:59 UTC
[servicecomb-java-chassis] branch master updated: [SCB-2634]migrate common-access-log module to mockito (#3184)
This is an automated email from the ASF dual-hosted git repository.
shoothzj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 431a1ff57 [SCB-2634]migrate common-access-log module to mockito (#3184)
431a1ff57 is described below
commit 431a1ff574e542909d078f4463e67749ecc959e4
Author: Tian Luo <fu...@outlook.com>
AuthorDate: Sun Jul 10 17:51:50 2022 +0800
[SCB-2634]migrate common-access-log module to mockito (#3184)
* [SCB-2634]migrate common-access-log module to mockito
Co-authored-by: ZhangJian He <sh...@gmail.com>
---
common/common-access-log/pom.xml | 5 ---
.../impl/VertxRestAccessLogPatternParserTest.java | 51 ++++++++++++----------
2 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/common/common-access-log/pom.xml b/common/common-access-log/pom.xml
index 4b41b823d..112e8c46d 100644
--- a/common/common-access-log/pom.xml
+++ b/common/common-access-log/pom.xml
@@ -46,10 +46,5 @@
<artifactId>vertx-codegen</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jmockit</groupId>
- <artifactId>jmockit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/parser/impl/VertxRestAccessLogPatternParserTest.java b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/parser/impl/VertxRestAccessLogPatternParserTest.java
index 7ce3478db..5a9cb0e5c 100644
--- a/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/parser/impl/VertxRestAccessLogPatternParserTest.java
+++ b/common/common-access-log/src/test/java/org/apache/servicecomb/common/accessLog/core/parser/impl/VertxRestAccessLogPatternParserTest.java
@@ -53,8 +53,6 @@ import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import io.vertx.ext.web.RoutingContext;
-import mockit.Mock;
-import mockit.MockUp;
public class VertxRestAccessLogPatternParserTest {
private static final String ROW_PATTERN = "[cs-method] %m %s%T%D%h%v%p%B%b%r%U%q"
@@ -312,30 +310,37 @@ public class VertxRestAccessLogPatternParserTest {
metaList0.add(new VertxRestAccessLogItemMeta("%0", "}abc", null, 1));
metaList0.add(new VertxRestAccessLogItemMeta("%m", null, null));
- new MockUp<VertxRestAccessLogPatternParser>() {
- @Mock
- List<VertxRestAccessLogItemMeta> loadVertxRestLogItemMeta() {
- List<VertxRestAccessLogItemMeta> metaList = new ArrayList<>(1);
- CompositeVertxRestAccessLogItemMeta compositeMeta0 = new CompositeVertxRestAccessLogItemMeta() {
- @Override
- public List<VertxRestAccessLogItemMeta> getAccessLogItemMetas() {
- return metaList0;
- }
- };
- CompositeVertxRestAccessLogItemMeta compositeMeta1 = new CompositeVertxRestAccessLogItemMeta() {
- @Override
- public List<VertxRestAccessLogItemMeta> getAccessLogItemMetas() {
- return metaList1;
- }
- };
- metaList.add(compositeMeta0);
- metaList.add(compositeMeta1);
- metaList.add(new VertxRestAccessLogItemMeta("%{", null, null));
- return metaList;
+ CompositeVertxRestAccessLogItemMeta compositeMeta0 = new CompositeVertxRestAccessLogItemMeta() {
+ @Override
+ public List<VertxRestAccessLogItemMeta> getAccessLogItemMetas() {
+ return metaList0;
+ }
+ };
+ CompositeVertxRestAccessLogItemMeta compositeMeta1 = new CompositeVertxRestAccessLogItemMeta() {
+ @Override
+ public List<VertxRestAccessLogItemMeta> getAccessLogItemMetas() {
+ return metaList1;
}
};
- VertxRestAccessLogPatternParser parser = new VertxRestAccessLogPatternParser();
+ List<VertxRestAccessLogItemMeta> metaList = new ArrayList<>(1);
+ metaList.add(compositeMeta0);
+ metaList.add(compositeMeta1);
+ metaList.add(new VertxRestAccessLogItemMeta("%{", null, null));
+
+ VertxRestAccessLogPatternParser parser = Mockito.mock(VertxRestAccessLogPatternParser.class);
+ Mockito.when(parser.getMetaList()).thenAnswer(invocation -> {
+ List<VertxRestAccessLogItemMeta> resultMetaList = new ArrayList<>();
+ for (VertxRestAccessLogItemMeta meta : metaList) {
+ if (CompositeVertxRestAccessLogItemMeta.class.isAssignableFrom(meta.getClass())) {
+ resultMetaList.addAll(((CompositeVertxRestAccessLogItemMeta) meta).getAccessLogItemMetas());
+ } else {
+ resultMetaList.add(meta);
+ }
+ }
+ VertxRestAccessLogPatternParser.sortAccessLogItemMeta(resultMetaList);
+ return resultMetaList;
+ });
List<VertxRestAccessLogItemMeta> accessLogItemMetaList = parser.getMetaList();