Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make_tests_more_amenable_to_non_workspace_running

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@220813 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
edburns%acm.org
2007-02-23 14:38:55 +00:00
parent c364eef27a
commit 4aefbd9bc2
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mozilla/java/webclient/build-tests.xml
View File

@@ -160,6 +160,7 @@
<jvmarg value="-DNSPR_LOG_FILE=${myenv.NSPR_LOG_FILE}"/>
<jvmarg value="-DMOZ_SRC=${myenv.MOZ_SRC}"/>
<jvmarg value="-DBROWSER_BIN_DIR=${myenv.MOZILLA_FIVE_HOME}"/>
<jvmarg value="-Dbuild.test.results.dir=${build.test}"/>
<sysproperty key="native.waitForDebugger"
value="${native.waitForDebugger}"/>
<jvmarg line="${debug.jvm.args}"/>

39
mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/WebclientTestCase.java
View File

@@ -1,5 +1,5 @@
/*
* $Id: WebclientTestCase.java,v 1.13 2007-02-21 01:40:44 edburns%acm.org Exp $
* $Id: WebclientTestCase.java,v 1.14 2007-02-23 14:38:55 edburns%acm.org Exp $
*/
/*
@@ -47,7 +47,7 @@ import org.mozilla.util.THTTPD;
*
* <B>Lifetime And Scope</B> <P>
*
* @version $Id: WebclientTestCase.java,v 1.13 2007-02-21 01:40:44 edburns%acm.org Exp $
* @version $Id: WebclientTestCase.java,v 1.14 2007-02-23 14:38:55 edburns%acm.org Exp $
*
* @see Blah
* @see Bloo
@@ -62,7 +62,7 @@ public abstract class WebclientTestCase extends TestCase
public static final String WEBCLIENTSTUB_LOG_MODULE = "webclientstub";
public static final String WEBCLIENT_LOG_MODULE = "webclient";
public static String OUTPUT_FILE_ROOT = "build.test/";
public static String OUTPUT_FILE_ROOT = null;
public static final String TEST_LOG = "org.mozilla.webclient.test";
public static final String TEST_LOG_STRINGS = "org.mozilla.webclient.TestLogStrings";
@@ -112,22 +112,8 @@ public static Logger getLogger( String loggerName ) {
public void setUp()
{
verifyPreconditions();
verifyOutputFileRootIsSet();
// Set the OUTPUT_FILE_ROOT
String mozSrcValue = null;
File outputRoot = null;
if (null != (mozSrcValue = System.getProperty("MOZ_SRC"))) {
OUTPUT_FILE_ROOT = mozSrcValue + File.separator +
"mozilla" + File.separator + "java" + File.separator +
"webclient" + File.separator + OUTPUT_FILE_ROOT;
}
else {
assertTrue(null != (OUTPUT_FILE_ROOT = System.getProperty("build.test.results.dir")));
}
outputRoot = new File(OUTPUT_FILE_ROOT);
assertTrue(outputRoot.exists());
LOGGER.info(this.getClass().getName() + " setUp()");
}
@@ -142,12 +128,12 @@ public void tearDown()
//
public static TestSuite createServerTestSuite() {
verifyOutputFileRootIsSet();
TestSuite result = new TestSuite() {
public void run(TestResult result) {
serverThread =
new THTTPD.ServerThread("LocalHTTPD",
new File (getBrowserBinDir() +
"/../../../java/webclient/build.test"), -1);
new File (OUTPUT_FILE_ROOT), -1);
serverThread.start();
serverThread.P();
super.run(result);
@@ -219,6 +205,19 @@ protected String verifyOutputFileIsSet()
}
private static void verifyOutputFileRootIsSet() {
if (null != OUTPUT_FILE_ROOT) {
return;
}
OUTPUT_FILE_ROOT = System.getProperty("build.test.results.dir");
assertNotNull(OUTPUT_FILE_ROOT);
File outputRoot = new File(OUTPUT_FILE_ROOT);
assertTrue(outputRoot.exists());
}
/**
* This implementation checks that the proper environment vars are set.