Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java =================================================================== diff -u -r1cd4b23e16f8e4c341012698ddf539f8ee6bdf95 -rbd997a0d0ffc3d23099584001434a745c286e6f5 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 1cd4b23e16f8e4c341012698ddf539f8ee6bdf95) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision bd997a0d0ffc3d23099584001434a745c286e6f5) @@ -851,11 +851,10 @@ Collection optionAnswers = AssessmentEscapeUtils.normaliseVSOption(optionDto.getName()); boolean isAnswerMatchedCurrentOption = false; for (String optionAnswer : optionAnswers) { - String normalisedOptionAnswer = AssessmentEscapeUtils.normaliseVSAnswer(optionAnswer); // check is item unraveled - if (isQuestionCaseSensitive ? normalisedQuestionAnswer.equals(normalisedOptionAnswer) - : normalisedQuestionAnswer.equalsIgnoreCase(normalisedOptionAnswer)) { + if (isQuestionCaseSensitive ? normalisedQuestionAnswer.equals(optionAnswer) + : normalisedQuestionAnswer.equalsIgnoreCase(optionAnswer)) { isAnswerMatchedCurrentOption = true; break; } @@ -1471,17 +1470,6 @@ return questionSummary; } - public static boolean isAnswersEqual(AssessmentQuestion question, String answer1, String answer2) { - if (answer1 == null || answer2 == null) { - return false; - } - String normalisedAnswer1 = AssessmentEscapeUtils.normaliseVSAnswer(answer1); - String normalisedAnswer2 = AssessmentEscapeUtils.normaliseVSAnswer(answer2); - - return question.getQbQuestion().isCaseSensitive() ? normalisedAnswer1.equals(normalisedAnswer2) - : normalisedAnswer1.equalsIgnoreCase(normalisedAnswer2); - } - @Override public Long allocateAnswerToOption(Long questionUid, Long targetOptionUid, Long previousOptionUid, String answer) { AssessmentQuestion assessmentQuestion = assessmentQuestionDao.getByUid(questionUid);