Skip to content

Commit e02347b

Browse files
ctmay4ctmay4
committed
Improve coverage
1 parent a4d5308 commit e02347b

11 files changed

Lines changed: 184 additions & 63 deletions

File tree

‎src/main/java/com/imsweb/seerapi/client/ndc/NdcPackage.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,31 @@ public String getCode() {
2222
return code;
2323
}
2424

25+
public void setCode(String code) {
26+
this.code = code;
27+
}
28+
2529
public String getDescription() {
2630
return description;
2731
}
2832

33+
public void setDescription(String description) {
34+
this.description = description;
35+
}
36+
2937
public String getStartMarketingDate() {
3038
return startMarketingDate;
3139
}
3240

41+
public void setStartMarketingDate(String startMarketingDate) {
42+
this.startMarketingDate = startMarketingDate;
43+
}
44+
3345
public String getEndMarketingDate() {
3446
return endMarketingDate;
3547
}
3648

49+
public void setEndMarketingDate(String endMarketingDate) {
50+
this.endMarketingDate = endMarketingDate;
51+
}
3752
}

‎src/main/java/com/imsweb/seerapi/client/ndc/NdcProduct.java‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,83 +61,167 @@ public String getNdc() {
6161
return ndc;
6262
}
6363

64+
public void setNdc(String ndc) {
65+
this.ndc = ndc;
66+
}
67+
6468
public String getTypeName() {
6569
return typeName;
6670
}
6771

72+
public void setTypeName(String typeName) {
73+
this.typeName = typeName;
74+
}
75+
6876
public String getProprietaryName() {
6977
return proprietaryName;
7078
}
7179

80+
public void setProprietaryName(String proprietaryName) {
81+
this.proprietaryName = proprietaryName;
82+
}
83+
7284
public String getProprietaryNameSuffix() {
7385
return proprietaryNameSuffix;
7486
}
7587

88+
public void setProprietaryNameSuffix(String proprietaryNameSuffix) {
89+
this.proprietaryNameSuffix = proprietaryNameSuffix;
90+
}
91+
7692
public List<String> getNonProprietaryName() {
7793
return nonProprietaryName;
7894
}
7995

96+
public void setNonProprietaryName(List<String> nonProprietaryName) {
97+
this.nonProprietaryName = nonProprietaryName;
98+
}
99+
80100
public String getDosageFormName() {
81101
return dosageFormName;
82102
}
83103

104+
public void setDosageFormName(String dosageFormName) {
105+
this.dosageFormName = dosageFormName;
106+
}
107+
84108
public List<String> getRouteName() {
85109
return routeName;
86110
}
87111

112+
public void setRouteName(List<String> routeName) {
113+
this.routeName = routeName;
114+
}
115+
88116
public String getStartMarketingDate() {
89117
return startMarketingDate;
90118
}
91119

120+
public void setStartMarketingDate(String startMarketingDate) {
121+
this.startMarketingDate = startMarketingDate;
122+
}
123+
92124
public String getEndMarketingDate() {
93125
return endMarketingDate;
94126
}
95127

128+
public void setEndMarketingDate(String endMarketingDate) {
129+
this.endMarketingDate = endMarketingDate;
130+
}
131+
96132
public String getMarketingCategoryName() {
97133
return marketingCategoryName;
98134
}
99135

136+
public void setMarketingCategoryName(String marketingCategoryName) {
137+
this.marketingCategoryName = marketingCategoryName;
138+
}
139+
100140
public String getApplicationNumber() {
101141
return applicationNumber;
102142
}
103143

144+
public void setApplicationNumber(String applicationNumber) {
145+
this.applicationNumber = applicationNumber;
146+
}
147+
104148
public String getLabelerName() {
105149
return labelerName;
106150
}
107151

152+
public void setLabelerName(String labelerName) {
153+
this.labelerName = labelerName;
154+
}
155+
108156
public String getDeaSchedule() {
109157
return deaSchedule;
110158
}
111159

160+
public void setDeaSchedule(String deaSchedule) {
161+
this.deaSchedule = deaSchedule;
162+
}
163+
112164
public List<NdcSubstance> getSubstances() {
113165
return substances;
114166
}
115167

168+
public void setSubstances(List<NdcSubstance> substances) {
169+
this.substances = substances;
170+
}
171+
116172
public List<String> getPharmClass() {
117173
return pharmClass;
118174
}
119175

176+
public void setPharmClass(List<String> pharmClass) {
177+
this.pharmClass = pharmClass;
178+
}
179+
120180
public List<NdcPackage> getPackages() {
121181
return packages;
122182
}
123183

