From e504e47a91125a69cc429c4d8488d8523f7a52bb Mon Sep 17 00:00:00 2001 From: cesarvh Date: Wed, 13 Mar 2019 12:29:42 -0700 Subject: [PATCH] CC-397: Removed function to calculate the BP date range in test files --- .../StructuredDateEvaluatorTest.java | 58 ------------------- 1 file changed, 58 deletions(-) diff --git a/services/structureddate/structureddate/src/test/java/org/collectionspace/services/structureddate/StructuredDateEvaluatorTest.java b/services/structureddate/structureddate/src/test/java/org/collectionspace/services/structureddate/StructuredDateEvaluatorTest.java index 3f1befd7b..9a56da5e5 100644 --- a/services/structureddate/structureddate/src/test/java/org/collectionspace/services/structureddate/StructuredDateEvaluatorTest.java +++ b/services/structureddate/structureddate/src/test/java/org/collectionspace/services/structureddate/StructuredDateEvaluatorTest.java @@ -67,11 +67,6 @@ public class StructuredDateEvaluatorTest { latestDateItems.add(currentDate.getEra() == Era.BCE ? "BCE" : "CE"); structuredDateFields.put("latestDate", latestDateItems); } - if (latestDate.equals("uncalibrated latest date")) { - Stack results = calculateUncalibratedDate(displayDate, currentDate.getYear()); - structuredDateFields.put("latestDate", results.pop()); - structuredDateFields.put("earliestSingleDate", results.pop()); - } } } @@ -109,59 +104,6 @@ public class StructuredDateEvaluatorTest { return structuredDate; } - - /** - * Calculates the uncalibrated date, since the yalm expected dates need to be dynamic - * as they will change from year to year. - * @param displayDate The current test's display date - * @param currentYear The current year - * - * @return a stack consisting of two ArrayLists, each containing the expected dates - */ - public Stack calculateUncalibratedDate(String displayDate, Integer currentYear) { - Stack stack = new Stack(); - ArrayList latestDate = new ArrayList<>(); - ArrayList earliestDate = new ArrayList<>(); - - - String reg = "±|\\+/-"; - String[] splitDateTokens = displayDate.split(reg); - String[] tokensPartTwo = splitDateTokens[1].split(" "); - - Integer mainYear = Integer.parseInt(splitDateTokens[0].replaceAll("\\s|,", "")); - Integer offset; - - try { - offset = Integer.parseInt(tokensPartTwo[0]); - } catch (Exception e) { - offset = Integer.parseInt(tokensPartTwo[1].replaceAll("\\s|,", "")); - } - - Integer earliestYear = currentYear - (mainYear + offset); - Integer latestYear = currentYear - (mainYear - offset); - - String earliestEra = earliestYear < 0 ? "BCE" : "CE"; - String latestEra = latestYear < 0 ? "BCE" : "CE"; - - earliestYear = Math.abs(earliestYear); - latestYear = Math.abs(latestYear); - - latestDate.add(latestYear); - latestDate.add(12); - latestDate.add(DateUtils.getDaysInMonth(12, latestYear, null)); - latestDate.add(latestEra); - - earliestDate.add(earliestYear); - earliestDate.add(1); - earliestDate.add(1); - earliestDate.add(earliestEra); - - stack.push(earliestDate); - stack.push(latestDate); - - return stack; - } - private Date createDateFromYamlSpec(List dateFields) { Date date = new Date(); Iterator fieldIterator = dateFields.iterator(); -- 2.47.3