diff options
Diffstat (limited to 'src/test/java/org/onap/dcae')
13 files changed, 145 insertions, 125 deletions
diff --git a/src/test/java/org/onap/dcae/inventory/InventoryConfigurationTest.java b/src/test/java/org/onap/dcae/inventory/InventoryConfigurationTest.java index f9dadb8..1848a42 100644 --- a/src/test/java/org/onap/dcae/inventory/InventoryConfigurationTest.java +++ b/src/test/java/org/onap/dcae/inventory/InventoryConfigurationTest.java @@ -20,32 +20,36 @@ package org.onap.dcae.inventory; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + +import java.io.File; + +import javax.validation.Validator; + +import org.junit.Test; + import com.fasterxml.jackson.databind.ObjectMapper; + import io.dropwizard.configuration.YamlConfigurationFactory; import io.dropwizard.jackson.Jackson; import io.dropwizard.jersey.validation.Validators; -import org.junit.Test; - -import javax.validation.Validator; -import java.io.File; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; /** * Created by mhwang on 3/22/18. */ public class InventoryConfigurationTest { - final private ObjectMapper objectMapper = Jackson.newObjectMapper(); - final private Validator validator = Validators.newValidator(); - final private YamlConfigurationFactory<InventoryConfiguration> factory + private final ObjectMapper objectMapper = Jackson.newObjectMapper(); + private final Validator validator = Validators.newValidator(); + private final YamlConfigurationFactory<InventoryConfiguration> factory = new YamlConfigurationFactory<>(InventoryConfiguration.class, validator, objectMapper, "dw"); @Test public void testInventoryConfigurationLoad() { try { - final File yaml = new File(Thread.currentThread().getContextClassLoader().getResource("config-inventory.yaml").getPath()); + final File yaml = new File(Thread.currentThread().getContextClassLoader(). + getResource("config-inventory.yaml").getPath()); InventoryConfiguration configuration = factory.build(yaml); assertEquals(configuration.getDatabusControllerConnection().getHost(), "databus-controller-hostname"); @@ -53,7 +57,7 @@ public class InventoryConfigurationTest { assertEquals(configuration.getDatabusControllerConnection().getRequired(), true); assertEquals(configuration.getDataSourceFactory().getUrl(), "jdbc:postgresql://127.0.0.1:5432/dcae_inv"); - } catch(Exception e) { + } catch (Exception e) { fail("Failed to load config-inventory"); } } diff --git a/src/test/java/org/onap/dcae/inventory/LinkSerializerTest.java b/src/test/java/org/onap/dcae/inventory/LinkSerializerTest.java index 81b0554..1afeefa 100644 --- a/src/test/java/org/onap/dcae/inventory/LinkSerializerTest.java +++ b/src/test/java/org/onap/dcae/inventory/LinkSerializerTest.java @@ -20,18 +20,19 @@ package org.onap.dcae.inventory; -import com.fasterxml.jackson.core.JsonGenerator; -import org.junit.Test; - -import javax.ws.rs.core.Link; -import javax.ws.rs.core.UriBuilder; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; import java.net.URI; import java.util.List; import java.util.Map; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.mock; +import javax.ws.rs.core.Link; +import javax.ws.rs.core.UriBuilder; + +import org.junit.Test; + +import com.fasterxml.jackson.core.JsonGenerator; /** * Created by mhwang on 3/25/18. diff --git a/src/test/java/org/onap/dcae/inventory/clients/DatabusControllerClientTest.java b/src/test/java/org/onap/dcae/inventory/clients/DatabusControllerClientTest.java index ae2f2ff..3b5f249 100644 --- a/src/test/java/org/onap/dcae/inventory/clients/DatabusControllerClientTest.java +++ b/src/test/java/org/onap/dcae/inventory/clients/DatabusControllerClientTest.java @@ -20,22 +20,12 @@ package org.onap.dcae.inventory.clients; -import com.fasterxml.jackson.databind.ObjectMapper; -import io.dropwizard.configuration.ConfigurationException; -import io.dropwizard.configuration.YamlConfigurationFactory; -import io.dropwizard.jackson.Jackson; -import io.dropwizard.jersey.validation.Validators; -import org.junit.Before; -import org.junit.Test; -import org.onap.dcae.inventory.InventoryConfiguration; -import org.onap.dcae.inventory.exceptions.DatabusControllerClientException; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.mock; +import static org.powermock.api.mockito.PowerMockito.when; -import javax.validation.Validator; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.Invocation; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; @@ -44,21 +34,35 @@ import java.net.URI; import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.mock; -import static org.powermock.api.mockito.PowerMockito.when; +import javax.validation.Validator; +import javax.ws.rs.client.Client; +import javax.ws.rs.client.Invocation; +import javax.ws.rs.client.WebTarget; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; + +import org.junit.Before; +import org.junit.Test; +import org.onap.dcae.inventory.InventoryConfiguration; +import org.onap.dcae.inventory.exceptions.DatabusControllerClientException; + +import com.fasterxml.jackson.databind.ObjectMapper; + +import io.dropwizard.configuration.ConfigurationException; +import io.dropwizard.configuration.YamlConfigurationFactory; +import io.dropwizard.jackson.Jackson; +import io.dropwizard.jersey.validation.Validators; /** * Created by mhwang on 3/22/18. */ public class DatabusControllerClientTest { - final private ObjectMapper objectMapper = Jackson.newObjectMapper(); - final private Validator validator = Validators.newValidator(); - final private YamlConfigurationFactory<InventoryConfiguration.DatabusControllerConnectionConfiguration> factory - = new YamlConfigurationFactory<>(InventoryConfiguration.DatabusControllerConnectionConfiguration.class, validator, objectMapper, "dw"); + private final ObjectMapper objectMapper = Jackson.newObjectMapper(); + private final Validator validator = Validators.newValidator(); + private final YamlConfigurationFactory<InventoryConfiguration.DatabusControllerConnectionConfiguration> factory + = new YamlConfigurationFactory<>(InventoryConfiguration.DatabusControllerConnectionConfiguration.class, + validator, objectMapper, "dw"); private InventoryConfiguration.DatabusControllerConnectionConfiguration configuration = null; @@ -84,7 +88,7 @@ public class DatabusControllerClientTest { URI uri = new URI("https://databus-controller-hostname:8443/some-component-id"); when(mockClient.target(uri)).thenReturn(mockWebTarget); //when(mockClient.target(new URI(any()))).thenReturn(mockWebTarget); - } catch(URISyntaxException e) { + } catch (URISyntaxException e) { fail("URI syntax error"); } @@ -107,7 +111,7 @@ public class DatabusControllerClientTest { try { assertEquals(client.isExists("some-component-id"), false); - } catch(Exception e) { + } catch (Exception e) { fail("Unexpected exception"); } } @@ -121,9 +125,9 @@ public class DatabusControllerClientTest { try { client.isExists("some-component-id"); fail("This was supposed to be a fail case. Exception not thrown."); - } catch(DatabusControllerClientException e) { + } catch (DatabusControllerClientException e) { // Expected exception - } catch(Exception e) { + } catch (Exception e) { fail("Unexpected exception"); } } diff --git a/src/test/java/org/onap/dcae/inventory/daos/DCAEServicesDAOTest.java b/src/test/java/org/onap/dcae/inventory/daos/DCAEServicesDAOTest.java index af05704..cdafc4d 100644 --- a/src/test/java/org/onap/dcae/inventory/daos/DCAEServicesDAOTest.java +++ b/src/test/java/org/onap/dcae/inventory/daos/DCAEServicesDAOTest.java @@ -20,32 +20,32 @@ package org.onap.dcae.inventory.daos; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + +import org.junit.Before; +import org.junit.Test; +import org.onap.dcae.inventory.dbthings.models.DCAEServiceObject; +import org.skife.jdbi.v2.DBI; + import com.codahale.metrics.MetricRegistry; + import io.dropwizard.db.DataSourceFactory; import io.dropwizard.jackson.Jackson; import io.dropwizard.jdbi.DBIFactory; import io.dropwizard.setup.Environment; import io.swagger.model.DCAEServiceRequest; -import org.junit.Before; -import org.junit.Test; -import org.onap.dcae.inventory.dbthings.models.DCAEServiceObject; -import org.skife.jdbi.v2.DBI; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; /** * Created by mhwang on 3/25/18. */ public class DCAEServicesDAOTest { - private DCAEServicesDAO fooDAO; + private DCAEServicesDAO fooDao; // Learned about the H2 approach from here: // https://stackoverflow.com/questions/35825383/how-to-test-jdbi-daos-with-h2-in-memory-database - protected DataSourceFactory getDataSourceFactory() - { + protected DataSourceFactory getDataSourceFactory() { DataSourceFactory dataSourceFactory = new DataSourceFactory(); dataSourceFactory.setDriverClass( "org.h2.Driver" ); dataSourceFactory.setUrl( "jdbc:h2:mem:testDb" ); @@ -59,13 +59,13 @@ public class DCAEServicesDAOTest { public void setUp() { Environment env = new Environment( "test-env", Jackson.newObjectMapper(), null, new MetricRegistry(), null ); DBI dbi = new DBIFactory().build( env, getDataSourceFactory(), "test" ); - fooDAO = dbi.onDemand(DCAEServicesDAO.class); + fooDao = dbi.onDemand(DCAEServicesDAO.class); } @Test public void testSaveAndGet() { try { - fooDAO.createTable(); + fooDao.createTable(); DCAEServiceRequest request = new DCAEServiceRequest(); request.setTypeId("some-type-id"); request.setVnfId("some-vnf-id"); @@ -73,11 +73,11 @@ public class DCAEServicesDAOTest { request.setVnfLocation("some-vnf-location"); request.setDeploymentRef("some-deployment-ref"); DCAEServiceObject so = new DCAEServiceObject("some-service-id", request); - fooDAO.insert(so); + fooDao.insert(so); - DCAEServiceObject target = fooDAO.getByServiceId("some-service-id"); + DCAEServiceObject target = fooDao.getByServiceId("some-service-id"); assertEquals(target.getServiceId(), so.getServiceId()); - } catch(Exception e) { + } catch (Exception e) { fail("Failure at some point in this compound test."); } } diff --git a/src/test/java/org/onap/dcae/inventory/daos/InventoryDAOManagerTests.java b/src/test/java/org/onap/dcae/inventory/daos/InventoryDAOManagerTests.java index 8346372..50bb373 100644 --- a/src/test/java/org/onap/dcae/inventory/daos/InventoryDAOManagerTests.java +++ b/src/test/java/org/onap/dcae/inventory/daos/InventoryDAOManagerTests.java @@ -20,17 +20,19 @@ package org.onap.dcae.inventory.daos; +import static org.mockito.Mockito.mock; + +import org.junit.Test; import org.onap.dcae.inventory.InventoryConfiguration; + import io.dropwizard.setup.Environment; -import org.junit.Test; -import static org.mockito.Mockito.mock; /** * Created by mhwang on 3/8/17. */ public class InventoryDAOManagerTests { - @Test(expected=InventoryDAOManager.InventoryDAOManagerSetupException.class) + @Test(expected = InventoryDAOManager.InventoryDAOManagerSetupException.class) public void testInitializeStrictness() { InventoryDAOManager daoManager = InventoryDAOManager.getInstance(); Environment environment = mock(Environment.class); diff --git a/src/test/java/org/onap/dcae/inventory/dbthings/daos/DCAEServiceTransactionDAOTests.java b/src/test/java/org/onap/dcae/inventory/dbthings/daos/DCAEServiceTransactionDAOTests.java index c0ad9b8..309560d 100644 --- a/src/test/java/org/onap/dcae/inventory/dbthings/daos/DCAEServiceTransactionDAOTests.java +++ b/src/test/java/org/onap/dcae/inventory/dbthings/daos/DCAEServiceTransactionDAOTests.java @@ -20,6 +20,11 @@ package org.onap.dcae.inventory.dbthings.daos; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; + import org.joda.time.DateTime; import org.junit.Test; import org.onap.dcae.inventory.daos.DCAEServiceComponentsDAO; @@ -27,11 +32,6 @@ import org.onap.dcae.inventory.daos.DCAEServiceTransactionDAO; import org.onap.dcae.inventory.daos.DCAEServicesComponentsMapsDAO; import org.onap.dcae.inventory.daos.DCAEServicesDAO; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.mock; - /** * Created by mhwang on 10/2/17. */ @@ -55,29 +55,29 @@ public class DCAEServiceTransactionDAOTests { DCAEServiceTransactionDAO.DCAEServiceTransactionContext context = new DCAEServiceTransactionDAO.DCAEServiceTransactionContext(serviceId, modifiedTime); - DCAEServicesDAO servicesDAO = mock(DCAEServicesDAO.class); - DCAEServicesComponentsMapsDAO componentsMapsDAO = mock(DCAEServicesComponentsMapsDAO.class); - DCAEServiceComponentsDAO componentsDAO = mock(DCAEServiceComponentsDAO.class); + DCAEServicesDAO servicesDao = mock(DCAEServicesDAO.class); + DCAEServicesComponentsMapsDAO componentsMapsDao = mock(DCAEServicesComponentsMapsDAO.class); + DCAEServiceComponentsDAO componentsDao = mock(DCAEServiceComponentsDAO.class); - DCAEServiceTransactionDAO transactionDAO = new DCAEServiceTransactionDAO() { + DCAEServiceTransactionDAO transactionDao = new DCAEServiceTransactionDAO() { public DCAEServicesDAO getServicesDAO() { - return servicesDAO; + return servicesDao; } public DCAEServicesComponentsMapsDAO getServicesComponentsMappingDAO() { - return componentsMapsDAO; + return componentsMapsDao; } public DCAEServiceComponentsDAO getComponentsDAO() { - return componentsDAO; + return componentsDao; } }; try { - transactionDAO.insert(context); + transactionDao.insert(context); assertTrue(true); - } catch(Exception e) { + } catch (Exception e) { fail("Unexpected error"); } diff --git a/src/test/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceComponentObjectMapperTests.java b/src/test/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceComponentObjectMapperTests.java index bb511e2..65ad2b0 100644 --- a/src/test/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceComponentObjectMapperTests.java +++ b/src/test/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceComponentObjectMapperTests.java @@ -20,14 +20,14 @@ package org.onap.dcae.inventory.dbthings.mappers; -import org.junit.Test; - -import java.sql.ResultSet; - import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; +import java.sql.ResultSet; + +import org.junit.Test; + /** * Created by mhwang on 10/2/17. */ @@ -40,7 +40,7 @@ public class DCAEServiceComponentObjectMapperTests { try { assertNotNull(mapper.map(0, resultSet, null)); - } catch(Exception e) { + } catch (Exception e) { fail("Unexpected exception"); } } diff --git a/src/test/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceObjectMapperTests.java b/src/test/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceObjectMapperTests.java index ab150bb..a0dec3d 100644 --- a/src/test/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceObjectMapperTests.java +++ b/src/test/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceObjectMapperTests.java @@ -20,15 +20,15 @@ package org.onap.dcae.inventory.dbthings.mappers; -import org.junit.Test; - -import java.sql.ResultSet; - import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import java.sql.ResultSet; + +import org.junit.Test; + /** * Created by mhwang on 10/2/17. */ @@ -42,7 +42,7 @@ public class DCAEServiceObjectMapperTests { try { when(resultSet.getString("status")).thenReturn("RUNNING"); assertNotNull(mapper.map(0, resultSet, null)); - } catch(Exception e) { + } catch (Exception e) { fail("Unexpected exception"); } } diff --git a/src/test/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceTypeObjectMapperTests.java b/src/test/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceTypeObjectMapperTests.java index c1caa29..bdac01d 100644 --- a/src/test/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceTypeObjectMapperTests.java +++ b/src/test/java/org/onap/dcae/inventory/dbthings/mappers/DCAEServiceTypeObjectMapperTests.java @@ -20,19 +20,19 @@ package org.onap.dcae.inventory.dbthings.mappers; -import junit.framework.TestCase; -import org.junit.Test; +import static org.junit.Assert.fail; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.mock; +import static org.powermock.api.mockito.PowerMockito.when; import java.sql.Array; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Map; -import static junit.framework.TestCase.assertNotNull; -import static org.junit.Assert.fail; -import static org.mockito.Matchers.anyString; -import static org.mockito.Mockito.mock; -import static org.powermock.api.mockito.PowerMockito.when; +import org.junit.Test; + +import junit.framework.TestCase; /** * Created by mhwang on 10/2/17. @@ -102,7 +102,7 @@ public class DCAEServiceTypeObjectMapperTests { } }); TestCase.assertNotNull(mapper.map(0, resultSet, null)); - } catch(Exception e) { + } catch (Exception e) { fail("Unexpected exception"); } } diff --git a/src/test/java/org/onap/dcae/inventory/dbthings/models/DCAEServiceComponentObjectTests.java b/src/test/java/org/onap/dcae/inventory/dbthings/models/DCAEServiceComponentObjectTests.java index cb81131..1d80059 100644 --- a/src/test/java/org/onap/dcae/inventory/dbthings/models/DCAEServiceComponentObjectTests.java +++ b/src/test/java/org/onap/dcae/inventory/dbthings/models/DCAEServiceComponentObjectTests.java @@ -20,13 +20,14 @@ package org.onap.dcae.inventory.dbthings.models; -import io.swagger.model.DCAEServiceComponentRequest; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotSame; +import org.junit.Test; + +import io.swagger.model.DCAEServiceComponentRequest; + /** * Created by mhwang on 9/27/17. */ diff --git a/src/test/java/org/onap/dcae/inventory/dbthings/models/DCAEServiceObjectTests.java b/src/test/java/org/onap/dcae/inventory/dbthings/models/DCAEServiceObjectTests.java index 7a39883..5d3c272 100644 --- a/src/test/java/org/onap/dcae/inventory/dbthings/models/DCAEServiceObjectTests.java +++ b/src/test/java/org/onap/dcae/inventory/dbthings/models/DCAEServiceObjectTests.java @@ -20,12 +20,13 @@ package org.onap.dcae.inventory.dbthings.models; -import io.swagger.model.DCAEServiceRequest; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import org.junit.Test; + +import io.swagger.model.DCAEServiceRequest; + /** * Created by mhwang on 9/27/17. */ diff --git a/src/test/java/org/onap/dcae/inventory/exceptions/mappers/DBIExceptionMapperTests.java b/src/test/java/org/onap/dcae/inventory/exceptions/mappers/DBIExceptionMapperTests.java index b0d5ba4..21feaba 100644 --- a/src/test/java/org/onap/dcae/inventory/exceptions/mappers/DBIExceptionMapperTests.java +++ b/src/test/java/org/onap/dcae/inventory/exceptions/mappers/DBIExceptionMapperTests.java @@ -20,12 +20,15 @@ package org.onap.dcae.inventory.exceptions.mappers; -import org.onap.dcae.inventory.daos.InventoryDAOManager; -import org.onap.dcae.inventory.exceptions.mappers.DBIExceptionMapper; -import io.swagger.api.ApiResponseMessage; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import javax.ws.rs.core.Response; + import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; +import org.onap.dcae.inventory.daos.InventoryDAOManager; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -33,10 +36,7 @@ import org.skife.jdbi.v2.exceptions.UnableToCreateStatementException; import org.skife.jdbi.v2.exceptions.UnableToExecuteStatementException; import org.skife.jdbi.v2.exceptions.UnableToObtainConnectionException; -import javax.ws.rs.core.Response; - -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; +import io.swagger.api.ApiResponseMessage; /** * Created by mhwang on 3/8/17. @@ -49,14 +49,15 @@ public class DBIExceptionMapperTests { public void testReinitializeSuccess() { // PowerMockito does bytecode magic to mock static methods and use final classes PowerMockito.mockStatic(InventoryDAOManager.class); - InventoryDAOManager mockDAOManager = mock(InventoryDAOManager.class); - when(InventoryDAOManager.getInstance()).thenReturn(mockDAOManager); + InventoryDAOManager mockDaoManager = mock(InventoryDAOManager.class); + when(InventoryDAOManager.getInstance()).thenReturn(mockDaoManager); RuntimeException fakeException = new RuntimeException("Spoofing database failure"); // Test UnableToObtainConnectionExceptionMapper - DBIExceptionMapper.UnableToObtainConnectionExceptionMapper mapperOne = new DBIExceptionMapper.UnableToObtainConnectionExceptionMapper(); + DBIExceptionMapper.UnableToObtainConnectionExceptionMapper mapperOne = + new DBIExceptionMapper.UnableToObtainConnectionExceptionMapper(); Response responseOne = mapperOne.toResponse(new UnableToObtainConnectionException(fakeException)); assert responseOne.getStatus() == 502; String messageOne = ((ApiResponseMessage) responseOne.getEntity()).getMessage(); @@ -64,7 +65,8 @@ public class DBIExceptionMapperTests { // Test UnableToCreateStatementExceptionMapper - DBIExceptionMapper.UnableToCreateStatementExceptionMapper mapperTwo = new DBIExceptionMapper.UnableToCreateStatementExceptionMapper(); + DBIExceptionMapper.UnableToCreateStatementExceptionMapper mapperTwo = + new DBIExceptionMapper.UnableToCreateStatementExceptionMapper(); Response responseTwo = mapperTwo.toResponse(new UnableToCreateStatementException(fakeException)); assert responseTwo.getStatus() == 502; String messageTwo = ((ApiResponseMessage) responseTwo.getEntity()).getMessage(); @@ -72,7 +74,8 @@ public class DBIExceptionMapperTests { // Test UnableToExecuteStatementExceptionMapper - DBIExceptionMapper.UnableToExecuteStatementExceptionMapper mapperThree = new DBIExceptionMapper.UnableToExecuteStatementExceptionMapper(); + DBIExceptionMapper.UnableToExecuteStatementExceptionMapper mapperThree = + new DBIExceptionMapper.UnableToExecuteStatementExceptionMapper(); Response responseThree = mapperThree.toResponse(new UnableToExecuteStatementException(fakeException)); assert responseThree.getStatus() == 502; String messageThree = ((ApiResponseMessage) responseThree.getEntity()).getMessage(); @@ -83,15 +86,16 @@ public class DBIExceptionMapperTests { public void testReinitializeFailed() { // PowerMockito does bytecode magic to mock static methods and use final classes PowerMockito.mockStatic(InventoryDAOManager.class); - InventoryDAOManager mockDAOManager = mock(InventoryDAOManager.class); - when(InventoryDAOManager.getInstance()).thenReturn(mockDAOManager); - Mockito.doThrow(new RuntimeException("Spoof initialization failure")).when(mockDAOManager).initialize(); + InventoryDAOManager mockDaoManager = mock(InventoryDAOManager.class); + when(InventoryDAOManager.getInstance()).thenReturn(mockDaoManager); + Mockito.doThrow(new RuntimeException("Spoof initialization failure")).when(mockDaoManager).initialize(); RuntimeException fakeException = new RuntimeException("Spoofing database failure"); // Test UnableToObtainConnectionExceptionMapper - DBIExceptionMapper.UnableToObtainConnectionExceptionMapper mapperOne = new DBIExceptionMapper.UnableToObtainConnectionExceptionMapper(); + DBIExceptionMapper.UnableToObtainConnectionExceptionMapper mapperOne = + new DBIExceptionMapper.UnableToObtainConnectionExceptionMapper(); Response responseOne = mapperOne.toResponse(new UnableToObtainConnectionException(fakeException)); assert responseOne.getStatus() == 502; String messageOne = ((ApiResponseMessage) responseOne.getEntity()).getMessage(); @@ -99,7 +103,8 @@ public class DBIExceptionMapperTests { // Test UnableToCreateStatementExceptionMapper - DBIExceptionMapper.UnableToCreateStatementExceptionMapper mapperTwo = new DBIExceptionMapper.UnableToCreateStatementExceptionMapper(); + DBIExceptionMapper.UnableToCreateStatementExceptionMapper mapperTwo = + new DBIExceptionMapper.UnableToCreateStatementExceptionMapper(); Response responseTwo = mapperTwo.toResponse(new UnableToCreateStatementException(fakeException)); assert responseTwo.getStatus() == 502; String messageTwo = ((ApiResponseMessage) responseTwo.getEntity()).getMessage(); @@ -107,7 +112,8 @@ public class DBIExceptionMapperTests { // Test UnableToExecuteStatementExceptionMapper - DBIExceptionMapper.UnableToExecuteStatementExceptionMapper mapperThree = new DBIExceptionMapper.UnableToExecuteStatementExceptionMapper(); + DBIExceptionMapper.UnableToExecuteStatementExceptionMapper mapperThree = + new DBIExceptionMapper.UnableToExecuteStatementExceptionMapper(); Response responseThree = mapperThree.toResponse(new UnableToExecuteStatementException(fakeException)); assert responseThree.getStatus() == 502; String messageThree = ((ApiResponseMessage) responseThree.getEntity()).getMessage(); diff --git a/src/test/java/org/onap/dcae/inventory/providers/NotFoundExceptionMapperTests.java b/src/test/java/org/onap/dcae/inventory/providers/NotFoundExceptionMapperTests.java index 8e2b767..87defdf 100644 --- a/src/test/java/org/onap/dcae/inventory/providers/NotFoundExceptionMapperTests.java +++ b/src/test/java/org/onap/dcae/inventory/providers/NotFoundExceptionMapperTests.java @@ -20,12 +20,13 @@ package org.onap.dcae.inventory.providers; -import io.swagger.api.NotFoundException; -import org.junit.Test; +import static org.junit.Assert.assertEquals; import javax.ws.rs.core.Response; -import static org.junit.Assert.assertEquals; +import org.junit.Test; + +import io.swagger.api.NotFoundException; /** * Created by mhwang on 10/2/17. |