diff --git a/src/main/java/com/imsweb/staging/eod/EodStagingData.java b/src/main/java/com/imsweb/staging/eod/EodStagingData.java index 474f1bd6..ecb8441f 100644 --- a/src/main/java/com/imsweb/staging/eod/EodStagingData.java +++ b/src/main/java/com/imsweb/staging/eod/EodStagingData.java @@ -105,7 +105,6 @@ public enum EodInput { GESTATIONAL_PROG_INDEX("gestational_prog_index"), HER2_SUMMARY("her2_summary"), LDH_LEVEL("ldh_level"), - LN_POS_AXILLARY_LEVEL_1_2("ln_pos_axillary_level_1_2"), LN_SIZE_OF_METS("ln_size_of_mets"), MEASURED_BASAL_DIAMETER("measured_basal_diameter"), MEASURED_THICKNESS("measured_thickness"), diff --git a/src/test/java/com/imsweb/staging/eod/EodPublicUpdateFromAPI.java b/src/test/java/com/imsweb/staging/eod/EodPublicUpdateFromAPI.java index 22eb4832..fdaddc0d 100644 --- a/src/test/java/com/imsweb/staging/eod/EodPublicUpdateFromAPI.java +++ b/src/test/java/com/imsweb/staging/eod/EodPublicUpdateFromAPI.java @@ -13,7 +13,7 @@ public class EodPublicUpdateFromAPI { public static void main(String[] args) throws IOException { - UpdaterUtils.update("eod_public", "3.3", new HashSet<>(Collections.singletonList("STAGING")), Paths.get("c:/dev/tmp")); + UpdaterUtils.update("eod_public", "3.4", new HashSet<>(Collections.singletonList("STAGING")), Paths.get("d:/tmp")); } } diff --git a/src/test/java/com/imsweb/staging/eod/EodStagingTest.java b/src/test/java/com/imsweb/staging/eod/EodStagingTest.java index 7f43b88b..9b623c79 100644 --- a/src/test/java/com/imsweb/staging/eod/EodStagingTest.java +++ b/src/test/java/com/imsweb/staging/eod/EodStagingTest.java @@ -7,7 +7,6 @@ import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; import java.util.Arrays; -import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Objects; @@ -54,12 +53,12 @@ public String getAlgorithm() { @Override public String getVersion() { - return "3.3"; + return "3.4"; } @Test void testBasicInitialization() { - assertThat(_STAGING.getSchemaIds()).hasSize(141); + assertThat(_STAGING.getSchemaIds()).hasSize(149); assertThat(_STAGING.getTableIds()).isNotEmpty(); assertThat(_STAGING.getSchema("urethra")).isNotNull(); @@ -134,7 +133,7 @@ void testSchemaSelection() { // test searching on only hist lookup = _STAGING.lookupSchema(new EodSchemaLookup(null, "9702")); - assertThat(lookup).hasSize(8); + assertThat(lookup).hasSize(2); // test that searching on only discriminator_1 returns no results schemaLookup = new EodSchemaLookup(null, null); @@ -307,19 +306,36 @@ void testBadLookupInStage() { void testInvolvedTables() { Set tables = _STAGING.getInvolvedTables("adnexa_uterine_other"); - assertThat(tables).containsOnly("seer_mets_48348", "nodes_dcc", "grade_clinical_standard_non_ajcc_32473", "grade_pathological_standard_non_ajcc_5627", - "adnexa_uterine_other_97891", "nodes_pos_fpa", "tumor_size_pathological_25597", "tumor_size_clinical_60979", "primary_site", "histology", - "nodes_exam_76029", "grade_post_therapy_clin_69737", "grade_post_therapy_path_75348", "schema_selection_adnexa_uterine_other", - "year_dx_validation", "summary_stage_rpa", "tumor_size_summary_63115", "extension_bcn", "combined_grade_56638", "neoadjuvant_therapy_37302", - "derived_grade_standard_non_ajcc_63932", "neoadj_tx_treatment_effect_18122", "neoadj_tx_clinical_response_31723", "ss2018_adnexa_uterine_other_values_44976", - "behavior", "type_of_reporting_source_76696"); + assertThat(tables).containsOnly("seer_mets_48348", + "nodes_dcc", + "grade_clinical_standard_non_ajcc_32473", + "grade_pathological_standard_non_ajcc_5627", + "adnexa_uterine_other_97891", + "nodes_pos_fpa", + "tumor_size_pathological_25597", + "tumor_size_clinical_60979", + "primary_site", + "histology", + "nodes_exam_76029", + "grade_post_therapy_clin_69737", + "grade_post_therapy_path_75348", + "schema_selection_adnexa_uterine_other", + "year_dx_validation", + "summary_stage_rpa", + "tumor_size_summary_63115", + "extension_bcn", + "combined_grade_56638", + "derived_grade_standard_non_ajcc_63932", + "ss2018_adnexa_uterine_other_values_44976", + "behavior", + "type_of_reporting_source_76696"); } @Test void testInvolvedSchemas() { Set schemas = _STAGING.getInvolvedSchemas("her2_summary_30512"); - assertThat(schemas).isEqualTo(new HashSet<>(Collections.singletonList("breast"))); + assertThat(schemas).isEqualTo(new HashSet<>(Arrays.asList("breast", "breast_v9_2027"))); } @Test @@ -445,7 +461,7 @@ void testContentReturnedForInvalidInput() { assertThat(data.getErrors()).hasSize(5); assertThat(data.getPath()).hasSize(5); assertThat(data.getOutput()).hasSize(4); - assertThat(data.getOutput()).containsEntry(EodOutput.DERIVED_VERSION.toString(), "3.3"); + assertThat(data.getOutput()).containsEntry(EodOutput.DERIVED_VERSION.toString(), "3.4"); } @Test diff --git a/src/test/java/com/imsweb/staging/eod/EodUpdateFromAPI.java b/src/test/java/com/imsweb/staging/eod/EodUpdateFromAPI.java index 349e28f1..75dbec85 100644 --- a/src/test/java/com/imsweb/staging/eod/EodUpdateFromAPI.java +++ b/src/test/java/com/imsweb/staging/eod/EodUpdateFromAPI.java @@ -13,7 +13,7 @@ public class EodUpdateFromAPI { public static void main(String[] args) throws IOException { - UpdaterUtils.update("eod", "3.3", new HashSet<>(Collections.singletonList("STAGING")), Paths.get("c:/dev/tmp")); + UpdaterUtils.update("eod", "3.4", new HashSet<>(Collections.singletonList("STAGING")), Paths.get("d:/tmp")); } } diff --git a/src/test/resources/algorithms/eod_public-3.3.zip b/src/test/resources/algorithms/eod_public-3.3.zip deleted file mode 100644 index b8ff54d0..00000000 Binary files a/src/test/resources/algorithms/eod_public-3.3.zip and /dev/null differ diff --git a/src/test/resources/algorithms/eod_public-3.4.zip b/src/test/resources/algorithms/eod_public-3.4.zip new file mode 100644 index 00000000..41862ac1 Binary files /dev/null and b/src/test/resources/algorithms/eod_public-3.4.zip differ