refactor: RA-107 coins and base tests

api/src/test/java/org/cardanofoundation/rosetta/api/BaseMapperTest.java

@@ -2,22 +2,27 @@
 
 import java.math.BigInteger;
 
+import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.mockito.Mock;
+import org.openapitools.jackson.nullable.JsonNullableModule;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.cardanofoundation.rosetta.ConfigurationMapper;
+import org.cardanofoundation.rosetta.api.BaseMapperTest.BaseMappersConfig;
 import org.cardanofoundation.rosetta.api.block.model.domain.ProtocolParams;
 import org.cardanofoundation.rosetta.common.services.ProtocolParamService;
 
 import static org.mockito.Mockito.when;
 
 @ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = {ConfigurationMapper.class, SpringMappersTestConfig.class})
+@ContextConfiguration(classes = {ConfigurationMapper.class, BaseMappersConfig.class})
 public class BaseMapperTest {
   @MockBean
   protected ProtocolParamService protocolParamService;
@@ -30,4 +35,16 @@ public void before() {
     when(protocolParamService.getProtocolParameters()).thenReturn(protocolParams);
     when(protocolParams.getPoolDeposit()).thenReturn(new BigInteger("500"));
   }
+
+  @TestConfiguration
+  @ComponentScan(basePackages = {
+      "org.cardanofoundation.rosetta.api.block.mapper",
+      "org.cardanofoundation.rosetta.common.mapper"})
+  public static class BaseMappersConfig {
+
+    @Bean
+    public JsonNullableModule jsonNullableModule() {
+      return new JsonNullableModule();
+    }
+  }
 }

api/src/test/java/org/cardanofoundation/rosetta/api/BaseSpringMvcTest.java

@@ -0,0 +1,19 @@
+package org.cardanofoundation.rosetta.api;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.web.servlet.MockMvc;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+@SpringBootTest
+@AutoConfigureMockMvc
+public class BaseSpringMvcTest extends TransactionsTestData {
+
+  @Autowired
+  protected ObjectMapper objectMapper;
+
+  @Autowired
+  protected MockMvc mockMvc;
+
+}

api/src/test/java/org/cardanofoundation/rosetta/api/IntegrationTest.java

@@ -1,43 +1,15 @@
 package org.cardanofoundation.rosetta.api;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.context.annotation.Profile;
 import org.springframework.transaction.annotation.Transactional;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import org.junit.jupiter.api.BeforeAll;
 
 import org.cardanofoundation.rosetta.RosettaApiApplication;
-import org.cardanofoundation.rosetta.testgenerator.common.TestConstants;
-import org.cardanofoundation.rosetta.testgenerator.common.TransactionBlockDetails;
 
 @Profile("test-integration")
 @SpringBootTest(
     webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
     classes = {RosettaApiApplication.class})
 @Transactional
