Use locally-scoped HALMapper in tests to ensure they can safely run concurrently. (#41)

Author: arucard21

src/test/java/io/openapitoools/jackson/dataformat/hal/deser/HALBeanDeserializerJsonViewIT.java

@@ -1,19 +1,21 @@
 package io.openapitoools.jackson.dataformat.hal.deser;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import java.io.IOException;
+import java.io.StringReader;
+
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.annotation.JsonView;
 import com.fasterxml.jackson.databind.MapperFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
+
 import io.openapitools.jackson.dataformat.hal.HALLink;
 import io.openapitools.jackson.dataformat.hal.HALMapper;
 import io.openapitools.jackson.dataformat.hal.annotation.EmbeddedResource;
 import io.openapitools.jackson.dataformat.hal.annotation.Link;
 import io.openapitools.jackson.dataformat.hal.annotation.Resource;
-import org.junit.jupiter.api.Test;
-
-import java.io.StringReader;
-import java.net.URI;
-
-import static org.junit.jupiter.api.Assertions.*;
 
 
 public class HALBeanDeserializerJsonViewIT {
@@ -101,12 +103,12 @@ public class HALBeanDeserializerJsonViewIT {
         ",\"stateWithView2\":\"stateWithView2\"" +
         "}";
 
-    ObjectMapper om = new HALMapper();
-
     @Test
-    public void testDeserializationOfView() throws Exception {
-        om.configure(MapperFeature.DEFAULT_VIEW_INCLUSION, false);
-        TopResource tr = om.readerWithView(ResourceView1.class).readValue(new StringReader(HAL_DOC_VIEW), TopResource.class);
+    public void testDeserializationOfView() throws IOException {
+        TopResource tr = new HALMapper()
+                .configure(MapperFeature.DEFAULT_VIEW_INCLUSION, false)
+                .readerWithView(ResourceView1.class)
+                .readValue(new StringReader(HAL_DOC_VIEW), TopResource.class);
 
         assertNull(tr.childWithoutView);
         assertNull(tr.linkWithoutView);
@@ -123,9 +125,11 @@ public void testDeserializationOfView() throws Exception {
     }
 
     @Test
-    public void testDeserializationOfViewWithInclusion() throws Exception {
-        om.configure(MapperFeature.DEFAULT_VIEW_INCLUSION, true);
-        TopResource tr = om.readerWithView(ResourceView1.class).readValue(new StringReader(HAL_DOC_INCLUSIVE_VIEW), TopResource.class);
+    public void testDeserializationOfViewWithInclusion() throws IOException {
+        TopResource tr = new HALMapper()
+                .configure(MapperFeature.DEFAULT_VIEW_INCLUSION, true)
+                .readerWithView(ResourceView1.class)
+                .readValue(new StringReader(HAL_DOC_INCLUSIVE_VIEW), TopResource.class);
 
         assertNotNull(tr.childWithoutView);
         assertNotNull(tr.linkWithoutView);
@@ -141,8 +145,8 @@ public void testDeserializationOfViewWithInclusion() throws Exception {
     }
 
     @Test
-    public void testDeserializationOfNoView() throws Exception {
-        TopResource tr = om.readValue(new StringReader(HAL_DOC_NO_VIEW), TopResource.class);
+    public void testDeserializationOfNoView() throws IOException {
+        TopResource tr = new HALMapper().readValue(new StringReader(HAL_DOC_NO_VIEW), TopResource.class);
 
         assertNotNull(tr.childWithoutView);
         assertNotNull(tr.linkWithoutView);

src/test/java/io/openapitoools/jackson/dataformat/hal/ser/HALBeanSerializerJsonViewIT.java

@@ -1,30 +1,29 @@
 package io.openapitoools.jackson.dataformat.hal.ser;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.net.URI;
+
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.annotation.JsonView;
 import com.fasterxml.jackson.databind.MapperFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
+
 import io.openapitools.jackson.dataformat.hal.HALLink;
 import io.openapitools.jackson.dataformat.hal.HALMapper;
 import io.openapitools.jackson.dataformat.hal.annotation.EmbeddedResource;
 import io.openapitools.jackson.dataformat.hal.annotation.Link;
 import io.openapitools.jackson.dataformat.hal.annotation.Resource;
-import org.junit.jupiter.api.Test;
-
-import java.net.URI;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
 
 
 public class HALBeanSerializerJsonViewIT {
-
-    ObjectMapper om = new HALMapper();
-
     @Test
     public void testSerializationOfView() throws Exception {
         TopResource res1 = new TopResource();
-
-        om.configure(MapperFeature.DEFAULT_VIEW_INCLUSION, false);
-        String json = om.writerWithView(ResourceView1.class).writeValueAsString(res1);
+        String json = new HALMapper()
+                .configure(MapperFeature.DEFAULT_VIEW_INCLUSION, false)
+                .writerWithView(ResourceView1.class)
+                .writeValueAsString(res1);
         assertEquals("{" +
                 "\"_links\":{" +
                 "\"linkWithView1\":{" +
@@ -47,9 +46,10 @@ public void testSerializationOfView() throws Exception {
     @Test
     public void testSerializationOfViewWithInclusion() throws Exception {
         TopResource res1 = new TopResource();
-
-        om.configure(MapperFeature.DEFAULT_VIEW_INCLUSION, true);
-        String json = om.writerWithView(ResourceView1.class).writeValueAsString(res1);
+        String json = new HALMapper()
+                .configure(MapperFeature.DEFAULT_VIEW_INCLUSION, true)
+                .writerWithView(ResourceView1.class)
+                .writeValueAsString(res1);
         assertEquals("{\"_links\":{" +
                 "\"linkWithView1\":{" +
                 "\"href\":\"/link/with/view/1\"," +
@@ -83,8 +83,7 @@ public void testSerializationOfViewWithInclusion() throws Exception {
     @Test
     public void testSerializationOfNoView() throws Exception {
         TopResource res1 = new TopResource();
-
-        String json = om.writeValueAsString(res1);
+        String json = new HALMapper().writeValueAsString(res1);
         assertEquals("{\"_links\":{" +
                 "\"linkWithView1\":{" +
                 "\"href\":\"/link/with/view/1\"," +