Skip to content

Commit 63c308f

Browse files
ctmay4ctmay4
committed
Update EOD to 3.4
1 parent 63066f5 commit 63c308f

6 files changed

Lines changed: 30 additions & 14 deletions

File tree

‎src/main/java/com/imsweb/staging/eod/EodStagingData.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ public enum EodInput {
105105
GESTATIONAL_PROG_INDEX("gestational_prog_index"),
106106
HER2_SUMMARY("her2_summary"),
107107
LDH_LEVEL("ldh_level"),
108-
LN_POS_AXILLARY_LEVEL_1_2("ln_pos_axillary_level_1_2"),
109108
LN_SIZE_OF_METS("ln_size_of_mets"),
110109
MEASURED_BASAL_DIAMETER("measured_basal_diameter"),
111110
MEASURED_THICKNESS("measured_thickness"),

‎src/test/java/com/imsweb/staging/eod/EodPublicUpdateFromAPI.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
public class EodPublicUpdateFromAPI {
1414

1515
public static void main(String[] args) throws IOException {
16-
UpdaterUtils.update("eod_public", "3.3", new HashSet<>(Collections.singletonList("STAGING")), Paths.get("c:/dev/tmp"));
16+
UpdaterUtils.update("eod_public", "3.4", new HashSet<>(Collections.singletonList("STAGING")), Paths.get("d:/tmp"));
1717
}
1818

1919
}

‎src/test/java/com/imsweb/staging/eod/EodStagingTest.java‎

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ public String getAlgorithm() {
5454

5555
@Override
5656
public String getVersion() {
57-
return "3.3";
57+
return "3.4";
5858
}
5959

6060
@Test
6161
void testBasicInitialization() {
62-
assertThat(_STAGING.getSchemaIds()).hasSize(141);
62+
assertThat(_STAGING.getSchemaIds()).hasSize(149);
6363
assertThat(_STAGING.getTableIds()).isNotEmpty();
6464

6565
assertThat(_STAGING.getSchema("urethra")).isNotNull();
@@ -134,7 +134,7 @@ void testSchemaSelection() {
134134

135135
// test searching on only hist
136136
lookup = _STAGING.lookupSchema(new EodSchemaLookup(null, "9702"));
137-
assertThat(lookup).hasSize(8);
137+
assertThat(lookup).hasSize(2);
138138

139139
// test that searching on only discriminator_1 returns no results
140140
schemaLookup = new EodSchemaLookup(null, null);
@@ -307,19 +307,36 @@ void testBadLookupInStage() {
307307
void testInvolvedTables() {
308308
Set<String> tables = _STAGING.getInvolvedTables("adnexa_uterine_other");
309309

310-
assertThat(tables).containsOnly("seer_mets_48348", "nodes_dcc", "grade_clinical_standard_non_ajcc_32473", "grade_pathological_standard_non_ajcc_5627",
311-
"adnexa_uterine_other_97891", "nodes_pos_fpa", "tumor_size_pathological_25597", "tumor_size_clinical_60979", "primary_site", "histology",
312-
"nodes_exam_76029", "grade_post_therapy_clin_69737", "grade_post_therapy_path_75348", "schema_selection_adnexa_uterine_other",
313-
"year_dx_validation", "summary_stage_rpa", "tumor_size_summary_63115", "extension_bcn", "combined_grade_56638", "neoadjuvant_therapy_37302",
314-
"derived_grade_standard_non_ajcc_63932", "neoadj_tx_treatment_effect_18122", "neoadj_tx_clinical_response_31723", "ss2018_adnexa_uterine_other_values_44976",
315-
"behavior", "type_of_reporting_source_76696");
310+
assertThat(tables).containsOnly("seer_mets_48348",
311+
"nodes_dcc",
312+
"grade_clinical_standard_non_ajcc_32473",
313+
"grade_pathological_standard_non_ajcc_5627",
314+
"adnexa_uterine_other_97891",
315+
"nodes_pos_fpa",
316+
"tumor_size_pathological_25597",
317+
"tumor_size_clinical_60979",
318+
"primary_site",
319+
"histology",
320+
"nodes_exam_76029",
321+
"grade_post_therapy_clin_69737",
322+
"grade_post_therapy_path_75348",
323+
"schema_selection_adnexa_uterine_other",
324+
"year_dx_validation",
325+
"summary_stage_rpa",
326+
"tumor_size_summary_63115",
327+
"extension_bcn",
328+
"combined_grade_56638",
329+
"derived_grade_standard_non_ajcc_63932",
330+
"ss2018_adnexa_uterine_other_values_44976",
331+
"behavior",
332+
"type_of_reporting_source_76696");
316333
}
317334

318335
@Test
319336
void testInvolvedSchemas() {
320337
Set<String> schemas = _STAGING.getInvolvedSchemas("her2_summary_30512");
321338

322-
assertThat(schemas).isEqualTo(new HashSet<>(Collections.singletonList("breast")));
339+
assertThat(schemas).isEqualTo(new HashSet<>(Arrays.asList("breast", "breast_v9_2027")));
323340
}
324341

325342
@Test
@@ -445,7 +462,7 @@ void testContentReturnedForInvalidInput() {
445462
assertThat(data.getErrors()).hasSize(5);
446463
assertThat(data.getPath()).hasSize(5);
447464
assertThat(data.getOutput()).hasSize(4);
448-
assertThat(data.getOutput()).containsEntry(EodOutput.DERIVED_VERSION.toString(), "3.3");
465+
assertThat(data.getOutput()).containsEntry(EodOutput.DERIVED_VERSION.toString(), "3.4");
449466
}
450467

451468
@Test

‎src/test/java/com/imsweb/staging/eod/EodUpdateFromAPI.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
public class EodUpdateFromAPI {
1414

1515
public static void main(String[] args) throws IOException {
16-
UpdaterUtils.update("eod", "3.3", new HashSet<>(Collections.singletonList("STAGING")), Paths.get("c:/dev/tmp"));
16+
UpdaterUtils.update("eod", "3.4", new HashSet<>(Collections.singletonList("STAGING")), Paths.get("d:/tmp"));
1717
}
1818

1919
}

‎src/test/resources/algorithms/eod_public-3.3.zip‎

-1.85 MB
Binary file not shown.

‎src/test/resources/algorithms/eod_public-3.4.zip‎

2 MB
Binary file not shown.

0 commit comments

Comments
 (0)