Fixed broken tests

skushnir123 · skushnir123 · commit 9075978f26be · 2022-11-14T10:51:40.000-05:00
diff --git a/cddjava/src/main/resources/Merged/mergedComponent1.txt b/cddjava/src/main/resources/Merged/mergedComponent1.txt
@@ -4,6 +4,11 @@ class Pet {
         return this.name;
     }
 
+    /**
+     * Type of long[][][]
+     */
+    long[][][] names;
+
     /**
      * Type of integer
      */
@@ -14,11 +19,6 @@ class Pet {
      */
     long id;
 
-    /**
-     * Type of long[][][]
-     */
-    long[][][] names;
-
     /**
      * Type of string
      */
diff --git a/cddjava/src/main/resources/OpenAPISpec1/componentCode2.txt b/cddjava/src/main/resources/OpenAPISpec1/componentCode2.txt
@@ -1,12 +1,12 @@
 class Error {
 
     /**
-     * Type of integer
+     * Type of int32
      */
-    int message;
+    int code;
 
     /**
-     * Type of int32
+     * Type of integer
      */
-    int code;
+    int message;
 }
diff --git a/cddjava/src/main/resources/OpenAPISpec2/componentCode1.txt b/cddjava/src/main/resources/OpenAPISpec2/componentCode1.txt
@@ -3,12 +3,12 @@ class Pet {
     /**
      * Type of integer
      */
-    int name;
+    int tag1;
 
     /**
      * Type of integer
      */
-    int tag1;
+    int name;
 
     /**
      * Type of int64
diff --git a/cddjava/src/main/resources/OpenAPISpec2/openapi.yaml b/cddjava/src/main/resources/OpenAPISpec2/openapi.yaml
@@ -32,7 +32,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/Pets"
+                $ref: "#/components/schemas/Pet"
         default:
           description: unexpected error
           content:
@@ -72,7 +72,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/Pets"
+                $ref: "#/components/schemas/Pet"
         default:
           description: unexpected error
           content:
diff --git a/cddjava/src/main/resources/OpenAPISpec2/routesCode.txt b/cddjava/src/main/resources/OpenAPISpec2/routesCode.txt
@@ -6,7 +6,7 @@ interface Routes {
      * @return Expected response to a valid request (Status Code 200), unexpected error (Status Code default),
      */
     @GET(path = "/pets/{petId}")
-    Call<Pets> showDogById(int petId);
+    Call<Pet> showDogById(int petId);
 
     /**
      * Create a pet
@@ -19,12 +19,12 @@ interface Routes {
      * @param limit of type int32. How many items to return at one time (max 100).
      * @return A paged array of pets (Status Code 200), unexpected error (Status Code default),
      */
-    Call<Pets> listPets(int limit);
+    Call<Pet> listPets(int limit);
 
     /**
      * Info for a specific pet
      * @param petId of type integer. The id of the pet to retrieve.
      * @return Expected response to a valid request (Status Code 200), unexpected error (Status Code default),
      */
-    Call<Pets> showPetById(int petId);
+    Call<Pet> showPetById(int petId);
 }
diff --git a/cddjava/src/test/java/io/offscale/MergeTests.java b/cddjava/src/test/java/io/offscale/MergeTests.java
@@ -34,7 +34,7 @@ private static String readFileToString(String filePath) {
     public void mergeComponents_addNewComponent() {
         final Merge merge = new Merge(ImmutableMap.copyOf(openAPISpec2Components), openAPISpec2Routes, "OpenAPISpec1/openapi.yaml");
         final ImmutableMap<String, String> mergedComponents = merge.mergeComponents();
-        assertEquals(4, mergedComponents.size());
+        assertEquals(3, mergedComponents.size());
         assertEquals(mergedComponents.get("Pet"), readFileToString("src/main/resources/Merged/mergedComponent1.txt"));
         assertEquals(mergedComponents.get("Error"), readFileToString("src/main/resources/OpenAPISpec1/componentCode2.txt"));
     }
diff --git a/cddjava/target/classes/OpenAPISpec1/componentCode2.txt b/cddjava/target/classes/OpenAPISpec1/componentCode2.txt
@@ -1,12 +1,12 @@
 class Error {
 
     /**
-     * Type of integer
+     * Type of int32
      */
-    int message;
+    int code;
 
     /**
-     * Type of int32
+     * Type of integer
      */
-    int code;
+    int message;
 }
diff --git a/cddjava/target/classes/OpenAPISpec2/componentCode1.txt b/cddjava/target/classes/OpenAPISpec2/componentCode1.txt
@@ -3,12 +3,12 @@ class Pet {
     /**
      * Type of integer
      */
-    int name;
+    int tag1;
 
     /**
      * Type of integer
      */
-    int tag1;
+    int name;
 
     /**
      * Type of int64
diff --git a/cddjava/target/classes/OpenAPISpec2/openapi.yaml b/cddjava/target/classes/OpenAPISpec2/openapi.yaml
@@ -32,7 +32,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/Pets"
+                $ref: "#/components/schemas/Pet"
         default:
           description: unexpected error
           content:
@@ -72,7 +72,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/Pets"
+                $ref: "#/components/schemas/Pet"
         default:
           description: unexpected error
           content:
diff --git a/cddjava/target/classes/OpenAPISpec2/routesCode.txt b/cddjava/target/classes/OpenAPISpec2/routesCode.txt
@@ -6,7 +6,7 @@ interface Routes {
      * @return Expected response to a valid request (Status Code 200), unexpected error (Status Code default),
      */
     @GET(path = "/pets/{petId}")
-    Call<Pets> showDogById(int petId);
+    Call<Pet> showDogById(int petId);
 
     /**
      * Create a pet
@@ -19,12 +19,12 @@ interface Routes {
      * @param limit of type int32. How many items to return at one time (max 100).
      * @return A paged array of pets (Status Code 200), unexpected error (Status Code default),
      */
-    Call<Pets> listPets(int limit);
+    Call<Pet> listPets(int limit);
 
     /**
      * Info for a specific pet
      * @param petId of type integer. The id of the pet to retrieve.
      * @return Expected response to a valid request (Status Code 200), unexpected error (Status Code default),
      */
-    Call<Pets> showPetById(int petId);
+    Call<Pet> showPetById(int petId);
 }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ private static String readFileToString(String filePath) {`
`34`	`34`	`public void mergeComponents_addNewComponent() {`
`35`	`35`	`final Merge merge = new Merge(ImmutableMap.copyOf(openAPISpec2Components), openAPISpec2Routes, "OpenAPISpec1/openapi.yaml");`
`36`	`36`	`final ImmutableMap<String, String> mergedComponents = merge.mergeComponents();`
`37`		`- assertEquals(4, mergedComponents.size());`
	`37`	`+ assertEquals(3, mergedComponents.size());`
`38`	`38`	`assertEquals(mergedComponents.get("Pet"), readFileToString("src/main/resources/Merged/mergedComponent1.txt"));`
`39`	`39`	`assertEquals(mergedComponents.get("Error"), readFileToString("src/main/resources/OpenAPISpec1/componentCode2.txt"));`
`40`	`40`	`}`