-public abstract class IntegrationTest {
-
-  protected static Map<String, TransactionBlockDetails> generatedDataMap;
-
-  @Autowired
-  public TestRestTemplate restTemplate;
-
-  @LocalServerPort
-  protected int serverPort;
-
-  @BeforeAll
-  public static void init(@Autowired ObjectMapper objectMapper) throws IOException {
-    generatedDataMap = objectMapper.readValue(new File("." + TestConstants.FILE_SAVE_PATH),
-        new TypeReference<>() {
-        });
-  }
+public abstract class IntegrationTest extends TransactionsTestData {
 }

api/src/test/java/org/cardanofoundation/rosetta/api/SpringMvcTest.java → api/src/test/java/org/cardanofoundation/rosetta/api/TransactionsTestData.java

@@ -5,9 +5,8 @@
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.web.servlet.MockMvc;
+
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -17,27 +16,14 @@
 import org.cardanofoundation.rosetta.testgenerator.common.TransactionBlockDetails;
 
 @SpringBootTest
-@AutoConfigureMockMvc
-public class SpringMvcTest {
-
-  @Autowired
-  protected ObjectMapper objectMapper;
-
-  @Autowired
-  protected MockMvc mockMvc;
+abstract class TransactionsTestData {
 
   protected static Map<String, TransactionBlockDetails> generatedDataMap;
 
-
-  @Deprecated
-  protected int serverPort;
-
   @BeforeAll
-  public static void init() throws IOException {
-    generatedDataMap = new ObjectMapper().readValue(
+  public static void init(@Autowired ObjectMapper objectMapper) throws IOException {
+    generatedDataMap = objectMapper.readValue(
         new File("." + TestConstants.FILE_SAVE_PATH),
-        new TypeReference<>() {
-        });
+        new TypeReference<>() {});
   }
-
 }

api/src/test/java/org/cardanofoundation/rosetta/api/block/controller/BlockApiImplTest.java

@@ -16,7 +16,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import org.cardanofoundation.rosetta.api.SpringMvcTest;
+import org.cardanofoundation.rosetta.api.BaseSpringMvcTest;
 import org.cardanofoundation.rosetta.api.block.mapper.BlockToBlockResponse;
 import org.cardanofoundation.rosetta.api.block.mapper.BlockTxToBlockTxResponse;
 import org.cardanofoundation.rosetta.api.block.model.domain.Block;
@@ -36,7 +36,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 
-class BlockApiImplTest extends SpringMvcTest {
+class BlockApiImplTest extends BaseSpringMvcTest {
 
   @MockBean
   private BlockService blockService;

api/src/test/java/org/cardanofoundation/rosetta/api/data/account/AccountBalanceApiTest.java

@@ -11,7 +11,7 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-import org.cardanofoundation.rosetta.api.SpringMvcTest;
+import org.cardanofoundation.rosetta.api.BaseSpringMvcTest;
 import org.cardanofoundation.rosetta.common.util.Constants;
 import org.cardanofoundation.rosetta.testgenerator.common.TestConstants;
 import org.cardanofoundation.rosetta.testgenerator.common.TestTransactionNames;
@@ -26,7 +26,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-class AccountBalanceApiTest extends SpringMvcTest {
+class AccountBalanceApiTest extends BaseSpringMvcTest {
 
   private final String upToBlockHash = generatedDataMap.get(
       TestTransactionNames.SIMPLE_LOVELACE_FIRST_TRANSACTION.getName()).blockHash();
@@ -46,22 +46,6 @@ void accountBalance2Ada_Test() {
         accountBalanceResponse.getBalances().getFirst().getCurrency().getSymbol());
   }
 
-  private AccountBalanceResponse post(AccountBalanceRequest accountBalanceRequest) {
-    try {
-      var resp = mockMvc.perform(MockMvcRequestBuilders.post("/account/balance")
-              .contentType(MediaType.APPLICATION_JSON)
-              .content(objectMapper.writeValueAsString(accountBalanceRequest)))
-          .andDo(print())
-          .andExpect(status().isOk()) //200
-          .andReturn()
-          .getResponse()
-          .getContentAsString();
-      return objectMapper.readValue(resp, AccountBalanceResponse.class);
-    } catch (Exception e) {
-      throw new AssertionError(e);
-    }
-
-  }
 
   @Test
   void accountBalance2Lovelace_Test() {
@@ -292,4 +276,21 @@ private static void assertAdaCurrency(AccountBalanceResponse accountBalanceRespo
     assertEquals(Constants.ADA_DECIMALS,
         accountBalanceResponse.getBalances().getFirst().getCurrency().getDecimals());
   }
+
+  private AccountBalanceResponse post(AccountBalanceRequest accountBalanceRequest) {
+    try {
+      var resp = mockMvc.perform(MockMvcRequestBuilders.post("/account/balance")
+              .contentType(MediaType.APPLICATION_JSON)
+              .content(objectMapper.writeValueAsString(accountBalanceRequest)))
+          .andDo(print())
+          .andExpect(status().isOk()) //200
+          .andReturn()
+          .getResponse()
+          .getContentAsString();
+      return objectMapper.readValue(resp, AccountBalanceResponse.class);
+    } catch (Exception e) {
+      throw new AssertionError(e);
+    }
+
+  }
 }