[#327]fix swagger test case randomly fail

Author: liubao68

integration-tests/discovery-tests/price-provider/pom.xml

@@ -40,6 +40,10 @@
       <groupId>com.huaweicloud</groupId>
       <artifactId>spring-cloud-starter-huawei-service-engine</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.swagger</groupId>
+      <artifactId>swagger-core</artifactId>
+    </dependency>
   </dependencies>
 
   <build>

integration-tests/discovery-tests/price-provider/src/main/java/com/huaweicloud/sample/SchemaController.java

@@ -32,6 +32,9 @@
 
 import com.huaweicloud.common.schema.ServiceCombSwaggerHandler;
 
+import io.swagger.models.Swagger;
+import io.swagger.util.Yaml;
+
 /**
  * Class for testing schema generator
  */
@@ -41,17 +44,17 @@ public class SchemaController {
   ServiceCombSwaggerHandler serviceCombSwaggerHandler;
 
   @RequestMapping("/testSchemaGenerator")
-  public String testSchemaGenerator() {
+  public String testSchemaGenerator() throws Exception {
     List<String> schemas = serviceCombSwaggerHandler.getSchemaIds();
     assertThat(schemas.size()).isGreaterThan(2);
     Map<String, String> schemaContents = serviceCombSwaggerHandler.getSchemasMap();
     assertThat(schemaContents.size()).isGreaterThan(2);
 
-    String a1 = schemaContents.get("SchemaContentController").replaceAll("\\s", "");
-    String fileContent = readFile("SchemaContentController.yaml");
-    fileContent = fileContent.substring(fileContent.indexOf("---") + 3);
-    String a2 = fileContent.replaceAll("\\s", "");
-    if (a1.equals(a2)) {
+    String a1 = schemaContents.get("SchemaContentController");
+    String a2 = readFile("SchemaContentController.yaml");
+    Swagger swagger2 = Yaml.mapper().readValue(a2, Swagger.class);
+    Swagger swagger1 = Yaml.mapper().readValue(a1, Swagger.class);
+    if (swagger1.equals(swagger2)) {
       return "success";
     } else {
       return a1;

spring-cloud-huawei-dependencies/pom.xml

@@ -42,6 +42,9 @@
     <snakeyaml.version>1.26</snakeyaml.version>
     <commons-configuration.version>1.10</commons-configuration.version>
     <websocket.version>1.5.0</websocket.version>
+    <spring-fox.version>3.0.0</spring-fox.version>
+    <swagger-core.version>2.1.9</swagger-core.version>
+    <swagger-core-v2.version>1.6.2</swagger-core-v2.version>
   </properties>
 
   <dependencyManagement>
@@ -71,6 +74,32 @@
         <scope>import</scope>
       </dependency>
 
+      <!-- swagger -->
+      <dependency>
+        <groupId>io.springfox</groupId>
+        <artifactId>springfox-boot-starter</artifactId>
+        <version>${spring-fox.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.swagger.core.v3</groupId>
+        <artifactId>swagger-core</artifactId>
+        <version>${swagger-core.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.swagger</groupId>
+        <artifactId>swagger-core</artifactId>
+        <version>${swagger-core-v2.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.swagger</groupId>
+        <artifactId>swagger-models</artifactId>
+        <version>${swagger-core-v2.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.swagger</groupId>
+        <artifactId>swagger-annotations</artifactId>
+        <version>${swagger-core-v2.version}</version>
+      </dependency>
       <!-- servicecomb -->
       <dependency>
         <groupId>org.apache.servicecomb</groupId>

spring-cloud-huawei-swagger/pom.xml

@@ -28,21 +28,14 @@
 
   <artifactId>spring-cloud-huawei-swagger</artifactId>
 
-  <properties>
-    <spring-fox.version>3.0.0</spring-fox.version>
-    <swagger-core.version>2.1.9</swagger-core.version>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>io.springfox</groupId>
       <artifactId>springfox-boot-starter</artifactId>
-      <version>${spring-fox.version}</version>
     </dependency>
     <dependency>
       <groupId>io.swagger.core.v3</groupId>
       <artifactId>swagger-core</artifactId>
-      <version>${swagger-core.version}</version>
     </dependency>
     <dependency>
       <groupId>com.huaweicloud</groupId>