Index: TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestSuite.java =================================================================== RCS file: /usr/local/cvsroot/TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestSuite.java,v diff -u -r1.6.2.1 -r1.6.2.2 --- TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestSuite.java 4 Dec 2014 14:59:47 -0000 1.6.2.1 +++ TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestSuite.java 5 May 2016 08:08:26 -0000 1.6.2.2 @@ -2,21 +2,21 @@ * Copyright (C) 2006 LAMS Foundation (http://lamsfoundation.org) * ============================================================= * License Information: http://lamsfoundation.org/licensing/lams/2.0/ - * + * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2.0 + * it under the terms of the GNU General Public License version 2.0 * as published by the Free Software Foundation. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA - * + * * http://www.gnu.org/licenses/gpl.txt * **************************************************************** */ @@ -42,25 +42,25 @@ private String targetServer; private String contextRoot; private String cookieDomain; - + private AdminTest adminTest; private AuthorTest authorTest; private MonitorTest monitorTest; private LearnerTest learnerTest; private boolean finished = false; - public TestSuite(TestManager manager, int suiteIndex, String targetServer, String contextRoot, - AdminTest adminTest, AuthorTest authorTest, MonitorTest monitorTest, LearnerTest learnerTest) { + public TestSuite(TestManager manager, int suiteIndex, String targetServer, String contextRoot, AdminTest adminTest, + AuthorTest authorTest, MonitorTest monitorTest, LearnerTest learnerTest) { this.manager = manager; this.suiteIndex = suiteIndex; this.targetServer = targetServer == null ? "localhost" : targetServer; this.contextRoot = (contextRoot == null) || contextRoot.equals("/") ? "" : contextRoot; int beginIndex = this.targetServer.lastIndexOf("/") + 1; int endIndex = this.targetServer.lastIndexOf(":"); - this.cookieDomain = endIndex < 0 ? this.targetServer.substring(beginIndex) : this.targetServer.substring( - beginIndex, endIndex); - + this.cookieDomain = endIndex < 0 ? this.targetServer.substring(beginIndex) + : this.targetServer.substring(beginIndex, endIndex); + this.adminTest = adminTest; adminTest.setTestSuite(this); this.authorTest = authorTest; @@ -90,9 +90,9 @@ } public String getCookieDomain() { - return cookieDomain; + return cookieDomain; } - + /** * @return Returns the learnerTest. */