184+
public void setPackages(List<NdcPackage> packages) {
185+
this.packages = packages;
186+
}
187+
124188
public Date getDateAdded() {
125189
return dateAdded;
126190
}
127191

192+
public void setDateAdded(Date dateAdded) {
193+
this.dateAdded = dateAdded;
194+
}
195+
128196
public Date getDateModified() {
129197
return dateModified;
130198
}
131199

200+
public void setDateModified(Date dateModified) {
201+
this.dateModified = dateModified;
202+
}
203+
132204
public Date getDateRemoved() {
133205
return dateRemoved;
134206
}
135207

208+
public void setDateRemoved(Date dateRemoved) {
209+
this.dateRemoved = dateRemoved;
210+
}
211+
136212
public NdcSeerInfo getSeerInfo() {
137213
return seerInfo;
138214
}
139215

216+
public void setSeerInfo(NdcSeerInfo seerInfo) {
217+
this.seerInfo = seerInfo;
218+
}
219+
140220
public Double getScore() {
141221
return score;
142222
}
223+
224+
public void setScore(Double score) {
225+
this.score = score;
226+
}
143227
}

‎src/main/java/com/imsweb/seerapi/client/ndc/NdcSearch.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public Boolean getIncludeRemoved() {
5050
}
5151

5252
public void setIncludeRemoved(Boolean includeRemoved) {
53-
this._includeRemoved = includeRemoved;
53+
_includeRemoved = includeRemoved;
5454
}
5555

