NDT-DEV email list created

Revision: 962
Author:   

Date:     Mon Feb 24 10:36:07 2014 UTC
Log:      Merged FlashIssue115 branch into trunk

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

Modified:
 /trunk
 /trunk/flash-client/src/GUI.as
 /trunk/flash-client/src/NDTPController.as

=======================================
--- /trunk/flash-client/src/GUI.as      Mon Feb 24 10:22:22 2014 UTC
+++ /trunk/flash-client/src/GUI.as      Mon Feb 24 10:36:07 2014 UTC
@@ -46,6 +46,7 @@
     private var _startButton:Sprite;

     private var _consoleText:TextField;
+    private var _progressText:TextField;
     private var _resultsTextField:TextField;
     private var _summaryResultText:String;
     private var _resultsButton:NDTButton;
@@ -76,7 +77,7 @@
       _aboutNDTText.height = 0.40 * _stageHeight;
       _aboutNDTText.wordWrap = true;
       _aboutNDTText.selectable = false;
-      _aboutNDTText.text = Main.ndt_description;
+      _aboutNDTText.text = "";

       // 3) Learn more link
       _urlRequest = new URLRequest(NDTConstants.MLAB_SITE);
@@ -149,10 +150,30 @@
       _consoleText.x = 0.02 * _stageWidth;
       _consoleText.y = 0.02 * _stageHeight;
       _consoleText.width = 0.96 * _stageWidth;
-      _consoleText.height = 0.96 * _stageHeight;
+      _consoleText.height = 0.9 * _stageHeight;
+
+      _progressText = new TextField();
+      _progressText.x = 0.02 * _stageWidth;
+      _progressText.y = 0.95 * _stageHeight;
+      _progressText.width = 0.96 * _stageWidth;
+      _progressText.height = 0.06 * _stageHeight;
+      var textFormat:TextFormat = new TextFormat();
+      textFormat.size = 14;
+      textFormat.font = "Verdana";
+      textFormat.bold = true;
+      textFormat.color = 0x000000;
+      textFormat.align = TextFormatAlign.RIGHT;
+      _progressText.defaultTextFormat = textFormat;
+
       this.addChild(_consoleText);
+      this.addChild(_progressText);
       _callerObj.startNDTTest();
     }
+
+    public function updateProgressText(completed:int, total:int):void {
+      _progressText.text = "Completed " + completed + " of "
+                           + total + " tests";
+    }

     private function hideInitialScreen():void {
       while (this.numChildren > 0)
=======================================
--- /trunk/flash-client/src/NDTPController.as   Fri Feb 21 07:41:20 2014 UTC
+++ /trunk/flash-client/src/NDTPController.as   Mon Feb 24 10:36:07 2014 UTC
@@ -43,6 +43,7 @@
     private var _testsToRun:Array;
     private var _testStage:int;
     private var _clientApplication:String;
+    private var _currentTest:int = 0;

     public function NDTPController(hostname:String,  
clientApplication:String) {
       _hostname = hostname;
@@ -115,9 +116,14 @@
     }

     public function runTests():void {
-      if (_testsToRun.length > 0) {
-       var currentTest:int = parseInt(_testsToRun.shift());
-        switch (currentTest) {
+      if (Main.guiEnabled) {
+        Main.gui.updateProgressText(_currentTest, _testsToRun.length);
+      }
+
+      if (_testsToRun.length > _currentTest) {
+        var currentTestCode:int = parseInt(_testsToRun[_currentTest]);
+        _currentTest++;
+        switch (currentTestCode) {
           case TestType.C2S:
               var c2s:TestC2S = new TestC2S(_ctlSocket, _hostname, this);
               c2s.run();
@@ -127,8 +133,8 @@
               s2c.run();
               break;
           case TestType.META:
-              var meta:TestMETA = new TestMETA(_ctlSocket,
-                                              _clientApplication,
+              var meta:TestMETA = new TestMETA(_ctlSocket,
+                                              _clientApplication,
                                               this);
               meta.run();
               break;