diff --git a/src/main/java/com/imsweb/staging/tnm/TnmSchemaLookup.java b/src/main/java/com/imsweb/staging/tnm/TnmSchemaLookup.java index 798110c0..b98e34d9 100644 --- a/src/main/java/com/imsweb/staging/tnm/TnmSchemaLookup.java +++ b/src/main/java/com/imsweb/staging/tnm/TnmSchemaLookup.java @@ -9,12 +9,12 @@ import static com.imsweb.staging.entities.StagingData.HISTOLOGY_KEY; import static com.imsweb.staging.entities.StagingData.PRIMARY_SITE_KEY; -import static com.imsweb.staging.tnm.TnmStagingData.SEX_KEY; +import static com.imsweb.staging.tnm.TnmStagingData.SEX_AT_BIRTH_KEY; import static com.imsweb.staging.tnm.TnmStagingData.SSF25_KEY; public class TnmSchemaLookup extends SchemaLookup { - private static final Set _ALLOWED_KEYS = Set.of(PRIMARY_SITE_KEY, HISTOLOGY_KEY, SSF25_KEY, SEX_KEY); + private static final Set _ALLOWED_KEYS = Set.of(PRIMARY_SITE_KEY, HISTOLOGY_KEY, SSF25_KEY, SEX_AT_BIRTH_KEY); /** * Constructor diff --git a/src/main/java/com/imsweb/staging/tnm/TnmStagingData.java b/src/main/java/com/imsweb/staging/tnm/TnmStagingData.java index 57cca24a..e932a5bd 100644 --- a/src/main/java/com/imsweb/staging/tnm/TnmStagingData.java +++ b/src/main/java/com/imsweb/staging/tnm/TnmStagingData.java @@ -8,7 +8,7 @@ public class TnmStagingData extends StagingData { // key definitions - public static final String SEX_KEY = "sex"; + public static final String SEX_AT_BIRTH_KEY = "sex_at_birth"; public static final String SSF25_KEY = "ssf25"; // SSF prefix @@ -20,7 +20,7 @@ public enum TnmInput { HISTOLOGY("hist"), BEHAVIOR("behavior"), GRADE("grade"), - SEX("sex"), + SEX("sex_at_birth"), DX_YEAR("year_dx"), AGE_AT_DX("age_dx"), CLIN_STAGE_GROUP_DIRECT("clin_stage_group_direct"), diff --git a/src/test/java/com/imsweb/staging/tnm/TnmStagingTest.java b/src/test/java/com/imsweb/staging/tnm/TnmStagingTest.java index 2a13becb..259516dd 100644 --- a/src/test/java/com/imsweb/staging/tnm/TnmStagingTest.java +++ b/src/test/java/com/imsweb/staging/tnm/TnmStagingTest.java @@ -54,7 +54,7 @@ public String getAlgorithm() { @Override public String getVersion() { - return "2.0"; + return "2.1"; } @Test @@ -69,7 +69,7 @@ void testBasicInitialization() { @Test void testDescriminatorKeys() { assertEquals(new HashSet<>(Collections.singletonList("ssf25")), _STAGING.getSchema("nasopharynx").getSchemaDiscriminators()); - assertEquals(new HashSet<>(Collections.singletonList("sex")), _STAGING.getSchema("peritoneum_female_gen").getSchemaDiscriminators()); + assertEquals(new HashSet<>(Collections.singletonList("sex_at_birth")), _STAGING.getSchema("peritoneum_female_gen").getSchemaDiscriminators()); } @Test diff --git a/src/test/java/com/imsweb/staging/tnm/TnmUpdateFromAPI.java b/src/test/java/com/imsweb/staging/tnm/TnmUpdateFromAPI.java index d239ecc6..b319534b 100644 --- a/src/test/java/com/imsweb/staging/tnm/TnmUpdateFromAPI.java +++ b/src/test/java/com/imsweb/staging/tnm/TnmUpdateFromAPI.java @@ -13,7 +13,7 @@ public class TnmUpdateFromAPI { public static void main(String[] args) throws IOException { - UpdaterUtils.update("tnm", "2.0", new HashSet<>(Collections.singletonList("STAGING")), Paths.get("c:/dev/tmp")); + UpdaterUtils.update("tnm", "2.1", new HashSet<>(Collections.singletonList("STAGING")), Paths.get("c:/dev/tmp")); } } diff --git a/src/test/resources/algorithms/tnm-2.0.zip b/src/test/resources/algorithms/tnm-2.0.zip deleted file mode 100644 index 70339ccb..00000000 Binary files a/src/test/resources/algorithms/tnm-2.0.zip and /dev/null differ diff --git a/src/test/resources/algorithms/tnm-2.1.zip b/src/test/resources/algorithms/tnm-2.1.zip new file mode 100644 index 00000000..5af010a3 Binary files /dev/null and b/src/test/resources/algorithms/tnm-2.1.zip differ