5656
public String getAddedSince() {
@@ -97,8 +97,8 @@ public String getOrder() {
9797
return _order;
9898
}
9999

100-
public void setOrder(String orderBy) {
101-
_order = orderBy;
100+
public void setOrder(String order) {
101+
_order = order;
102102
}
103103

104104
/**

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

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -280,18 +280,15 @@ public void testDiseaseChangelog() throws IOException {
280280

281281
@Test
282282
public void testBeans() {
283-
MatcherAssert.assertThat(DiseaseHistoryEvent.class, CoreMatchers.allOf(
284-
hasValidBeanConstructor(),
285-
hasValidGettersAndSetters()
286-
));
287-
MatcherAssert.assertThat(DiseaseSearchResults.class, CoreMatchers.allOf(
288-
hasValidBeanConstructor(),
289-
hasValidGettersAndSetters()
290-
));
291-
MatcherAssert.assertThat(DiseaseSource.class, CoreMatchers.allOf(
292-
hasValidBeanConstructor(),
293-
hasValidGettersAndSetters()
294-
));
283+
MatcherAssert.assertThat(Disease.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
284+
MatcherAssert.assertThat(DiseaseVersion.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
285+
MatcherAssert.assertThat(DiseaseChangelog.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
286+
MatcherAssert.assertThat(DiseaseChangelogEntry.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
287+
MatcherAssert.assertThat(DiseaseChangelogResults.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
288+
MatcherAssert.assertThat(DiseaseHistoryEvent.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
289+
MatcherAssert.assertThat(DiseaseSearchResults.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
290+
MatcherAssert.assertThat(DiseaseSource.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
291+
MatcherAssert.assertThat(SiteCategory.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
295292
}
296293

297294
}

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

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -174,29 +174,14 @@ public void testGlossaryMatch() throws IOException {
174174

175175
@Test
176176
public void testBeans() {
177-
MatcherAssert.assertThat(GlossaryResource.class, CoreMatchers.allOf(
178-
hasValidBeanConstructor(),
179-
hasValidGettersAndSetters()
180-
));
181-
MatcherAssert.assertThat(GlossaryChangelogEntry.class, CoreMatchers.allOf(
182-
hasValidBeanConstructor(),
183-
hasValidGettersAndSetters()
184-
));
185-
MatcherAssert.assertThat(GlossarySearchResults.class, CoreMatchers.allOf(
186-
hasValidBeanConstructor(),
187-
hasValidGettersAndSetters()
188-
));
189-
MatcherAssert.assertThat(GlossaryChangelogResults.class, CoreMatchers.allOf(
190-
hasValidBeanConstructor(),
191-
hasValidGettersAndSetters()
192-
));
193-
MatcherAssert.assertThat(GlossaryHistoryEvent.class, CoreMatchers.allOf(
194-
hasValidBeanConstructor(),
195-
hasValidGettersAndSetters()
196-
));
197-
MatcherAssert.assertThat(KeywordMatch.class, CoreMatchers.allOf(
198-
hasValidBeanConstructor(),
199-
hasValidGettersAndSetters()
200-
));
177+
MatcherAssert.assertThat(Glossary.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
178+
MatcherAssert.assertThat(GlossaryVersion.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
179+
MatcherAssert.assertThat(GlossaryResource.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
180+
MatcherAssert.assertThat(GlossaryChangelog.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
181+
MatcherAssert.assertThat(GlossaryChangelogEntry.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
182+
MatcherAssert.assertThat(GlossarySearchResults.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
183+
MatcherAssert.assertThat(GlossaryChangelogResults.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
184+
MatcherAssert.assertThat(GlossaryHistoryEvent.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
185+
MatcherAssert.assertThat(KeywordMatch.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
201186
}
202187
}

‎src/test/java/com/imsweb/seerapi/client/hcpcs/mph/MphTest.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,9 @@ public void testInvalidInput() throws IOException {
154154

155155
@Test
156156
public void testBeans() {
157-
MatcherAssert.assertThat(MphRule.class, CoreMatchers.allOf(
158-
hasValidBeanConstructor(),
159-
hasValidGettersAndSetters()
160-
));
157+
MatcherAssert.assertThat(MphRule.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
158+
MatcherAssert.assertThat(MphInput.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
159+
MatcherAssert.assertThat(MphInputPair.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
161160
}
162161

163162
}

‎src/test/java/com/imsweb/seerapi/client/ndc/NdcTest.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import java.io.IOException;
77
import java.util.List;
88

9+
import org.hamcrest.CoreMatchers;
10+
import org.hamcrest.MatcherAssert;
911
import org.junit.BeforeClass;
1012
import org.junit.Test;
1113

@@ -14,6 +16,8 @@
1416
import com.imsweb.seerapi.client.SeerApi;
1517
import com.imsweb.seerapi.client.ndc.NdcSeerInfo.Category;
1618

19+
import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
20+
import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
1721
import static org.assertj.core.api.Assertions.assertThat;
1822

1923
@SuppressWarnings("ConstantConditions")
@@ -149,4 +153,12 @@ public void testNdcHasSeerInfo() throws IOException {
149153
assertThat(totalCount).isEqualTo(withCount + withoutCount);
150154
}
151155

156+
@Test
157+
public void testBeans() {
158+
MatcherAssert.assertThat(NdcProduct.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
159+
MatcherAssert.assertThat(NdcPackage.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
160+
MatcherAssert.assertThat(NdcSubstance.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
161+
MatcherAssert.assertThat(NdcSearch.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
162+
163+
}
152164
}

‎src/test/java/com/imsweb/seerapi/client/rx/RxTest.java‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -161,13 +161,12 @@ public void testRxSearchIterate() throws IOException {
161161

162162
@Test
163163
public void testBeans() {
164-
MatcherAssert.assertThat(RxHistoryEvent.class, CoreMatchers.allOf(
165-
hasValidBeanConstructor(),
166-
hasValidGettersAndSetters()
167-
));
168-
MatcherAssert.assertThat(RxSearchResults.class, CoreMatchers.allOf(
169-
hasValidBeanConstructor(),
170-
hasValidGettersAndSetters()
171-
));
164+
MatcherAssert.assertThat(Rx.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
165+
MatcherAssert.assertThat(RxChangelog.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
166+
MatcherAssert.assertThat(RxChangelogEntry.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
167+
MatcherAssert.assertThat(RxChangelogResults.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
168+
MatcherAssert.assertThat(RxVersion.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
169+
MatcherAssert.assertThat(RxHistoryEvent.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
170+
MatcherAssert.assertThat(RxSearchResults.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
172171
}
173172
}

‎src/test/java/com/imsweb/seerapi/client/siterecode/SiteRecodeTest.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
import java.io.IOException;
77

8+
import org.hamcrest.CoreMatchers;
9+
import org.hamcrest.MatcherAssert;
810
import org.junit.BeforeClass;
911
import org.junit.Test;
1012

@@ -14,6 +16,8 @@
1416
import com.imsweb.seerapi.client.SeerApi;
1517
import com.imsweb.seerapi.client.shared.Version;
1618

19+
import static com.google.code.beanmatchers.BeanMatchers.hasValidBeanConstructor;
20+
import static com.google.code.beanmatchers.BeanMatchers.hasValidGettersAndSetters;
1721
import static org.junit.Assert.assertEquals;
1822
import static org.junit.Assert.assertNotNull;
1923
import static org.junit.Assert.assertTrue;
@@ -68,4 +72,9 @@ public void testSiteRecode() throws IOException {
6872
assertEquals("33011", recode.getSiteGroup());
6973
}
7074

75+
@Test
76+
public void testBeans() {
77+
MatcherAssert.assertThat(Version.class, CoreMatchers.allOf(hasValidBeanConstructor(), hasValidGettersAndSetters()));
78+
}
79+
7180
}

0 commit comments

Comments
 (0)