|
From: <luk...@us...> - 2006-09-19 16:56:33
|
Revision: 96
http://svn.sourceforge.net/asunit/?rev=96&view=rev
Author: lukebayes
Date: 2006-09-19 09:56:18 -0700 (Tue, 19 Sep 2006)
Log Message:
-----------
added ArrayIterator to framework
Modified Paths:
--------------
trunk/framework/as3/AsUnitTestRunner.as
trunk/framework/as3/asunit/AllTests.as
trunk/framework/as3/asunit/framework/AssertTest.as
trunk/framework/as3/asunit/framework/TestCaseMock.as
trunk/framework/as3/asunit/framework/TestCaseTest.as
trunk/framework/as3/asunit/framework/TestFailureTest.as
trunk/framework/as3/asunit/framework/VisualTestCaseTest.as
Added Paths:
-----------
trunk/framework/as3/asunit/util/AllTests.as
trunk/framework/as3/asunit/util/ArrayIterator.as
trunk/framework/as3/asunit/util/ArrayIteratorTest.as
trunk/framework/as3/asunit/util/Iterator.as
Modified: trunk/framework/as3/AsUnitTestRunner.as
===================================================================
--- trunk/framework/as3/AsUnitTestRunner.as 2006-09-19 16:41:23 UTC (rev 95)
+++ trunk/framework/as3/AsUnitTestRunner.as 2006-09-19 16:56:18 UTC (rev 96)
@@ -1,17 +1,12 @@
package {
import asunit.textui.TestRunner;
- import flash.display.Stage;
- import flash.display.StageAlign;
- import flash.display.StageScaleMode;
- import flash.system.fscommand;
import asunit.framework.TestCaseTest;
public class AsUnitTestRunner extends TestRunner {
public function AsUnitTestRunner() {
- stage.align = StageAlign.TOP_LEFT;
- stage.scaleMode = StageScaleMode.NO_SCALE;
- start(TestCaseTest, "testAsyncMethod");
+ start(AllTests, null, TestRunner.SHOW_TRACE);
+// start(TestCaseTest, "testAsyncMethod");
}
}
}
Modified: trunk/framework/as3/asunit/AllTests.as
===================================================================
--- trunk/framework/as3/asunit/AllTests.as 2006-09-19 16:41:23 UTC (rev 95)
+++ trunk/framework/as3/asunit/AllTests.as 2006-09-19 16:56:18 UTC (rev 96)
@@ -1,11 +1,15 @@
package asunit {
import asunit.framework.TestSuite;
import asunit.framework.AllTests;
+ import asunit.textui.AllTests;
+ import asunit.util.AllTests;
public class AllTests extends TestSuite {
public function AllTests() {
addTest(new asunit.framework.AllTests());
+ addTest(new asunit.textui.AllTests());
+ addTest(new asunit.util.AllTests());
}
}
}
Modified: trunk/framework/as3/asunit/framework/AssertTest.as
===================================================================
--- trunk/framework/as3/asunit/framework/AssertTest.as 2006-09-19 16:41:23 UTC (rev 95)
+++ trunk/framework/as3/asunit/framework/AssertTest.as 2006-09-19 16:56:18 UTC (rev 96)
@@ -5,7 +5,7 @@
public class AssertTest extends TestCase {
- public function AssertTest(testMethod:String) {
+ public function AssertTest(testMethod:String = null) {
super(testMethod);
}
Modified: trunk/framework/as3/asunit/framework/TestCaseMock.as
===================================================================
--- trunk/framework/as3/asunit/framework/TestCaseMock.as 2006-09-19 16:41:23 UTC (rev 95)
+++ trunk/framework/as3/asunit/framework/TestCaseMock.as 2006-09-19 16:56:18 UTC (rev 96)
@@ -5,7 +5,7 @@
public var testMethod2Run:Boolean;
public var testMethod3Run:Boolean;
- public function TestCaseMock(methodName:String) {
+ public function TestCaseMock(methodName:String = null) {
super(methodName);
}
Modified: trunk/framework/as3/asunit/framework/TestCaseTest.as
===================================================================
--- trunk/framework/as3/asunit/framework/TestCaseTest.as 2006-09-19 16:41:23 UTC (rev 95)
+++ trunk/framework/as3/asunit/framework/TestCaseTest.as 2006-09-19 16:56:18 UTC (rev 96)
@@ -2,7 +2,7 @@
public class TestCaseTest extends TestCase {
- public function TestCaseTest(testMethod:String) {
+ public function TestCaseTest(testMethod:String = null) {
super(testMethod);
}
@@ -41,9 +41,5 @@
assertTrue("testMethod2Run", mock.testMethod2Run);
assertTrue("testMethod3Run", mock.testMethod3Run);
}
-
- public function testAsyncMethod():void {
- assertTrue(false);
- }
}
}
\ No newline at end of file
Modified: trunk/framework/as3/asunit/framework/TestFailureTest.as
===================================================================
--- trunk/framework/as3/asunit/framework/TestFailureTest.as 2006-09-19 16:41:23 UTC (rev 95)
+++ trunk/framework/as3/asunit/framework/TestFailureTest.as 2006-09-19 16:56:18 UTC (rev 96)
@@ -2,7 +2,7 @@
public class TestFailureTest extends TestCase {
- public function TestFailureTest(testMethod:String) {
+ public function TestFailureTest(testMethod:String = null) {
super(testMethod);
}
Modified: trunk/framework/as3/asunit/framework/VisualTestCaseTest.as
===================================================================
--- trunk/framework/as3/asunit/framework/VisualTestCaseTest.as 2006-09-19 16:41:23 UTC (rev 95)
+++ trunk/framework/as3/asunit/framework/VisualTestCaseTest.as 2006-09-19 16:56:18 UTC (rev 96)
@@ -4,6 +4,10 @@
public class VisualTestCaseTest extends TestCase {
private var instance:Sprite;
+ public function VisualTestCaseTest(testMethod:String = null) {
+ super(testMethod);
+ }
+
protected override function setUp():void {
instance = new Sprite();
addChild(instance);
Added: trunk/framework/as3/asunit/util/AllTests.as
===================================================================
--- trunk/framework/as3/asunit/util/AllTests.as (rev 0)
+++ trunk/framework/as3/asunit/util/AllTests.as 2006-09-19 16:56:18 UTC (rev 96)
@@ -0,0 +1,11 @@
+package asunit.util {
+ import asunit.framework.TestSuite;
+ import asunit.util.ArrayIteratorTest;
+
+ public class AllTests extends TestSuite {
+
+ public function AllTests() {
+ addTest(new asunit.util.ArrayIteratorTest());
+ }
+ }
+}
Added: trunk/framework/as3/asunit/util/ArrayIterator.as
===================================================================
--- trunk/framework/as3/asunit/util/ArrayIterator.as (rev 0)
+++ trunk/framework/as3/asunit/util/ArrayIterator.as 2006-09-19 16:56:18 UTC (rev 96)
@@ -0,0 +1,24 @@
+package asunit.util {
+ import asunit.util.Iterator;
+
+ public class ArrayIterator implements Iterator {
+ private var list:Array;
+ private var index:Number = 0;
+
+ public function ArrayIterator(list:Array) {
+ this.list = list;
+ }
+
+ public function hasNext():Boolean {
+ return list[index] != null;
+ }
+
+ public function next():Object {
+ return list[index++];
+ }
+
+ public function reset():void {
+ index = 0;
+ }
+ }
+}
Added: trunk/framework/as3/asunit/util/ArrayIteratorTest.as
===================================================================
--- trunk/framework/as3/asunit/util/ArrayIteratorTest.as (rev 0)
+++ trunk/framework/as3/asunit/util/ArrayIteratorTest.as 2006-09-19 16:56:18 UTC (rev 96)
@@ -0,0 +1,65 @@
+package asunit.util {
+ import asunit.framework.TestCase;
+
+ public class ArrayIteratorTest extends TestCase {
+ private var itr:ArrayIterator;
+
+ public function ArrayIteratorTest(testMethod:String = null) {
+ super(testMethod);
+ }
+
+ protected override function setUp():void {
+ itr = new ArrayIterator(getSimpleArray(5));
+ }
+
+ private function getSimpleArray(count:Number):Array {
+ var arr:Array = new Array();
+ for(var i:Number = 0; i < count; i++) {
+ arr.push("item-" + i);
+ }
+ return arr;
+ }
+
+ protected override function tearDown():void {
+ itr = null;
+ }
+
+ public function testInstantiated():void {
+ assertTrue("ArrayIterator instantiated", itr is ArrayIterator);
+ }
+
+ public function testHasNext():void {
+ assertTrue(itr.hasNext());
+ }
+
+ public function testNext():void {
+ assertEquals("item-0", itr.next());
+ }
+
+ public function testNextTwice():void {
+ assertEquals("item-0", itr.next());
+ assertEquals("item-1", itr.next());
+ }
+
+ public function testLast():void {
+ assertTrue(itr.hasNext());
+ assertEquals("item-0", itr.next());
+ assertTrue(itr.hasNext());
+ assertEquals("item-1", itr.next());
+ assertTrue(itr.hasNext());
+ assertEquals("item-2", itr.next());
+ assertTrue(itr.hasNext());
+ assertEquals("item-3", itr.next());
+ assertTrue(itr.hasNext());
+ assertEquals("item-4", itr.next());
+ assertFalse(itr.hasNext());
+ }
+
+ public function testReset():void {
+ testLast();
+ itr.reset();
+ assertTrue(itr.hasNext());
+ assertEquals("item-0", itr.next());
+ }
+ }
+}
Added: trunk/framework/as3/asunit/util/Iterator.as
===================================================================
--- trunk/framework/as3/asunit/util/Iterator.as (rev 0)
+++ trunk/framework/as3/asunit/util/Iterator.as 2006-09-19 16:56:18 UTC (rev 96)
@@ -0,0 +1,8 @@
+package asunit.util {
+
+ public interface Iterator {
+ function next():Object;
+ function hasNext():Boolean;
+ function reset():void;
+ }
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|