Merge pull request #12 from airext/feature/ci-tests

Improves test failure description.

Author: rozd

build/build.xml

@@ -475,14 +475,27 @@
             <arg line="OpenSSLTests.app" />
             <arg line="Main-app.xml" />
             <arg line="Main.swf" />
-            <arg line="-C assets " />
+            <arg line="-C assets ." />
             <arg line="-extdir extensions" />
         </java>
 
         <exec executable="open" dir="flash">
             <arg line="-a OpenSSLTests.app" />
         </exec>
 
+        <waitfor maxwait="2" maxwaitunit="minute">
+            <or>
+                <available file="tests/tests_success.txt" />
+                <available file="tests/tests_failure.txt" />
+            </or>
+        </waitfor>
+
+        <fail>
+            <condition>
+                <available file="tests/tests_failure.txt" />
+            </condition>
+        </fail>
+
     </target>
 
 

openssl-air/openssl-tests-flex/src/TestRunner.as

@@ -4,15 +4,14 @@
 package {
 import com.github.airext.flexunit.listener.CIFileListener;
 import com.github.airext.openssl.test.Tests;
+import com.github.airext.openssl.test.suite.rsa.TestSuiteRSA;
 
 import flash.display.Sprite;
 import flash.events.UncaughtErrorEvent;
 import flash.text.TextField;
 
 import org.flexunit.internals.TraceListener;
-import org.flexunit.listeners.VisualDebuggerListener;
 import org.flexunit.runner.FlexUnitCore;
-import org.flexunit.runner.notification.RunListener;
 
 public class TestRunner extends Sprite {
 
@@ -22,14 +21,14 @@ public class TestRunner extends Sprite {
         super();
 
         var handler: Function = function(message: String): void {
+            trace(message);
             tf.text += message + "\n";
         };
 
         core = new FlexUnitCore();
 
         core.addListener(new CIFileListener(handler));
         core.addListener(new TraceListener());
-        core.addListener(new RunListener());
 
         core.run(Tests);
 
@@ -40,7 +39,9 @@ public class TestRunner extends Sprite {
         tf.height = stage.stageHeight;
         addChild(tf);
 
-        tf.text += "Tests started";
+        tf.text += "Tests started\n";
+
+        tf.text += "TestSuiteRSA: " + TestSuiteRSA + "\n";
 
         loaderInfo.uncaughtErrorEvents.addEventListener(UncaughtErrorEvent.UNCAUGHT_ERROR, function(event: UncaughtErrorEvent): void {
             tf.text += event.error + "\n";

openssl-air/openssl-tests-flex/src/com/github/airext/flexunit/listener/CIFileListener.as

@@ -10,6 +10,8 @@ import flash.filesystem.File;
 import flash.filesystem.FileMode;
 import flash.filesystem.FileStream;
 
+import org.flexunit.experimental.theories.internals.ParameterizedAssertionError;
+
 import org.flexunit.runner.IDescription;
 import org.flexunit.runner.Result;
 import org.flexunit.runner.notification.Failure;
@@ -74,7 +76,9 @@ public class CIFileListener extends EventDispatcher implements IAsyncCompletionR
         } else {
             var failureContent: String = "";
             for each (var failure: Failure in result.failures) {
-                failureContent += failure.message + "\n";
+                failureContent += failure.testHeader + "\n";
+                failureContent += "\t" + failure.message + "\n";
+                failureContent += "\t\t" + (failure.exception is ParameterizedAssertionError ? ParameterizedAssertionError(failure.exception).targetException.message : failure.exception.message) + "\n";
             }
             writeToFailureResultFile(failureContent);
         }