From 0081451051e155e758a6d0be40f2fb8b18c434c9 Mon Sep 17 00:00:00 2001 From: Piotr Darosz Date: Mon, 18 Jun 2018 12:46:35 +0200 Subject: Refactor tests inside the catalog-dao model Use Hamcrest matchers to simplify getter/setter tests structure Change-Id: Icee88395034ffb61e60a9190d2a9e77571e6fac3 Issue-ID: SDC-1434 Signed-off-by: Piotr Darosz --- catalog-dao/pom.xml | 7 ++ .../sdc/be/dao/model/FacetedSearchFacet.java | 3 + .../sdc/be/dao/model/FacetedSearchFacetTest.java | 50 +------- .../sdc/be/dao/model/FacetedSearchResult.java | 13 ++ .../openecomp/sdc/be/dao/model/FetchContext.java | 13 ++ .../be/dao/model/GetMultipleDataResultTest.java | 131 ++------------------- 6 files changed, 47 insertions(+), 170 deletions(-) create mode 100644 catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/FacetedSearchResult.java create mode 100644 catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/FetchContext.java (limited to 'catalog-dao') diff --git a/catalog-dao/pom.xml b/catalog-dao/pom.xml index 718674211a..b0ffa4ce45 100644 --- a/catalog-dao/pom.xml +++ b/catalog-dao/pom.xml @@ -119,6 +119,13 @@ test + + com.google.code.bean-matchers + bean-matchers + ${bean-matchers.version} + test + + org.yaml snakeyaml diff --git a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/model/FacetedSearchFacet.java b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/model/FacetedSearchFacet.java index 24db9b6912..c71c8ae6c5 100644 --- a/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/model/FacetedSearchFacet.java +++ b/catalog-dao/src/main/java/org/openecomp/sdc/be/dao/model/FacetedSearchFacet.java @@ -33,6 +33,9 @@ public class FacetedSearchFacet implements Serializable { this.facetValue = facetValue; } + private FacetedSearchFacet() { + } + public String getFacetValue() { return facetValue; } diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/FacetedSearchFacetTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/FacetedSearchFacetTest.java index 79ee69bd8e..8a02bc008a 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/FacetedSearchFacetTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/FacetedSearchFacetTest.java @@ -1,55 +1,13 @@ package org.openecomp.sdc.be.dao.model; import org.junit.Test; - +import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; +import static org.hamcrest.MatcherAssert.assertThat; public class FacetedSearchFacetTest { - private FacetedSearchFacet createTestSubject() { - return new FacetedSearchFacet("", 0); - } - - - @Test - public void testGetFacetValue() throws Exception { - FacetedSearchFacet testSubject; - String result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getFacetValue(); - } - - - @Test - public void testSetFacetValue() throws Exception { - FacetedSearchFacet testSubject; - String facetValue = ""; - - // default test - testSubject = createTestSubject(); - testSubject.setFacetValue(facetValue); - } - - - @Test - public void testGetCount() throws Exception { - FacetedSearchFacet testSubject; - long result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getCount(); - } - - @Test - public void testSetCount() throws Exception { - FacetedSearchFacet testSubject; - long count = 555; - - // default test - testSubject = createTestSubject(); - testSubject.setCount(count); + public void shouldHaveValidGettersAndSetters(){ + assertThat(FacetedSearchFacet.class, hasValidGettersAndSetters()); } } \ No newline at end of file diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/FacetedSearchResult.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/FacetedSearchResult.java new file mode 100644 index 0000000000..b262decb43 --- /dev/null +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/FacetedSearchResult.java @@ -0,0 +1,13 @@ +package org.openecomp.sdc.be.dao.model; + +import org.junit.Test; + +import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; +import static org.hamcrest.MatcherAssert.assertThat; + +public class FacetedSearchResult { + @Test + public void shouldHaveValidGettersAndSetters(){ + assertThat(FacetedSearchResult.class, hasValidGettersAndSetters()); + } +} \ No newline at end of file diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/FetchContext.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/FetchContext.java new file mode 100644 index 0000000000..c7ed9bc087 --- /dev/null +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/FetchContext.java @@ -0,0 +1,13 @@ +package org.openecomp.sdc.be.dao.model; + +import org.junit.Test; + +import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; +import static org.hamcrest.MatcherAssert.assertThat; + +public class FetchContext { + @Test + public void shouldHaveValidGettersAndSetters(){ + assertThat(FetchContext.class, hasValidGettersAndSetters()); + } +} \ No newline at end of file diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/GetMultipleDataResultTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/GetMultipleDataResultTest.java index a3304517f6..843e39899a 100644 --- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/GetMultipleDataResultTest.java +++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/model/GetMultipleDataResultTest.java @@ -1,137 +1,20 @@ package org.openecomp.sdc.be.dao.model; -import org.apache.tinkerpop.gremlin.structure.T; import org.junit.Test; -public class GetMultipleDataResultTest { - - private GetMultipleDataResult createTestSubject() { - return new GetMultipleDataResult<>(); - } +import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters; +import static org.hamcrest.MatcherAssert.assertThat; +public class GetMultipleDataResultTest { + @Test public void testCtor() throws Exception { new GetMultipleDataResult<>(new String [1], new Object[1]); new GetMultipleDataResult<>(new String [1], new String [1], 0L, 0L, 1, 1); } - - @Test - public void testGetTypes() throws Exception { - GetMultipleDataResult testSubject; - String[] result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getTypes(); - } - - @Test - public void testGetData() throws Exception { - GetMultipleDataResult testSubject; - Object[] result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getData(); - } - - @Test - public void testSetTypes() throws Exception { - GetMultipleDataResult testSubject; - String[] types = new String[] { "" }; - - // default test - testSubject = createTestSubject(); - testSubject.setTypes(types); - } - - @Test - public void testSetData() throws Exception { - GetMultipleDataResult testSubject; - T[] data = new T[] { null }; - - // default test - testSubject = createTestSubject(); - testSubject.setData(data); - } - - @Test - public void testSetQueryDuration() throws Exception { - GetMultipleDataResult testSubject; - long queryDuration = 0L; - - // default test - testSubject = createTestSubject(); - testSubject.setQueryDuration(queryDuration); - } - + @Test - public void testSetTotalResults() throws Exception { - GetMultipleDataResult testSubject; - long totalResults = 0L; - - // default test - testSubject = createTestSubject(); - testSubject.setTotalResults(totalResults); - } - - @Test - public void testSetFrom() throws Exception { - GetMultipleDataResult testSubject; - int from = 0; - - // default test - testSubject = createTestSubject(); - testSubject.setFrom(from); - } - - @Test - public void testSetTo() throws Exception { - GetMultipleDataResult testSubject; - int to = 0; - - // default test - testSubject = createTestSubject(); - testSubject.setTo(to); - } - - @Test - public void testGetQueryDuration() throws Exception { - GetMultipleDataResult testSubject; - long result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getQueryDuration(); - } - - @Test - public void testGetTotalResults() throws Exception { - GetMultipleDataResult testSubject; - long result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getTotalResults(); - } - - @Test - public void testGetFrom() throws Exception { - GetMultipleDataResult testSubject; - int result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getFrom(); - } - - @Test - public void testGetTo() throws Exception { - GetMultipleDataResult testSubject; - int result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getTo(); + public void shouldHaveValidGettersAndSetters(){ + assertThat(GetMultipleDataResultTest.class, hasValidGettersAndSetters()); } } \ No newline at end of file -- cgit 1.2.3-korg