Index: TestHarness4LAMS2/src/org/lamsfoundation/testharness/MockUser.java =================================================================== diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -r797ce058f0a0a06bf182256999c0ef24cc3ea735 --- TestHarness4LAMS2/src/org/lamsfoundation/testharness/MockUser.java (.../MockUser.java) (revision 5773f84ed608838de3521ecde87c52f3c72d478c) +++ TestHarness4LAMS2/src/org/lamsfoundation/testharness/MockUser.java (.../MockUser.java) (revision 797ce058f0a0a06bf182256999c0ef24cc3ea735) @@ -24,12 +24,9 @@ import java.io.File; import java.io.IOException; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; import java.util.HashMap; import java.util.Map; -import org.apache.commons.codec.binary.Hex; import org.apache.log4j.Logger; import org.xml.sax.SAXException; @@ -49,10 +46,10 @@ " is in a daze ", " will have a cup of coffee for ", " is away for toilet " }; private static final String LOGIN_PAGE_FLAG = "j_security_check"; - private static final String INDEX_PAGE_FLAG = "images/loading.gif"; + private static final String INDEX_PAGE_FLAG = "Index page flag"; private static final String USERNAME = "j_username"; - private static final String PASSWORD = "j_password";; + private static final String PASSWORD = "j_password"; protected AbstractTest test; protected String userId; @@ -69,11 +66,6 @@ this.userId = userId; } - private static String sha1(String plaintext) throws NoSuchAlgorithmException { - MessageDigest md = MessageDigest.getInstance("SHA1"); - return new String(Hex.encodeHex(md.digest(plaintext.getBytes()))); - } - protected static boolean checkPageContains(WebResponse resp, String flag) throws IOException { return resp.getText().indexOf(flag) != -1; } Index: TestHarness4LAMS2/src/org/lamsfoundation/testharness/author/MockAuthor.java =================================================================== diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -r797ce058f0a0a06bf182256999c0ef24cc3ea735 --- TestHarness4LAMS2/src/org/lamsfoundation/testharness/author/MockAuthor.java (.../MockAuthor.java) (revision 5773f84ed608838de3521ecde87c52f3c72d478c) +++ TestHarness4LAMS2/src/org/lamsfoundation/testharness/author/MockAuthor.java (.../MockAuthor.java) (revision 797ce058f0a0a06bf182256999c0ef24cc3ea735) @@ -53,9 +53,9 @@ private static final String IMPORT_FORM_FLAG = "UPLOAD_FILE"; private static final String UPLOAD_FILE_PARAM = "UPLOAD_FILE"; - private static final String IMPORT_SUCCESS_FLAG = "movie"; + private static final String IMPORT_SUCCESS_FLAG = "Flashless Authoring is"; private static final String LD_START_TAG = "learningDesignID="; - private static final char LD_END_TAG = '&'; + private static final char LD_END_TAG = ' '; /** * MockAuthor Constructor Index: TestHarness4LAMS2/src/org/lamsfoundation/testharness/monitor/MockMonitor.java =================================================================== diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -r797ce058f0a0a06bf182256999c0ef24cc3ea735 --- TestHarness4LAMS2/src/org/lamsfoundation/testharness/monitor/MockMonitor.java (.../MockMonitor.java) (revision 5773f84ed608838de3521ecde87c52f3c72d478c) +++ TestHarness4LAMS2/src/org/lamsfoundation/testharness/monitor/MockMonitor.java (.../MockMonitor.java) (revision 797ce058f0a0a06bf182256999c0ef24cc3ea735) @@ -102,11 +102,11 @@ throw new TestHarnessException( "User id is missing. If you have set UserCreated (admin properties) to true, then you must set UserId in the monitor properties."); } - MockMonitor.log.debug("initLessonURL " + initLessonURL + " ldId " + ldId + " orgId " + organisationID - + " userId " + userId + " name " + name); + String url = initLessonURL.replace(MockMonitor.LDID_PATTERN, ldId) .replace(MockMonitor.ORGANISATION_ID_PATTERN, organisationID) .replace(MockMonitor.USER_ID_PATTERN, userId).replace(MockMonitor.LESSON_NAME_PATTERN, name); + MockMonitor.log.debug("initLessonURL: " + url); WebResponse resp = (WebResponse) new Call(wc, test, username + " inits lesson", url).execute(); String idAsString = resp.getText().trim(); Index: lams_central/web/index.jsp =================================================================== diff -u -r7faaf5bb2b7086a63c209eb9402f79744442425e -r797ce058f0a0a06bf182256999c0ef24cc3ea735 --- lams_central/web/index.jsp (.../index.jsp) (revision 7faaf5bb2b7086a63c209eb9402f79744442425e) +++ lams_central/web/index.jsp (.../index.jsp) (revision 797ce058f0a0a06bf182256999c0ef24cc3ea735) @@ -13,6 +13,7 @@
+