You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by wu...@apache.org on 2018/01/09 00:56:38 UTC
[incubator-servicecomb-java-chassis] 02/02: [SCB-195] improve check
method in unit test
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit da3addb9452694e823a14816db94cfeba3e6dd80
Author: yaohaishi <ya...@huawei.com>
AuthorDate: Mon Jan 8 16:02:03 2018 +0800
[SCB-195] improve check method in unit test
---
.../swagger/generator/core/TestOperationGenerator.java | 14 +++++---------
.../swagger/generator/core/TestSwaggerGenerator.java | 10 ++++------
.../processor/annotation/ApiOperationProcessorTest.java | 10 ++++------
.../core/processor/annotation/ApiProcessorTest.java | 10 +++-------
.../annotation/SwaggerDefinitionProcessorTest.java | 6 +++---
5 files changed, 19 insertions(+), 31 deletions(-)
diff --git a/swagger/swagger-generator/generator-core/src/test/java/io/servicecomb/swagger/generator/core/TestOperationGenerator.java b/swagger/swagger-generator/generator-core/src/test/java/io/servicecomb/swagger/generator/core/TestOperationGenerator.java
index b6ca7af..fd1c364 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/io/servicecomb/swagger/generator/core/TestOperationGenerator.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/io/servicecomb/swagger/generator/core/TestOperationGenerator.java
@@ -17,7 +17,9 @@
package io.servicecomb.swagger.generator.core;
+import static org.hamcrest.Matchers.contains;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
import java.lang.reflect.Method;
import java.util.Collections;
@@ -55,9 +57,7 @@ public class TestOperationGenerator {
operationGenerator.generate();
List<String> tagList = operationGenerator.getOperation().getTags();
- assertEquals(2, tagList.size());
- assertEquals("tag1", tagList.get(0));
- assertEquals("tag2", tagList.get(1));
+ assertThat(tagList, contains("tag1", "tag2"));
}
@Test
@@ -71,9 +71,7 @@ public class TestOperationGenerator {
operationGenerator.generate();
List<String> tagList = operationGenerator.getOperation().getTags();
- assertEquals(2, tagList.size());
- assertEquals("default0", tagList.get(0));
- assertEquals("default1", tagList.get(1));
+ assertThat(tagList, contains("default0", "default1"));
}
@Test
@@ -87,9 +85,7 @@ public class TestOperationGenerator {
operationGenerator.generate();
List<String> tagList = operationGenerator.getOperation().getTags();
- assertEquals(2, tagList.size());
- assertEquals("default0", tagList.get(0));
- assertEquals("default1", tagList.get(1));
+ assertThat(tagList, contains("default0", "default1"));
}
private static class TestClass {
diff --git a/swagger/swagger-generator/generator-core/src/test/java/io/servicecomb/swagger/generator/core/TestSwaggerGenerator.java b/swagger/swagger-generator/generator-core/src/test/java/io/servicecomb/swagger/generator/core/TestSwaggerGenerator.java
index 708dc27..bb5ebe8 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/io/servicecomb/swagger/generator/core/TestSwaggerGenerator.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/io/servicecomb/swagger/generator/core/TestSwaggerGenerator.java
@@ -17,6 +17,9 @@
package io.servicecomb.swagger.generator.core;
+import static org.hamcrest.Matchers.contains;
+import static org.junit.Assert.assertThat;
+
import java.util.Collections;
import org.junit.Assert;
@@ -50,11 +53,6 @@ public class TestSwaggerGenerator {
swaggerGenerator.addDefaultTag(null);
swaggerGenerator.addDefaultTag("test2");
- Assert.assertEquals(2, swaggerGenerator.getDefaultTags().size());
- int index = 0;
- for (String tagName : swaggerGenerator.getDefaultTags()) {
- ++index;
- Assert.assertEquals("test" + index, tagName);
- }
+ assertThat(swaggerGenerator.getDefaultTags(), contains("test1", "test2"));
}
}
diff --git a/swagger/swagger-generator/generator-core/src/test/java/io/servicecomb/swagger/generator/core/processor/annotation/ApiOperationProcessorTest.java b/swagger/swagger-generator/generator-core/src/test/java/io/servicecomb/swagger/generator/core/processor/annotation/ApiOperationProcessorTest.java
index 2f706e2..5e1aa6e 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/io/servicecomb/swagger/generator/core/processor/annotation/ApiOperationProcessorTest.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/io/servicecomb/swagger/generator/core/processor/annotation/ApiOperationProcessorTest.java
@@ -17,8 +17,9 @@
package io.servicecomb.swagger.generator.core.processor.annotation;
-import static org.junit.Assert.assertEquals;
+import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
import java.lang.reflect.Method;
import java.util.List;
@@ -43,10 +44,7 @@ public class ApiOperationProcessorTest {
apiOperationProcessor.process(function.getAnnotation(ApiOperation.class),
operationGenerator);
- List<String> tagList = operationGenerator.getOperation().getTags();
- assertEquals(2, tagList.size());
- assertEquals("tag1", tagList.get(0));
- assertEquals("tag2", tagList.get(1));
+ assertThat(operationGenerator.getOperation().getTags(), containsInAnyOrder("tag1", "tag2"));
}
@Test
@@ -73,4 +71,4 @@ public class ApiOperationProcessorTest {
public void functionWithNoTag() {
}
}
-}
\ No newline at end of file
+}
diff --git a/swagger/swagger-generator/generator-core/src/test/java/io/servicecomb/swagger/generator/core/processor/annotation/ApiProcessorTest.java b/swagger/swagger-generator/generator-core/src/test/java/io/servicecomb/swagger/generator/core/processor/annotation/ApiProcessorTest.java
index 9620f1a..d44b7a9 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/io/servicecomb/swagger/generator/core/processor/annotation/ApiProcessorTest.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/io/servicecomb/swagger/generator/core/processor/annotation/ApiProcessorTest.java
@@ -17,7 +17,9 @@
package io.servicecomb.swagger.generator.core.processor.annotation;
+import static org.hamcrest.Matchers.contains;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
import java.util.Set;
@@ -38,13 +40,7 @@ public class ApiProcessorTest {
apiProcessor.process(SwaggerTestTarget.class.getAnnotation(Api.class),
swaggerGenerator);
- Set<String> tags = swaggerGenerator.getDefaultTags();
- assertEquals(2, tags.size());
- int index = 0;
- for (String tagName : tags) {
- ++index;
- assertEquals("tag" + index, tagName);
- }
+ assertThat(swaggerGenerator.getDefaultTags(), contains("tag1", "tag2"));
}
@Test
diff --git a/swagger/swagger-generator/generator-core/src/test/java/io/servicecomb/swagger/generator/core/processor/annotation/SwaggerDefinitionProcessorTest.java b/swagger/swagger-generator/generator-core/src/test/java/io/servicecomb/swagger/generator/core/processor/annotation/SwaggerDefinitionProcessorTest.java
index 2a88a8a..6fd97ac 100644
--- a/swagger/swagger-generator/generator-core/src/test/java/io/servicecomb/swagger/generator/core/processor/annotation/SwaggerDefinitionProcessorTest.java
+++ b/swagger/swagger-generator/generator-core/src/test/java/io/servicecomb/swagger/generator/core/processor/annotation/SwaggerDefinitionProcessorTest.java
@@ -17,7 +17,9 @@
package io.servicecomb.swagger.generator.core.processor.annotation;
+import static org.hamcrest.Matchers.contains;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
import org.junit.Test;
import org.mockito.Mockito;
@@ -52,9 +54,7 @@ public class SwaggerDefinitionProcessorTest {
assertEquals("testValue", tag.getExternalDocs().getDescription());
assertEquals("testUrl", tag.getExternalDocs().getUrl());
assertEquals("127.0.0.1", swagger.getHost());
- assertEquals(2, swagger.getSchemes().size());
- assertEquals(io.swagger.models.Scheme.HTTP, swagger.getSchemes().get(0));
- assertEquals(io.swagger.models.Scheme.HTTPS, swagger.getSchemes().get(1));
+ assertThat(swagger.getSchemes(), contains(io.swagger.models.Scheme.HTTP, io.swagger.models.Scheme.HTTPS));
io.swagger.models.Info info = swagger.getInfo();
assertEquals("title", info.getTitle());
assertEquals("version", info.getVersion());
--
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>.