reduce failing test to 2

Author: gracekarina

modules/swagger-parser-v3/src/test/java/io/swagger/v3/parser/processors/SchemaProcessorTest.java

@@ -26,15 +26,12 @@ public class SchemaProcessorTest {
     @Mocked
     ExternalRefProcessor externalRefProcessor;
 
-
     @Test
     public void testProcessRefSchema_ExternalRef() throws Exception {
 
         final String ref = "http://my.company.com/path/to/file.json#/foo/bar";
         final String newRef = "bar";
 
-        expectCreationOfExternalRefProcessor();
-
         new Expectations() {{
 
             externalRefProcessor.processRefToExternalSchema(ref, RefFormat.URL);
@@ -54,8 +51,6 @@ public void testProcessRefSchema_ExternalRef() throws Exception {
     public void testProcessRefSchema_InternalRef() throws Exception {
         final String ref = "#/components/schemas/bar";
 
-        expectCreationOfExternalRefProcessor();
-
         Schema refModel = new Schema().$ref(ref);
 
         new SchemaProcessor(cache, openAPI).processSchema(refModel);
@@ -85,7 +80,6 @@ public void testProcessArraySchema() throws Exception {
 
     @Test
     public void testProcessComposedSchema() throws Exception {
-        expectCreationOfExternalRefProcessor();
 
         final String ref1 = "http://my.company.com/path/to/file.json#/foo/bar";
         final String ref2 = "http://my.company.com/path/to/file.json#/this/that";
@@ -152,32 +146,38 @@ public void testProcessSchema() throws Exception {
 
     @Test
     public void testProcessRefProperty_ExternalRef() throws Exception {
-        expectCreationOfExternalRefProcessor();
+
+        final ExternalRefProcessor[] erp = {new ExternalRefProcessor(cache, openAPI)};
+        new Expectations() {{
+            erp[0] = new ExternalRefProcessor(cache, openAPI);
+            times = 1;
+        }};
 
         final String ref = "http://my.company.com/path/to/file.json#/foo/bar";
         final Schema refProperty = new Schema().$ref(ref);
 
-        expectCallToExternalRefProcessor(ref, RefFormat.URL, "bar");
+        new Expectations() {{
+            erp[0].processRefToExternalSchema(ref, RefFormat.URL );
+            times = 1;
+            result = "bar";
+        }};
 
         new SchemaProcessor(cache, openAPI).processSchema(refProperty);
 
         new FullVerifications() {{
+            erp[0].processRefToExternalSchema(ref, RefFormat.URL);
+            times = 1;
         }};
 
         assertEquals(refProperty.get$ref(), "#/components/schemas/bar");
     }
 
-    private void expectCallToExternalRefProcessor(final String ref, final RefFormat refFormat, final String newRef) {
+    @Test
+    public void testProcessRefProperty_InternalRef() throws Exception {
         new Expectations() {{
-            externalRefProcessor.processRefToExternalSchema(ref, refFormat);
+            new ExternalRefProcessor(cache, openAPI);
             times = 1;
-            result = newRef;
         }};
-    }
-
-    @Test
-    public void testProcessRefProperty_InternalRef() throws Exception {
-        expectCreationOfExternalRefProcessor();
 
         final String expectedRef = "#/components/schemas/foo";
         final Schema property = new Schema().$ref(expectedRef);
@@ -191,18 +191,27 @@ public void testProcessRefProperty_InternalRef() throws Exception {
 
     @Test
     public void testProcessArrayProperty_ItemsIsRefProperty() throws Exception {
-        expectCreationOfExternalRefProcessor();
+        final ExternalRefProcessor[] erp = {new ExternalRefProcessor(cache, openAPI)};
+        new Expectations() {{
+            erp[0] = new ExternalRefProcessor(cache, openAPI);
+            times = 1;
+        }};
         final String ref = "http://my.company.com/path/to/file.json#/foo/bar";
         final Schema refProperty = new Schema().$ref(ref);
 
         ArraySchema arrayProperty = new ArraySchema();
         arrayProperty.setItems(refProperty);
-
-        expectCallToExternalRefProcessor(ref, RefFormat.URL, "bar");
+        new Expectations() {{
+            erp[0].processRefToExternalSchema(ref, RefFormat.URL );
+            times = 1;
+            result = "bar";
+        }};
 
         new SchemaProcessor(cache, openAPI).processSchema(arrayProperty);
 
         new FullVerifications() {{
+            erp[0].processRefToExternalSchema(ref, RefFormat.URL);
+            times = 1;
         }};
 
         assertEquals((arrayProperty.getItems()).get$ref(), "#/components/schemas/bar");
@@ -211,28 +220,29 @@ public void testProcessArrayProperty_ItemsIsRefProperty() throws Exception {
 
     @Test
     public void testProcessMapProperty_AdditionalPropertiesIsRefProperty() throws Exception {
-        expectCreationOfExternalRefProcessor();
+        final ExternalRefProcessor[] erp = {new ExternalRefProcessor(cache, openAPI)};
+        new Expectations() {{
+            erp[0] = new ExternalRefProcessor(cache, openAPI);
+            times = 1;
+        }};
         final String ref = "http://my.company.com/path/to/file.json#/foo/bar";
         final Schema refProperty = new Schema().$ref(ref);
 
-
         refProperty.setAdditionalProperties(refProperty);
 
-        expectCallToExternalRefProcessor(ref, RefFormat.URL, "bar");
+        new Expectations() {{
+            erp[0].processRefToExternalSchema(ref, RefFormat.URL );
+            times = 1;
+            result = "bar";
+        }};
 
         new SchemaProcessor(cache, openAPI).processSchema(refProperty);
 
         new FullVerifications() {{
+            erp[0].processRefToExternalSchema(ref, RefFormat.URL);
+            times = 1;
         }};
 
         assertEquals((((Schema)refProperty.getAdditionalProperties()).get$ref()), "#/components/schemas/bar");
     }
-
-    private void expectCreationOfExternalRefProcessor() {
-        new Expectations() {{
-            new ExternalRefProcessor(cache, openAPI);
-            times = 1;
-            result = externalRefProcessor;
-        }};
-    }
 }