Skip to content

Commit ec3acdc

Browse files
depryfdepryf
committed
Some fields became standard in N26...
1 parent a51fbe0 commit ec3acdc

3 files changed

Lines changed: 36 additions & 36 deletions

File tree

‎src/main/java/com/imsweb/algorithms/Algorithms.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
public final class Algorithms {
5757

5858
// the NAACCR version that this library uses (it only matters because some fields are defined as standard vs non-standard, and that definition varies by NAACCR version)
59-
public static final String NAACCR_VERSION = "250";
59+
public static final String NAACCR_VERSION = "260";
6060

6161
// algorithm IDs
6262
public static final String ALG_NHIA = "nhia";
@@ -129,8 +129,10 @@ public final class Algorithms {
129129
public static final String FIELD_CENSUS_POVERTY_INDICTR = "censusTrPovertyIndictr";
130130
public static final String FIELD_URIC_2000 = "uric2000";
131131
public static final String FIELD_URIC_2010 = "uric2010";
132+
public static final String FIELD_URIC_2020 = "uric2020";
132133
public static final String FIELD_RUCA_2000 = "ruca2000";
133134
public static final String FIELD_RUCA_2010 = "ruca2010";
135+
public static final String FIELD_RUCA_2020 = "ruca2020";
134136
public static final String FIELD_RURAL_CONT_1993 = "ruralurbanContinuum1993";
135137
public static final String FIELD_RURAL_CONT_2003 = "ruralurbanContinuum2003";
136138
public static final String FIELD_RURAL_CONT_2013 = "ruralurbanContinuum2013";
@@ -220,8 +222,6 @@ public final class Algorithms {
220222
public static final String FIELD_DAYS_TO_TREATMENT = "daysToTreatment";
221223
public static final String FIELD_TUMOR_SIZE_OVER_TIME = "tumorSizeOverTime";
222224
public static final String FIELD_RACE1_RECODE = "race1Recode";
223-
public static final String FIELD_URIC_2020 = "uric2020";
224-
public static final String FIELD_RUCA_2020 = "ruca2020";
225225
public static final String FIELD_BREAST_SUBTYPE = "breastSubtype";
226226
public static final String FIELD_ESTROGEN_RECEPTOR_SUM_RECODE = "estrogenReceptorSumRecode";
227227
public static final String FIELD_PROGESTERONE_RECEPTOR_SUM_RECODE = "progesteroneRecepSumRecode";
@@ -295,8 +295,10 @@ public static void initialize() {
295295
addField(AlgorithmField.of(FIELD_UIHO_CITY, 285, 2, "Urban Indian Organization (UIO) Service Area", "UIO Serv Area", DATA_LEVEL_TUMOR));
296296
addField(AlgorithmField.of(FIELD_URIC_2000, 345, 1, "URIC 2000", "URIC 2000", DATA_LEVEL_TUMOR));
297297
addField(AlgorithmField.of(FIELD_URIC_2010, 346, 1, "URIC 2010", "URIC 2010", DATA_LEVEL_TUMOR));
298+
addField(AlgorithmField.of(FIELD_URIC_2020, 347, 1, "URIC 2020", "URIC 2020", DATA_LEVEL_TUMOR));
298299
addField(AlgorithmField.of(FIELD_RUCA_2000, 339, 1, "RUCA 2000", "RUCA 2000", DATA_LEVEL_TUMOR));
299300
addField(AlgorithmField.of(FIELD_RUCA_2010, 341, 1, "RUCA 2010", "RUCA 2010", DATA_LEVEL_TUMOR));
301+
addField(AlgorithmField.of(FIELD_RUCA_2020, 342, 1, "RUCA 2020", "RUCA 2020", DATA_LEVEL_TUMOR));
300302
addField(AlgorithmField.of(FIELD_RURAL_CONT_1993, 3300, 2, "RuralUrban Continuum 1993", "Rur Urb Cont 93", DATA_LEVEL_TUMOR));
301303
addField(AlgorithmField.of(FIELD_RURAL_CONT_2003, 3310, 2, "RuralUrban Continuum 2003", "Rur Urb Cont 03", DATA_LEVEL_TUMOR));
302304
addField(AlgorithmField.of(FIELD_RURAL_CONT_2013, 3312, 2, "RuralUrban Continuum 2013", "Rur Urb Cont 13", DATA_LEVEL_TUMOR));
@@ -383,8 +385,6 @@ public static void initialize() {
383385
addField(AlgorithmField.of(FIELD_RACE1_RECODE, 9460, 2, "Race 1 Recode", "Race 1 Recode", DATA_LEVEL_PATIENT, false));
384386
addField(AlgorithmField.of(FIELD_SURV_DAYS_ACTIVE_FUP, 9753, 5, "Surv-Days Active Followup", "Surv Days", DATA_LEVEL_TUMOR, false));
385387
addField(AlgorithmField.of(FIELD_SURV_DAYS_PRESUMED_ALIVE, 9754, 5, "Surv-Days Presumed Alive", "Surv Days PA", DATA_LEVEL_TUMOR, false));
386-
addField(AlgorithmField.of(FIELD_URIC_2020, 347, 1, "URIC 2020", "URIC 2020", DATA_LEVEL_TUMOR, false));
387-
addField(AlgorithmField.of(FIELD_RUCA_2020, 342, 1, "RUCA 2020", "RUCA 2020", DATA_LEVEL_TUMOR, false));
388388
addField(AlgorithmField.of(FIELD_ESTROGEN_RECEPTOR_SUM_RECODE, 9755, 1, "Estrogen Receptor Summary Recode", "ER Recode", DATA_LEVEL_TUMOR, false));
389389
addField(AlgorithmField.of(FIELD_PROGESTERONE_RECEPTOR_SUM_RECODE, 9756, 1, "Progesterone Receptor Summary Recode", "PR Recode", DATA_LEVEL_TUMOR, false));
390390
addField(AlgorithmField.of(FIELD_HER2_OVERALL_SUM_RECODE, 9757, 1, "HER2 Overall Summary Recode", "HER2 Recode", DATA_LEVEL_TUMOR, false));

‎src/test/java/com/imsweb/algorithms/AlgorithmsTest.java‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public void testDefaultAlgorithms() {
7575
Algorithm alg = Algorithms.getAlgorithm(Algorithms.ALG_NHIA);
7676
Assert.assertEquals(1, alg.getParameters().size());
7777
Assert.assertTrue(alg.getUnknownValues().isEmpty());
78-
AlgorithmParam<?> nhiaOption = alg.getParameters().get(0);
78+
AlgorithmParam<?> nhiaOption = alg.getParameters().getFirst();
7979
Assert.assertEquals(Algorithms.PARAM_NHIA_OPTION, nhiaOption.getId());
8080
Assert.assertNotNull(nhiaOption.getName());
8181
Assert.assertEquals(String.class, nhiaOption.getType());
@@ -113,11 +113,11 @@ public void testDefaultAlgorithms() {
113113
Map<String, Object> tumMap = new HashMap<>();
114114
tumMap.put(Algorithms.FIELD_SEQ_NUM_CTRL, "00");
115115
patMap.put(Algorithms.FIELD_TUMORS, Collections.singletonList(tumMap));
116-
Assert.assertEquals("1", Utils.extractTumors(alg.execute(input).getPatient()).get(0).get(Algorithms.FIELD_SEER_COD_CLASS));
117-
Assert.assertEquals("0", Utils.extractTumors(alg.execute(input).getPatient()).get(0).get(Algorithms.FIELD_SEER_COD_OTHER));
116+
Assert.assertEquals("1", Utils.extractTumors(alg.execute(input).getPatient()).getFirst().get(Algorithms.FIELD_SEER_COD_CLASS));
117+
Assert.assertEquals("0", Utils.extractTumors(alg.execute(input).getPatient()).getFirst().get(Algorithms.FIELD_SEER_COD_OTHER));
118118
input.setParameters(Collections.singletonMap(Algorithms.PARAM_SEER_COD_CLASS_CUTOFF_YEAR, 2012));
119-
Assert.assertEquals("0", Utils.extractTumors(alg.execute(input).getPatient()).get(0).get(Algorithms.FIELD_SEER_COD_CLASS));
120-
Assert.assertEquals("0", Utils.extractTumors(alg.execute(input).getPatient()).get(0).get(Algorithms.FIELD_SEER_COD_OTHER));
119+
Assert.assertEquals("0", Utils.extractTumors(alg.execute(input).getPatient()).getFirst().get(Algorithms.FIELD_SEER_COD_CLASS));
120+
Assert.assertEquals("0", Utils.extractTumors(alg.execute(input).getPatient()).getFirst().get(Algorithms.FIELD_SEER_COD_OTHER));
121121

122122
// Census Tract Poverty
123123
alg = Algorithms.getAlgorithm(Algorithms.ALG_CENSUS_POVERTY);
@@ -132,7 +132,7 @@ public void testDefaultAlgorithms() {
132132
tumMap.put(Algorithms.FIELD_CENSUS_2010, "003405");
133133
tumMap.put(Algorithms.FIELD_DX_DATE, "20070101");
134134
patMap.put(Algorithms.FIELD_TUMORS, Collections.singletonList(tumMap));
135-
Assert.assertEquals("3", Utils.extractTumors(alg.execute(input).getPatient()).get(0).get(Algorithms.FIELD_CENSUS_POVERTY_INDICTR));
135+
Assert.assertEquals("3", Utils.extractTumors(alg.execute(input).getPatient()).getFirst().get(Algorithms.FIELD_CENSUS_POVERTY_INDICTR));
136136

137137
// Survival Time
138138
alg = Algorithms.getAlgorithm(Algorithms.ALG_SURVIVAL_TIME);
@@ -151,7 +151,7 @@ public void testDefaultAlgorithms() {
151151
tumMap.put(Algorithms.FIELD_SEQ_NUM_CTRL, "00");
152152
tumMap.put(Algorithms.FIELD_TYPE_RPT_SRC, "1");
153153
patMap.put(Algorithms.FIELD_TUMORS, Collections.singletonList(tumMap));
154-
Assert.assertEquals("0120", Utils.extractTumors(alg.execute(input).getPatient()).get(0).get(Algorithms.FIELD_SURV_MONTH_ACTIVE_FUP));
154+
Assert.assertEquals("0120", Utils.extractTumors(alg.execute(input).getPatient()).getFirst().get(Algorithms.FIELD_SURV_MONTH_ACTIVE_FUP));
155155

156156
// census-related fields
157157
alg = Algorithms.getAlgorithm(Algorithms.ALG_RURAL_URBAN);
@@ -166,13 +166,13 @@ public void testDefaultAlgorithms() {
166166
tumMap.put(Algorithms.FIELD_CENSUS_2000, "020200");
167167
tumMap.put(Algorithms.FIELD_CENSUS_2010, "020200");
168168
patMap.put(Algorithms.FIELD_TUMORS, Collections.singletonList(tumMap));
169-
Assert.assertEquals("1", Utils.extractTumors(alg.execute(input).getPatient()).get(0).get(Algorithms.FIELD_URIC_2000));
170-
Assert.assertEquals("1", Utils.extractTumors(alg.execute(input).getPatient()).get(0).get(Algorithms.FIELD_URIC_2010));
171-
Assert.assertEquals("1", Utils.extractTumors(alg.execute(input).getPatient()).get(0).get(Algorithms.FIELD_RUCA_2000));
172-
Assert.assertEquals("1", Utils.extractTumors(alg.execute(input).getPatient()).get(0).get(Algorithms.FIELD_RUCA_2010));
173-
Assert.assertEquals("02", Utils.extractTumors(alg.execute(input).getPatient()).get(0).get(Algorithms.FIELD_RURAL_CONT_1993));
174-
Assert.assertEquals("02", Utils.extractTumors(alg.execute(input).getPatient()).get(0).get(Algorithms.FIELD_RURAL_CONT_2003));
175-
Assert.assertEquals("02", Utils.extractTumors(alg.execute(input).getPatient()).get(0).get(Algorithms.FIELD_RURAL_CONT_2013));
169+
Assert.assertEquals("1", Utils.extractTumors(alg.execute(input).getPatient()).getFirst().get(Algorithms.FIELD_URIC_2000));
170+
Assert.assertEquals("1", Utils.extractTumors(alg.execute(input).getPatient()).getFirst().get(Algorithms.FIELD_URIC_2010));
171+
Assert.assertEquals("1", Utils.extractTumors(alg.execute(input).getPatient()).getFirst().get(Algorithms.FIELD_RUCA_2000));
172+
Assert.assertEquals("1", Utils.extractTumors(alg.execute(input).getPatient()).getFirst().get(Algorithms.FIELD_RUCA_2010));
173+
Assert.assertEquals("02", Utils.extractTumors(alg.execute(input).getPatient()).getFirst().get(Algorithms.FIELD_RURAL_CONT_1993));
174+
Assert.assertEquals("02", Utils.extractTumors(alg.execute(input).getPatient()).getFirst().get(Algorithms.FIELD_RURAL_CONT_2003));
175+
Assert.assertEquals("02", Utils.extractTumors(alg.execute(input).getPatient()).getFirst().get(Algorithms.FIELD_RURAL_CONT_2013));
176176

177177
// SEER Site Recode
178178
alg = Algorithms.getAlgorithm(Algorithms.ALG_SEER_SITE_RECODE);
@@ -185,7 +185,7 @@ public void testDefaultAlgorithms() {
185185
tumMap.put(Algorithms.FIELD_PRIMARY_SITE, "C340");
186186
tumMap.put(Algorithms.FIELD_HIST_O3, "8000");
187187
patMap.put(Algorithms.FIELD_TUMORS, Collections.singletonList(tumMap));
188-
Assert.assertEquals("22030", Utils.extractTumors(alg.execute(input).getPatient()).get(0).get(Algorithms.FIELD_SEER_SITE_RECODE));
188+
Assert.assertEquals("22030", Utils.extractTumors(alg.execute(input).getPatient()).getFirst().get(Algorithms.FIELD_SEER_SITE_RECODE));
189189

190190
// SEER Site Recode 2023
191191
alg = Algorithms.getAlgorithm(Algorithms.ALG_SEER_SITE_RECODE_2023);
@@ -200,8 +200,8 @@ public void testDefaultAlgorithms() {
200200
tumMap.put(Algorithms.FIELD_BEHAV_O3, "3");
201201
tumMap.put(Algorithms.FIELD_DX_DATE, "2023");
202202
patMap.put(Algorithms.FIELD_TUMORS, Collections.singletonList(tumMap));
203-
Assert.assertEquals("30", Utils.extractTumors(alg.execute(input).getPatient()).get(0).get(Algorithms.FIELD_SEER_SITE_RECODE_2023));
204-
Assert.assertEquals("30", Utils.extractTumors(alg.execute(input).getPatient()).get(0).get(Algorithms.FIELD_SEER_SITE_RECODE_2023_EXPANDED));
203+
Assert.assertEquals("30", Utils.extractTumors(alg.execute(input).getPatient()).getFirst().get(Algorithms.FIELD_SEER_SITE_RECODE_2023));
204+
Assert.assertEquals("30", Utils.extractTumors(alg.execute(input).getPatient()).getFirst().get(Algorithms.FIELD_SEER_SITE_RECODE_2023_EXPANDED));
205205

206206
// SEER Behavior Recode
207207
alg = Algorithms.getAlgorithm(Algorithms.ALG_SEER_BEHAVIOR_RECODE);
@@ -216,7 +216,7 @@ public void testDefaultAlgorithms() {
216216
tumMap.put(Algorithms.FIELD_BEHAV_O3, "1");
217217
tumMap.put(Algorithms.FIELD_DX_DATE, "2005");
218218
patMap.put(Algorithms.FIELD_TUMORS, Collections.singletonList(tumMap));
219-
Assert.assertEquals("3", Utils.extractTumors(alg.execute(input).getPatient()).get(0).get(Algorithms.FIELD_SEER_BEHAV_RECODE));
219+
Assert.assertEquals("3", Utils.extractTumors(alg.execute(input).getPatient()).getFirst().get(Algorithms.FIELD_SEER_BEHAV_RECODE));
220220

221221
// AYA Site Recode (WHO 2008)
222222
alg = Algorithms.getAlgorithm(Algorithms.ALG_AYA_SITE_RECODE_2008);
@@ -230,7 +230,7 @@ public void testDefaultAlgorithms() {
230230
tumMap.put(Algorithms.FIELD_HIST_O3, "9532");
231231
tumMap.put(Algorithms.FIELD_BEHAV_O3, "1");
232232
patMap.put(Algorithms.FIELD_TUMORS, Collections.singletonList(tumMap));
233-
Assert.assertEquals("14", Utils.extractTumors(alg.execute(input).getPatient()).get(0).get(Algorithms.FIELD_AYA_SITE_RECODE_2008));
233+
Assert.assertEquals("14", Utils.extractTumors(alg.execute(input).getPatient()).getFirst().get(Algorithms.FIELD_AYA_SITE_RECODE_2008));
234234

235235
// AYA Site Recode (2020 Revision)
236236
alg = Algorithms.getAlgorithm(Algorithms.ALG_AYA_SITE_RECODE_2020);
@@ -244,7 +244,7 @@ public void testDefaultAlgorithms() {
244244
tumMap.put(Algorithms.FIELD_HIST_O3, "9532");
245245
tumMap.put(Algorithms.FIELD_BEHAV_O3, "1");
246246
patMap.put(Algorithms.FIELD_TUMORS, Collections.singletonList(tumMap));
247-
Assert.assertEquals("046", Utils.extractTumors(alg.execute(input).getPatient()).get(0).get(Algorithms.FIELD_AYA_SITE_RECODE_2020));
247+
Assert.assertEquals("046", Utils.extractTumors(alg.execute(input).getPatient()).getFirst().get(Algorithms.FIELD_AYA_SITE_RECODE_2020));
248248

249249
// ICCC
250250
alg = Algorithms.getAlgorithm(Algorithms.ALG_ICCC);
@@ -258,8 +258,8 @@ public void testDefaultAlgorithms() {
258258
tumMap.put(Algorithms.FIELD_HIST_O3, "8000");
259259
tumMap.put(Algorithms.FIELD_BEHAV_O3, "3");
260260
patMap.put(Algorithms.FIELD_TUMORS, Collections.singletonList(tumMap));
261-
Assert.assertEquals("122", Utils.extractTumors(alg.execute(input).getPatient()).get(0).get(Algorithms.FIELD_ICCC));
262-
Assert.assertEquals("115", Utils.extractTumors(alg.execute(input).getPatient()).get(0).get(Algorithms.FIELD_ICCC_EXT));
261+
Assert.assertEquals("122", Utils.extractTumors(alg.execute(input).getPatient()).getFirst().get(Algorithms.FIELD_ICCC));
262+
Assert.assertEquals("115", Utils.extractTumors(alg.execute(input).getPatient()).getFirst().get(Algorithms.FIELD_ICCC_EXT));
263263

264264
// IARC
265265
alg = Algorithms.getAlgorithm(Algorithms.ALG_IARC);
@@ -275,7 +275,7 @@ public void testDefaultAlgorithms() {
275275
tumMap.put(Algorithms.FIELD_DX_DATE, "20170101");
276276
tumMap.put(Algorithms.FIELD_SEQ_NUM_CTRL, "01");
277277
patMap.put(Algorithms.FIELD_TUMORS, Collections.singletonList(tumMap));
278-
Assert.assertEquals("9", Utils.extractTumors(alg.execute(input).getPatient()).get(0).get(Algorithms.FIELD_IARC_MP_INDICATOR));
278+
Assert.assertEquals("9", Utils.extractTumors(alg.execute(input).getPatient()).getFirst().get(Algorithms.FIELD_IARC_MP_INDICATOR));
279279

280280
// county at DX
281281
alg = Algorithms.getAlgorithm(Algorithms.ALG_COUNTY_AT_DIAGNOSIS_ANALYSIS);
@@ -297,7 +297,7 @@ public void testDefaultAlgorithms() {
297297
tumMap.put(Algorithms.FIELD_CENSUS_CERTAINTY_2010, "1");
298298
tumMap.put(Algorithms.FIELD_CENSUS_CERTAINTY_2020, "1");
299299
patMap.put(Algorithms.FIELD_TUMORS, Collections.singletonList(tumMap));
300-
Map<String, Object> tumor = Utils.extractTumors(alg.execute(input).getPatient()).get(0);
300+
Map<String, Object> tumor = Utils.extractTumors(alg.execute(input).getPatient()).getFirst();
301301
Assert.assertEquals("005", tumor.get(Algorithms.FIELD_COUNTY_AT_DX_ANALYSIS));
302302
Assert.assertEquals(CountyAtDxAnalysisUtils.REP_REP_GEO_EQUAL, tumor.get(Algorithms.FIELD_COUNTY_AT_DX_ANALYSIS_FLAG));
303303

@@ -312,7 +312,7 @@ public void testDefaultAlgorithms() {
312312
tumMap.put(Algorithms.FIELD_STATE_DX, "MN");
313313
tumMap.put(Algorithms.FIELD_COUNTY_AT_DX_ANALYSIS, "035");
314314
patMap.put(Algorithms.FIELD_TUMORS, Collections.singletonList(tumMap));
315-
tumor = Utils.extractTumors(alg.execute(input).getPatient()).get(0);
315+
tumor = Utils.extractTumors(alg.execute(input).getPatient()).getFirst();
316316
Assert.assertEquals("0", tumor.get(Algorithms.FIELD_IHS_PRCDA_2017));
317317
Assert.assertEquals("1", tumor.get(Algorithms.FIELD_IHS_PRCDA));
318318

@@ -327,7 +327,7 @@ public void testDefaultAlgorithms() {
327327
tumMap.put(Algorithms.FIELD_STATE_DX, "CA");
328328
tumMap.put(Algorithms.FIELD_COUNTY_AT_DX_ANALYSIS, "013");
329329
patMap.put(Algorithms.FIELD_TUMORS, Collections.singletonList(tumMap));
330-
tumor = Utils.extractTumors(alg.execute(input).getPatient()).get(0);
330+
tumor = Utils.extractTumors(alg.execute(input).getPatient()).getFirst();
331331
Assert.assertEquals("1", tumor.get(Algorithms.FIELD_UIHO));
332332
Assert.assertEquals("07", tumor.get(Algorithms.FIELD_UIHO_CITY));
333333

@@ -343,7 +343,7 @@ public void testDefaultAlgorithms() {
343343
tumMap.put(Algorithms.FIELD_HIST_O3, "9385");
344344
tumMap.put(Algorithms.FIELD_BEHAV_O3, "3");
345345
patMap.put(Algorithms.FIELD_TUMORS, Collections.singletonList(tumMap));
346-
Assert.assertEquals("03", Utils.extractTumors(alg.execute(input).getPatient()).get(0).get(Algorithms.FIELD_SEER_BRAIN_CSN_RECODE_2020));
346+
Assert.assertEquals("03", Utils.extractTumors(alg.execute(input).getPatient()).getFirst().get(Algorithms.FIELD_SEER_BRAIN_CSN_RECODE_2020));
347347

348348
// Lymphoid Neoplasm 2021
349349
alg = Algorithms.getAlgorithm(Algorithms.ALG_SEER_LYMPH_NEO_RECODE_2021);
@@ -356,7 +356,7 @@ public void testDefaultAlgorithms() {
356356
tumMap.put(Algorithms.FIELD_PRIMARY_SITE, "C700");
357357
tumMap.put(Algorithms.FIELD_HIST_O3, "9651");
358358
patMap.put(Algorithms.FIELD_TUMORS, Collections.singletonList(tumMap));
359-
Assert.assertEquals("01", Utils.extractTumors(alg.execute(input).getPatient()).get(0).get(Algorithms.FIELD_SEER_LYMPH_NEO_RECODE_2021));
359+
Assert.assertEquals("01", Utils.extractTumors(alg.execute(input).getPatient()).getFirst().get(Algorithms.FIELD_SEER_LYMPH_NEO_RECODE_2021));
360360

361361
// Derived Summary Grade 2018
362362
alg = Algorithms.getAlgorithm(Algorithms.ALG_SEER_DERIVED_SUMMARY_STAGE_2018);
@@ -368,7 +368,7 @@ public void testDefaultAlgorithms() {
368368
tumMap = new HashMap<>();
369369
tumMap.put(Algorithms.FIELD_GRADE_CLINICAL, "1");
370370
patMap.put(Algorithms.FIELD_TUMORS, Collections.singletonList(tumMap));
371-
Assert.assertEquals("1", Utils.extractTumors(alg.execute(input).getPatient()).get(0).get(Algorithms.FIELD_DERIVED_SUMMARY_GRADE_2018));
371+
Assert.assertEquals("1", Utils.extractTumors(alg.execute(input).getPatient()).getFirst().get(Algorithms.FIELD_DERIVED_SUMMARY_GRADE_2018));
372372

373373
// Breast Category
374374
alg = Algorithms.getAlgorithm(Algorithms.ALG_BREAST_CANCER_CATEGORY);
@@ -385,7 +385,7 @@ public void testDefaultAlgorithms() {
385385
tumMap.put(Algorithms.FIELD_PROGESTERONE_RECEPTOR_SUMMARY, "0");
386386
tumMap.put(Algorithms.FIELD_HER2_OVERALL_SUMMARY, "0");
387387
patMap.put(Algorithms.FIELD_TUMORS, Collections.singletonList(tumMap));
388-
Assert.assertEquals("4", Utils.extractTumors(alg.execute(input).getPatient()).get(0).get(Algorithms.FIELD_BREAST_SUBTYPE));
388+
Assert.assertEquals("4", Utils.extractTumors(alg.execute(input).getPatient()).getFirst().get(Algorithms.FIELD_BREAST_SUBTYPE));
389389
}
390390

391391
@Test

‎src/test/java/com/imsweb/algorithms/historicstage/HistStageDataDtoTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
public class HistStageDataDtoTest {
1515

16-
private static class HistStageDataTestDto extends HistStageDataDto {
16+
private static final class HistStageDataTestDto extends HistStageDataDto {
1717

1818
@Override
1919
protected List<Object> parse(String str) {

0 commit comments

Comments
 (0)