Improve coverage

Author: ctmay4

src/main/java/com/imsweb/seerapi/client/disease/YearRangeBoolean.java

@@ -284,6 +284,14 @@ public void testBeans() {
                 hasValidBeanConstructor(),
                 hasValidGettersAndSetters()
         ));
+        MatcherAssert.assertThat(DiseaseSearchResults.class, CoreMatchers.allOf(
+                hasValidBeanConstructor(),
+                hasValidGettersAndSetters()
+        ));
+        MatcherAssert.assertThat(DiseaseSource.class, CoreMatchers.allOf(
+                hasValidBeanConstructor(),
+                hasValidGettersAndSetters()
+        ));
     }
 
 }

src/main/java/com/imsweb/seerapi/client/staging/StagingCode.java

@@ -174,9 +174,29 @@ public void testGlossaryMatch() throws IOException {
 
     @Test
     public void testBeans() {
+        MatcherAssert.assertThat(GlossaryResource.class, CoreMatchers.allOf(
+                hasValidBeanConstructor(),
+                hasValidGettersAndSetters()
+        ));
+        MatcherAssert.assertThat(GlossaryChangelogEntry.class, CoreMatchers.allOf(
+                hasValidBeanConstructor(),
+                hasValidGettersAndSetters()
+        ));
+        MatcherAssert.assertThat(GlossarySearchResults.class, CoreMatchers.allOf(
+                hasValidBeanConstructor(),
+                hasValidGettersAndSetters()
+        ));
+        MatcherAssert.assertThat(GlossaryChangelogResults.class, CoreMatchers.allOf(
+                hasValidBeanConstructor(),
+                hasValidGettersAndSetters()
+        ));
         MatcherAssert.assertThat(GlossaryHistoryEvent.class, CoreMatchers.allOf(
                 hasValidBeanConstructor(),
                 hasValidGettersAndSetters()
         ));
+        MatcherAssert.assertThat(KeywordMatch.class, CoreMatchers.allOf(
+                hasValidBeanConstructor(),
+                hasValidGettersAndSetters()
+        ));
     }
 }

src/main/java/com/imsweb/seerapi/client/staging/StagingEndpoint.java

@@ -2,6 +2,8 @@
 
 import java.io.IOException;
 
+import org.hamcrest.CoreMatchers;
+import org.hamcrest.MatcherAssert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -10,8 +12,11 @@
 import com.imsweb.seerapi.client.mph.MphInput;
 import com.imsweb.seerapi.client.mph.MphInputPair;
 import com.imsweb.seerapi.client.mph.MphOutput;
+import com.imsweb.seerapi.client.mph.MphRule;
 import com.imsweb.seerapi.client.mph.MphService;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -147,4 +152,12 @@ public void testInvalidInput() throws IOException {
         _MPH.mph(new MphInputPair(i1, i2)).execute().body();
     }
 
+    @Test
+    public void testBeans() {
+        MatcherAssert.assertThat(MphRule.class, CoreMatchers.allOf(
+                hasValidBeanConstructor(),
+                hasValidGettersAndSetters()
+        ));
+    }
+
 }

src/test/java/com/imsweb/seerapi/client/disease/DiseaseTest.java

@@ -165,5 +165,9 @@ public void testBeans() {
                 hasValidBeanConstructor(),
                 hasValidGettersAndSetters()
         ));
+        MatcherAssert.assertThat(RxSearchResults.class, CoreMatchers.allOf(
+                hasValidBeanConstructor(),
+                hasValidGettersAndSetters()
+        ));
     }
 }

src/test/java/com/imsweb/seerapi/client/glossary/GlossaryTest.java

@@ -10,10 +10,14 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.hamcrest.CoreMatchers;
+import org.hamcrest.MatcherAssert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import com.imsweb.seerapi.client.SeerApi;
+import com.imsweb.seerapi.client.disease.DateRange;
+import com.imsweb.seerapi.client.disease.DateRangeString;
 import com.imsweb.seerapi.client.glossary.Glossary.Category;
 import com.imsweb.seerapi.client.shared.KeywordMatch;
 import com.imsweb.seerapi.client.staging.cs.CsSchemaLookup;
@@ -31,6 +35,8 @@
 import com.imsweb.seerapi.client.staging.tnm.TnmStagingData.TnmOutput;
 import com.imsweb.seerapi.client.staging.tnm.TnmStagingData.TnmStagingInputBuilder;
 
+import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
+import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
 import static com.imsweb.seerapi.client.staging.StagingData.HISTOLOGY_KEY;
 import static com.imsweb.seerapi.client.staging.StagingData.PRIMARY_SITE_KEY;
 import static com.imsweb.seerapi.client.staging.cs.CsStagingData.CsOutput.AJCC6_M;
@@ -547,4 +553,20 @@ public void testStagingMetadata() throws IOException {
         assertThat(mgmt.getMetadata()).extracting("name").containsExactlyInAnyOrder("COC_REQUIRED", "SEER_REQUIRED", "SSDI");
     }
 
+    @Test
+    public void testBeans() {
+        MatcherAssert.assertThat(StagingMetadata.class, CoreMatchers.allOf(
+                hasValidBeanConstructor(),
+                hasValidGettersAndSetters()
+        ));
+        MatcherAssert.assertThat(DateRange.class, CoreMatchers.allOf(
+                hasValidBeanConstructor(),
+                hasValidGettersAndSetters()
+        ));
+        MatcherAssert.assertThat(DateRangeString.class, CoreMatchers.allOf(
+                hasValidBeanConstructor(),
+                hasValidGettersAndSetters()
+        ));
+    }
+
 }