Index: TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java =================================================================== RCS file: /usr/local/cvsroot/TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java,v diff -u -r1.22 -r1.23 --- TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java 18 Mar 2014 09:26:09 -0000 1.22 +++ TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java 18 Mar 2014 10:17:43 -0000 1.23 @@ -337,9 +337,11 @@ nextResp = handlePageWithoutForms(resp); } - boolean isActivityFinished = (resp != null) - && ((resp.getText().indexOf(MockLearner.ACTIVITY_FINISHED_FLAG) != -1) || (resp.getText().indexOf( - MockLearner.LESSON_FINISHED_FLAG) != -1)); + String asText = nextResp == null ? null : nextResp.getText(); + boolean isActivityFinished = (asText != null) + && (asText.contains(MockLearner.ACTIVITY_FINISHED_FLAG) + || asText.contains(MockLearner.LESSON_FINISHED_FLAG) || asText + .contains(MockLearner.LOAD_TOOL_ACTIVITY_FLAG)); return isActivityFinished ? nextResp : handleActivity(nextResp); }