Skip to Content.
Sympa Menu

ndt-dev - [ndt-dev] [ndt] r951 committed - Merge FlashIssue116 branch into trunk

Subject: NDT-DEV email list created

List archive

[ndt-dev] [ndt] r951 committed - Merge FlashIssue116 branch into trunk


Chronological Thread 
  • From:
  • To:
  • Subject: [ndt-dev] [ndt] r951 committed - Merge FlashIssue116 branch into trunk
  • Date: Fri, 21 Feb 2014 07:41:41 +0000
Revision: 951
Author:

Date: Fri Feb 21 07:41:20 2014 UTC
Log: Merge FlashIssue116 branch into trunk

http://code.google.com/p/ndt/source/detail?r=951

Modified:
/trunk
/trunk/flash-client/src/GUI.as
/trunk/flash-client/src/Handshake.as
/trunk/flash-client/src/NDTPController.as
/trunk/flash-client/src/TestC2S.as
/trunk/flash-client/src/TestMETA.as
/trunk/flash-client/src/TestResults.as
/trunk/flash-client/src/TestS2C.as

=======================================
--- /trunk/flash-client/src/GUI.as Fri Feb 21 07:35:19 2014 UTC
+++ /trunk/flash-client/src/GUI.as Fri Feb 21 07:41:20 2014 UTC
@@ -204,7 +204,7 @@
* Add text to the console while the NDT test is running.
*/
public function addConsoleOutput(text:String):void {
- _consoleText.appendText(text);
+ _consoleText.htmlText += text;
_consoleText.scrollV++;
}

=======================================
--- /trunk/flash-client/src/Handshake.as Sun Feb 2 19:14:17 2014 UTC
+++ /trunk/flash-client/src/Handshake.as Fri Feb 21 07:41:20 2014 UTC
@@ -306,14 +306,14 @@
}

private function failHandshake():void {
- TestResults.appendDebugMsg("Handshake: FAIL.");
+ TestResults.appendDebugMsg("Handshake: FAIL.<br>");

removeOnReceivedDataListener();
_callerObj.failNDTTest();
}

private function endHandshake(confirmedTests:String):void {
- TestResults.appendDebugMsg("Handshake: END.");
+ TestResults.appendDebugMsg("Handshake: END.<br>");

removeOnReceivedDataListener();
_callerObj.initiateTests(confirmedTests);
=======================================
--- /trunk/flash-client/src/NDTPController.as Thu Feb 20 20:24:05 2014 UTC
+++ /trunk/flash-client/src/NDTPController.as Fri Feb 21 07:41:20 2014 UTC
@@ -232,7 +232,8 @@
public function succeedNDTTest():void {
TestResults.ndt_test_results::ndtTestFailed = false;
NDTUtils.callExternalFunction("allTestsCompleted");
- TestResults.appendDebugMsg("All the tests completed successfully.");
+ TestResults.appendDebugMsg("<font color=\"#7CFC00\">"
+ + "All the tests completed successfully." + "</font>");
finishNDTTest();
}

=======================================
--- /trunk/flash-client/src/TestC2S.as Sun Feb 2 19:14:17 2014 UTC
+++ /trunk/flash-client/src/TestC2S.as Fri Feb 21 07:41:20 2014 UTC
@@ -423,12 +423,16 @@
TestResults.appendDebugMsg(
ResourceManager.getInstance().getString(
NDTConstants.BUNDLE_NAME, "c2sThroughput", null, Main.locale)
- + " test " + ResourceManager.getInstance().getString(
- NDTConstants.BUNDLE_NAME, "done", null, Main.locale));
+ + " test <font color=\"#7CFC00\"><b>"
+ + ResourceManager.getInstance().getString(
+ NDTConstants.BUNDLE_NAME, "done", null, Main.locale)
+ + "</b></font><br>");
else
- TestResults.appendDebugMsg(ResourceManager.getInstance().getString(
- NDTConstants.BUNDLE_NAME, "c2sThroughputFailed", null,
- Main.locale));
+ TestResults.appendDebugMsg("<font color=\"#FE9A2E\">"
+ + ResourceManager.getInstance().getString(
+ NDTConstants.BUNDLE_NAME, "c2sThroughputFailed",
+ null, Main.locale)
+ + "</font>");
TestResults.ndt_test_results::c2sTestSuccess = _c2sTestSuccess;
TestResults.ndt_test_results::ndtTestStatus = "done";
NDTUtils.callExternalFunction("testCompleted", "ClientToServerThroughput",
=======================================
--- /trunk/flash-client/src/TestMETA.as Thu Feb 20 20:24:05 2014 UTC
+++ /trunk/flash-client/src/TestMETA.as Fri Feb 21 07:41:20 2014 UTC
@@ -251,11 +251,15 @@
TestResults.appendDebugMsg(
ResourceManager.getInstance().getString(
NDTConstants.BUNDLE_NAME, "meta", null, Main.locale)
- + " test " + ResourceManager.getInstance().getString(
- NDTConstants.BUNDLE_NAME, "done", null, Main.locale));
+ + " test <font color=\"#7CFC00\"><b>"
+ + ResourceManager.getInstance().getString(
+ NDTConstants.BUNDLE_NAME, "done", null, Main.locale)
+ + "</b></font><br>");
else
- TestResults.appendDebugMsg(ResourceManager.getInstance().getString(
- NDTConstants.BUNDLE_NAME, "metaFailed", null, Main.locale));
+ TestResults.appendDebugMsg("<font color=\"#FE9A2E\">" +
+ ResourceManager.getInstance().getString(
+ NDTConstants.BUNDLE_NAME, "metaFailed", null, Main.locale)
+ + "</font>");

TestResults.ndt_test_results::ndtTestStatus = "done";
NDTUtils.callExternalFunction(
=======================================
--- /trunk/flash-client/src/TestResults.as Fri Feb 21 07:35:19 2014 UTC
+++ /trunk/flash-client/src/TestResults.as Fri Feb 21 07:41:20 2014 UTC
@@ -80,16 +80,18 @@
}

public static function appendErrMsg(msg:String):void {
- _errMsg += msg + "\n";
+ _errMsg += "<font color=\"#FE9A2E\"><b>" + msg + "</b></font>" + "\n";
NDTUtils.callExternalFunction("appendErrors", msg);
- appendDebugMsg(msg);
+ appendDebugMsg("<font color=\"#FE9A2E\"><b>" + msg + "</b></font>");
}

public static function appendDebugMsg(msg:String):void {
if (!CONFIG::debug) {
return;
}
- var formattedMsg:String = (new Date().toUTCString()) + ": " + msg + "\n";
+ var formattedMsg:String = "<font size=\"12\">"
+ + (new Date().toUTCString()) + ": "
+ + "</font>" + msg + "\n";
_debugMsg += formattedMsg;
NDTUtils.callExternalFunction("appendDebugOutput", msg);
// _ndtTestStartTime > 0 ensures the console window has been created.
=======================================
--- /trunk/flash-client/src/TestS2C.as Sun Feb 2 19:14:17 2014 UTC
+++ /trunk/flash-client/src/TestS2C.as Fri Feb 21 07:41:20 2014 UTC
@@ -490,12 +490,16 @@
TestResults.appendDebugMsg(
ResourceManager.getInstance().getString(
NDTConstants.BUNDLE_NAME, "s2cThroughput", null, Main.locale)
- + " test " + ResourceManager.getInstance().getString(
- NDTConstants.BUNDLE_NAME, "done", null, Main.locale));
+ + " test <font color=\"#7CFC00\"><b>"
+ + ResourceManager.getInstance().getString(
+ NDTConstants.BUNDLE_NAME, "done", null, Main.locale)
+ + "</b></font><br>");
else
- TestResults.appendDebugMsg(ResourceManager.getInstance().getString(
- NDTConstants.BUNDLE_NAME, "s2cThroughputFailed", null,
- Main.locale));
+ TestResults.appendDebugMsg("<font color=\"#FE9A2E\">" +
+ ResourceManager.getInstance().getString(
+ NDTConstants.BUNDLE_NAME, "s2cThroughputFailed",
+ null, Main.locale)
+ + "</font>");

TestResults.ndt_test_results::s2cTestSuccess = _s2cTestSuccess;
TestResults.ndt_test_results::ndtTestStatus = "done";

  • [ndt-dev] [ndt] r951 committed - Merge FlashIssue116 branch into trunk, ndt, 02/21/2014

Archive powered by MHonArc 2.6.16.

Top of Page