You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by gr...@apache.org on 2019/08/07 06:08:50 UTC

[royale-asjs] branch develop updated (49fc80e -> 7d6d754)

This is an automated email from the ASF dual-hosted git repository.

gregdove pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git.


    from 49fc80e  Make sure drop down list is visible regardless of bg
     new 3b82478  Aligning Language tests between manualtests project and RoyaleUnit
     new 722be26  Adding a compatibility package to manualtests/UnitTests to permit greater alignment of test code assertions with RoyaleUnit
     new e78458d  Mirror existing RoyaleUnit tests in manualtests/UnitTests (swap to alternate assertion methods)
     new 7d6d754  Migrate other manualtests/UnitTests to alternate assertion methods to match RoyaleUnit (prep for adding new tests to RoyaleUnit)

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../royale/flexUnitTests/BinaryDataTesterTest.as   | 216 ++++---
 .../language/LanguageTesterIntUint.as              |  22 +
 .../flexUnitTests/language/LanguageTesterTestIs.as |  31 +
 .../language/LanguageTesterTestVector.as           |  24 +-
 .../flexUnitTests/core/BinaryDataTesterTest.as     | 556 ++++++++---------
 .../royale/flexUnitTests/core/StrandTesterTest.as  |   5 +-
 .../language/LanguageTesterIntUint.as              |  97 ++-
 .../language/LanguageTesterTestClass.as            | 104 ++--
 .../flexUnitTests/language/LanguageTesterTestIs.as | 130 ++--
 .../language/LanguageTesterTestVector.as           | 693 +++++++++++----------
 .../network/AMFBinaryDataTesterTest.as             | 224 +++----
 .../flexUnitTests/observedbugs/ObservedBugTests.as |   7 +-
 .../reflection/ReflectionTesterNativeTypes.as      |  81 ++-
 .../reflection/ReflectionTesterTest.as             | 209 ++++---
 .../reflection/ReflectionTesterTestAlias.as        |  12 +-
 .../reflection/ReflectionTesterTestDynamic.as      |  78 +--
 .../reflection/ReflectionTesterTestUseCache.as     |   4 +-
 .../flexUnitTests/xml/XMLListTesterGeneralTest.as  |  46 +-
 .../flexUnitTests/xml/XMLTesterGeneralTest.as      | 300 ++++-----
 .../flexUnitTests/xml/XMLTesterStringifyTest.as    |  32 +-
 .../src/main/royale/flexunit/framework/Assert.as   |  53 ++
 .../org/apache/royale/test/asserts/assertEquals.as |  11 +-
 .../org/apache/royale/test/asserts/assertFalse.as  |  11 +-
 .../apache/royale/test/asserts/assertNotEquals.as  |   9 +-
 .../apache/royale/test/asserts/assertNotNull.as    |  11 +-
 .../royale/test/asserts/assertNotStrictlyEquals.as |  13 +-
 .../org/apache/royale/test/asserts/assertNull.as   |  13 +-
 .../royale/test/asserts/assertStrictlyEquals.as    |  13 +-
 .../org/apache/royale/test/asserts/assertTrue.as   |  13 +-
 .../royale/org/apache/royale/test/asserts/fail.as  |   9 +-
 30 files changed, 1614 insertions(+), 1413 deletions(-)
 copy {frameworks/projects/RoyaleUnit => manualtests/UnitTests}/src/main/royale/org/apache/royale/test/asserts/assertEquals.as (82%)
 copy {frameworks/projects/RoyaleUnit => manualtests/UnitTests}/src/main/royale/org/apache/royale/test/asserts/assertFalse.as (83%)
 copy {frameworks/projects/RoyaleUnit => manualtests/UnitTests}/src/main/royale/org/apache/royale/test/asserts/assertNotEquals.as (86%)
 copy {frameworks/projects/RoyaleUnit => manualtests/UnitTests}/src/main/royale/org/apache/royale/test/asserts/assertNotNull.as (83%)
 copy {frameworks/projects/RoyaleUnit => manualtests/UnitTests}/src/main/royale/org/apache/royale/test/asserts/assertNotStrictlyEquals.as (80%)
 copy {frameworks/projects/RoyaleUnit => manualtests/UnitTests}/src/main/royale/org/apache/royale/test/asserts/assertNull.as (83%)
 copy {frameworks/projects/RoyaleUnit => manualtests/UnitTests}/src/main/royale/org/apache/royale/test/asserts/assertStrictlyEquals.as (80%)
 copy {frameworks/projects/RoyaleUnit => manualtests/UnitTests}/src/main/royale/org/apache/royale/test/asserts/assertTrue.as (83%)
 copy {frameworks/projects/RoyaleUnit => manualtests/UnitTests}/src/main/royale/org/apache/royale/test/asserts/fail.as (90%)


[royale-asjs] 03/04: Mirror existing RoyaleUnit tests in manualtests/UnitTests (swap to alternate assertion methods)

Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

gregdove pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git

commit e78458de9e27e538a95f6aef6b85668917955c3f
Author: greg-dove <gr...@gmail.com>
AuthorDate: Wed Aug 7 14:47:39 2019 +1200

    Mirror existing RoyaleUnit tests in manualtests/UnitTests (swap to alternate assertion methods)
---
 .../language/LanguageTesterIntUint.as              |  85 ++-
 .../language/LanguageTesterTestClass.as            |  94 +--
 .../flexUnitTests/language/LanguageTesterTestIs.as | 118 ++--
 .../language/LanguageTesterTestVector.as           | 683 +++++++++++----------
 4 files changed, 495 insertions(+), 485 deletions(-)

diff --git a/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterIntUint.as b/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterIntUint.as
index 3ef7135..d001a18 100644
--- a/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterIntUint.as
+++ b/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterIntUint.as
@@ -20,7 +20,7 @@ package flexUnitTests.language
 {
     
     
-    import flexunit.framework.Assert;
+    import org.apache.royale.test.asserts.*;
     
     import flexUnitTests.language.support.*;
     
@@ -66,58 +66,58 @@ package flexUnitTests.language
             
             var clazz:Class = int;
             var intVal:int = (val1 as int);
-            Assert.assertTrue('Unexpected int check', intVal == 0);
+            assertTrue( intVal == 0,'Unexpected int check');
             
             intVal = (var3 as int);
-            Assert.assertTrue('Unexpected int check', intVal == 0);
+            assertTrue( intVal == 0,'Unexpected int check');
             intVal = (var4 as int);
-            Assert.assertTrue('Unexpected int check', intVal == 0);
+            assertTrue( intVal == 0,'Unexpected int check');
             intVal = (var5 as int);
-            Assert.assertTrue('Unexpected int check', intVal == 0);
+            assertTrue( intVal == 0,'Unexpected int check');
             
             intVal = int(var3);
-            Assert.assertTrue('Unexpected int check', intVal == 0);
+            assertTrue( intVal == 0,'Unexpected int check');
             intVal = int(var4);
-            Assert.assertTrue('Unexpected int check', intVal == 0);
+            assertTrue( intVal == 0,'Unexpected int check');
             intVal = int(var5);
-            Assert.assertTrue('Unexpected int check', intVal == 2);
+            assertTrue( intVal == 2,'Unexpected int check');
             
             intVal = new int(var3);
-            Assert.assertTrue('Unexpected int check', intVal == 0);
+            assertTrue( intVal == 0,'Unexpected int check');
             intVal = new int(var4);
-            Assert.assertTrue('Unexpected int check', intVal == 0);
+            assertTrue( intVal == 0,'Unexpected int check');
             intVal = new int(var5);
-            Assert.assertTrue('Unexpected int check', intVal == 2);
+            assertTrue( intVal == 2,'Unexpected int check');
             
             
-            Assert.assertFalse('int check should be false', val1 is int);
-            Assert.assertTrue('int check should be true', val2 is int);
+            assertFalse( val1 is int,'int check should be false');
+            assertTrue( val2 is int,'int check should be true');
             
-            Assert.assertFalse('uint check should be false', val1 is uint);
-            Assert.assertTrue('uint check should be true', val2 is uint);
+            assertFalse( val1 is uint,'uint check should be false');
+            assertTrue( val2 is uint,'uint check should be true');
             
             var dyn:* = new clazz();
             
-            Assert.assertTrue('Unexpected int check', dyn == 0);
-            Assert.assertTrue('Unexpected int check', dyn === 0);
+            assertTrue( dyn == 0,'Unexpected int check');
+            assertTrue( dyn === 0,'Unexpected int check');
             
             
-            Assert.assertTrue('random check', int === int);
+            assertTrue( int === int,'random check');
             
-            Assert.assertTrue('Unexpected int check', new clazz(3.5) == 3);
+            assertTrue( new clazz(3.5) == 3,'Unexpected int check');
             
-            Assert.assertFalse('Unexpected int check', dyn !== 0);
+            assertFalse( dyn !== 0,'Unexpected int check');
             dyn = new clazz(3.5);
             intVal = dyn;
-            Assert.assertTrue('Unexpected int check', intVal === 3);
-            Assert.assertTrue('Unexpected int check', new clazz(3.5) === 3);
+            assertTrue( intVal === 3,'Unexpected int check');
+            assertTrue( new clazz(3.5) === 3,'Unexpected int check');
             
             //extra indirection
             var dynInt:* = var5;
             
-            Assert.assertFalse('Unexpected int check', dynInt is clazz);
-            Assert.assertNull('Unexpected int check', dynInt as clazz);
-            Assert.assertTrue('Unexpected int check', clazz(dynInt) === 2);
+            assertFalse( dynInt is clazz,'Unexpected int check');
+            assertNull( dynInt as clazz,'Unexpected int check');
+            assertTrue( clazz(dynInt) === 2,'Unexpected int check');
         }
         
         
@@ -129,34 +129,34 @@ package flexUnitTests.language
             var untyped:* = val;
             var untyped2:* = new c(30);
             var untyped3:Object = new c(30);
-            Assert.assertTrue('Unexpected int check', untyped3 == 30);
-            Assert.assertTrue('Unexpected int check', untyped3 === 30);
+            assertTrue( untyped3 == 30,'Unexpected int check');
+            assertTrue( untyped3 === 30,'Unexpected int check');
             
             val += 1.5;
             untyped += 1.5;
             untyped2 += 1.5;
-            Assert.assertTrue('Unexpected int check', val == 31);
-            Assert.assertTrue('Unexpected int check', val === 31);
+            assertTrue( val == 31,'Unexpected int check');
+            assertTrue( val === 31,'Unexpected int check');
             
-            Assert.assertTrue('Unexpected int check', untyped == 31.5);
-            Assert.assertTrue('Unexpected int check', untyped === 31.5);
+            assertTrue( untyped == 31.5,'Unexpected int check');
+            assertTrue( untyped === 31.5,'Unexpected int check');
             
-            Assert.assertTrue('Unexpected int check', untyped2 == 31.5);
-            Assert.assertTrue('Unexpected int check', untyped2 === 31.5);
+            assertTrue( untyped2 == 31.5,'Unexpected int check');
+            assertTrue( untyped2 === 31.5,'Unexpected int check');
             
             untyped = new Number(30);
-            Assert.assertTrue('Unexpected Number check', untyped == 30);
-            Assert.assertTrue('Unexpected Number check', untyped === 30);
+            assertTrue( untyped == 30,'Unexpected Number check');
+            assertTrue( untyped === 30,'Unexpected Number check');
             
             var numClass:Class = Number;
             untyped = new numClass(30);
-            Assert.assertTrue('Unexpected Number check', untyped == 30);
-            Assert.assertTrue('Unexpected Number check', untyped === 30);
-            Assert.assertTrue('Unexpected Number check', 30 === untyped);
+            assertTrue( untyped == 30,'Unexpected Number check');
+            assertTrue( untyped === 30,'Unexpected Number check');
+            assertTrue( 30 === untyped,'Unexpected Number check');
             
             untyped += 1.5;
-            Assert.assertTrue('Unexpected Number check', untyped == 31.5);
-            Assert.assertTrue('Unexpected Number check', untyped === 31.5);
+            assertTrue( untyped == 31.5,'Unexpected Number check');
+            assertTrue( untyped === 31.5,'Unexpected Number check');
             
         }
     
@@ -172,16 +172,15 @@ package flexUnitTests.language
             var c:Class = int;
             var untyped:* = new c(30);
             var expected:Boolean = isJS ? false : true;
-            Assert.assertEquals('Unexpected int check', untyped === 30, expected);
+            assertEquals(  expected, untyped === 30,'Unexpected int check');
             // b does not have suppression, only c does above (via @royalesuppressresolveuncertain c)
             expected = true;
             var b:Class = String;
            // c = String;
             untyped = new b(30);
-            Assert.assertEquals('Unexpected String check', untyped === '30', expected);
+            assertEquals(expected, untyped === '30', 'Unexpected String check');
         
         }
         
-        
     }
 }
diff --git a/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterTestClass.as b/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterTestClass.as
index 7714092..17fb667 100644
--- a/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterTestClass.as
+++ b/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterTestClass.as
@@ -20,7 +20,7 @@ package flexUnitTests.language
 {
     
     
-    import flexunit.framework.Assert;
+    import org.apache.royale.test.asserts.*;
     
     import flexUnitTests.language.support.*;
     
@@ -65,7 +65,7 @@ package flexUnitTests.language
                 err = true;
             }
             
-            Assert.assertTrue('Class constructor call should throw error', err);
+            assertTrue( err,'Class constructor call should throw error');
     
         }
     
@@ -74,7 +74,7 @@ package flexUnitTests.language
         public function testDistinctType():void
         {
             var classType:* = Class;
-            Assert.assertFalse('Class should be distinct from Object', classType == Object);
+            assertFalse( classType == Object,'Class should be distinct from Object');
         }
     
     
@@ -83,11 +83,11 @@ package flexUnitTests.language
         {
             var n:* = undefined;
             
-            Assert.assertNull('Class coercion of undefined should return null', Class(n));
+            assertNull( Class(n),'Class coercion of undefined should return null');
             
             n = null;
     
-            Assert.assertNull('Class  coercion of null should return null', Class(n));
+            assertNull( Class(n),'Class  coercion of null should return null');
         }
         
         
@@ -98,10 +98,10 @@ package flexUnitTests.language
            var nVal:* = 1;
            var c:Class; 
             
-           Assert.assertTrue('Number is Class should be true', Number is Class);
-           Assert.assertTrue('Number is Class should be true', n is Class);
+           assertTrue( Number is Class,'Number is Class should be true');
+           assertTrue( n is Class,'Number is Class should be true');
     
-           Assert.assertFalse('Number value is Class should be false', nVal is Class);
+           assertFalse( nVal is Class,'Number value is Class should be false');
     
             var err:Boolean = false;
             try {
@@ -109,8 +109,8 @@ package flexUnitTests.language
             } catch(e:Error) {
                 err = true;
             }
-            Assert.assertFalse('Number is Class should be true', err);
-            Assert.assertEquals('c should be Number', c, Number);
+            assertFalse( err,'Number is Class should be true');
+            assertEquals( c, Number,'c should be Number');
             
             err = false;
             c = Class;
@@ -119,8 +119,8 @@ package flexUnitTests.language
             } catch(e:Error) {
                 err = true;
             }
-            Assert.assertFalse('Number is Class should be true', err);
-            Assert.assertEquals('c should be Number', c, Number);
+            assertFalse( err,'Number is Class should be true');
+            assertEquals( c, Number,'c should be Number');
     
             err = false;
             try {
@@ -128,7 +128,7 @@ package flexUnitTests.language
             } catch(e:Error) {
                 err = true;
             }
-            Assert.assertTrue('Number value Class coercion should throw error', err);
+            assertTrue( err,'Number value Class coercion should throw error');
 
             err = false;
             c = Class;
@@ -137,7 +137,7 @@ package flexUnitTests.language
             } catch(e:Error) {
                 err = true;
             }
-            Assert.assertTrue('Number value Class coercion should throw error', err);
+            assertTrue( err,'Number value Class coercion should throw error');
             
         }
     
@@ -149,10 +149,10 @@ package flexUnitTests.language
             var nVal:* = [];
             var c:Class;
         
-            Assert.assertTrue('Array is Class should be true', Array is Class);
-            Assert.assertTrue('Array is Class should be true', n is Class);
+            assertTrue( Array is Class,'Array is Class should be true');
+            assertTrue( n is Class,'Array is Class should be true');
         
-            Assert.assertFalse('Array value is Class should be false', nVal is Class);
+            assertFalse( nVal is Class,'Array value is Class should be false');
         
             var err:Boolean = false;
             try {
@@ -160,8 +160,8 @@ package flexUnitTests.language
             } catch(e:Error) {
                 err = true;
             }
-            Assert.assertFalse('Array is Class should be true', err);
-            Assert.assertEquals('c should be Array', c, Array);
+            assertFalse( err,'Array is Class should be true');
+            assertEquals( c, Array,'c should be Array');
         
             err = false;
             c = Class;
@@ -170,8 +170,8 @@ package flexUnitTests.language
             } catch(e:Error) {
                 err = true;
             }
-            Assert.assertFalse('Array is Class should be true', err);
-            Assert.assertEquals('c should be Array', c, Array);
+            assertFalse( err,'Array is Class should be true');
+            assertEquals( c, Array,'c should be Array');
         
             err = false;
             try {
@@ -179,7 +179,7 @@ package flexUnitTests.language
             } catch(e:Error) {
                 err = true;
             }
-            Assert.assertTrue('Array value Class coercion should throw error', err);
+            assertTrue( err,'Array value Class coercion should throw error');
         
             err = false;
             c = Class;
@@ -188,7 +188,7 @@ package flexUnitTests.language
             } catch(e:Error) {
                 err = true;
             }
-            Assert.assertTrue('Array value Class coercion should throw error', err);
+            assertTrue( err,'Array value Class coercion should throw error');
         
         }
     
@@ -199,10 +199,10 @@ package flexUnitTests.language
             var nVal:* = new n();
             var c:Class;
         
-            Assert.assertTrue('uint is Class should be true', uint is Class);
-            Assert.assertTrue('uint is Class should be true', n is Class);
+            assertTrue( uint is Class,'uint is Class should be true');
+            assertTrue( n is Class,'uint is Class should be true');
         
-            Assert.assertFalse('uint val is Class should be false ', nVal is Class);
+            assertFalse( nVal is Class,'uint val is Class should be false ');
         
             var err:Boolean = false;
             try {
@@ -210,8 +210,8 @@ package flexUnitTests.language
             } catch(e:Error) {
                 err = true;
             }
-            Assert.assertFalse('uint Class coercion should succeed', err);
-            Assert.assertEquals('c should be uint', c, uint);
+            assertFalse( err,'uint Class coercion should succeed');
+            assertEquals( c, uint,'c should be uint');
         
             err = false;
             c = Class;
@@ -220,8 +220,8 @@ package flexUnitTests.language
             } catch(e:Error) {
                 err = true;
             }
-            Assert.assertFalse('uint Class coercion should succeed', err);
-            Assert.assertEquals('c should be uint', c, uint);
+            assertFalse( err,'uint Class coercion should succeed');
+            assertEquals( c, uint,'c should be uint');
         
             err = false;
             try {
@@ -229,7 +229,7 @@ package flexUnitTests.language
             } catch(e:Error) {
                 err = true;
             }
-            Assert.assertTrue('uint value Class coercion should throw error', err);
+            assertTrue( err,'uint value Class coercion should throw error');
         
             err = false;
             c = Class;
@@ -238,7 +238,7 @@ package flexUnitTests.language
             } catch(e:Error) {
                 err = true;
             }
-            Assert.assertTrue('uint value Class coercion should throw error', err);
+            assertTrue( err,'uint value Class coercion should throw error');
         }
     
     
@@ -249,10 +249,10 @@ package flexUnitTests.language
             var nVal:* = new TestClass1();
             var c:Class;
         
-            Assert.assertTrue('TestClass1 is Class should be true', TestClass1 is Class);
-            Assert.assertTrue('TestClass1 is Class should be true', n is Class);
+            assertTrue( TestClass1 is Class,'TestClass1 is Class should be true');
+            assertTrue( n is Class,'TestClass1 is Class should be true');
         
-            Assert.assertFalse('TestClass1 val is Class should be false ', nVal is Class);
+            assertFalse( nVal is Class,'TestClass1 val is Class should be false ');
         
             var err:Boolean = false;
             try {
@@ -260,8 +260,8 @@ package flexUnitTests.language
             } catch(e:Error) {
                 err = true;
             }
-            Assert.assertFalse('TestClass1 Class coercion should succeed', err);
-            Assert.assertEquals('c should be TestClass1', c, TestClass1);
+            assertFalse( err,'TestClass1 Class coercion should succeed');
+            assertEquals( c, TestClass1,'c should be TestClass1');
         
             err = false;
             c = Class;
@@ -270,8 +270,8 @@ package flexUnitTests.language
             } catch(e:Error) {
                 err = true;
             }
-            Assert.assertFalse('TestClass1 Class coercion should succeed', err);
-            Assert.assertEquals('c should be TestClass1', c, TestClass1);
+            assertFalse( err,'TestClass1 Class coercion should succeed');
+            assertEquals( c, TestClass1,'c should be TestClass1');
         
             err = false;
             try {
@@ -279,7 +279,7 @@ package flexUnitTests.language
             } catch(e:Error) {
                 err = true;
             }
-            Assert.assertTrue('TestClass1 value Class coercion should throw error', err);
+            assertTrue( err,'TestClass1 value Class coercion should throw error');
         
             err = false;
             c = Class;
@@ -288,7 +288,7 @@ package flexUnitTests.language
             } catch(e:Error) {
                 err = true;
             }
-            Assert.assertTrue('TestClass1 value Class coercion should throw error', err);
+            assertTrue( err,'TestClass1 value Class coercion should throw error');
         }
     
     
@@ -298,7 +298,7 @@ package flexUnitTests.language
             var n:* = ITestInterface;
             var c:Class;
             //strange, perhaps, but true:
-            Assert.assertTrue('ITestInterface is Class should be true', n is Class);
+            assertTrue( n is Class,'ITestInterface is Class should be true');
             
             var err:Boolean = false;
             try {
@@ -307,7 +307,7 @@ package flexUnitTests.language
                 err = true;
             }
             //ditto:
-            Assert.assertFalse('ITestInterface Class coercion should not throw error', err);
+            assertFalse( err,'ITestInterface Class coercion should not throw error');
         }
     
     
@@ -316,7 +316,7 @@ package flexUnitTests.language
         {
             var n:* = testRoyaleInterface;
             var c:Class;
-            Assert.assertFalse('method (function) is Class should be false', n is Class);
+            assertFalse( n is Class,'method (function) is Class should be false');
         
             var err:Boolean = false;
             try {
@@ -325,11 +325,11 @@ package flexUnitTests.language
                 err = true;
             }
 
-            Assert.assertTrue('method (function) Class coercion should throw error', err);
+            assertTrue( err,'method (function) Class coercion should throw error');
             
             //local function
             n = function():void{};
-            Assert.assertFalse('local function is Class should be false', n is Class);
+            assertFalse( n is Class,'local function is Class should be false');
     
             err = false;
             try {
@@ -337,7 +337,7 @@ package flexUnitTests.language
             } catch(e:Error) {
                 err = true;
             }
-            Assert.assertTrue('local function Class coercion should throw error', err);
+            assertTrue( err,'local function Class coercion should throw error');
         }
         
     }
diff --git a/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterTestIs.as b/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterTestIs.as
index dec5d85..9d6f3c4 100644
--- a/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterTestIs.as
+++ b/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterTestIs.as
@@ -20,7 +20,7 @@ package flexUnitTests.language
 {
     
     
-    import flexunit.framework.Assert;
+    import org.apache.royale.test.asserts.*;
     
     import flexUnitTests.language.support.*;
     
@@ -58,21 +58,21 @@ package flexUnitTests.language
         public function testIsOwnType():void
         {
             var test1:TestClass1 = new TestClass1();
-            Assert.assertTrue('Unexpected instance is {Class} check', test1 is TestClass1)
+            assertTrue(  test1 is TestClass1,'Unexpected instance is {Class} check');
         }
         
         [Test]
         public function testIsAncestorType():void
         {
             var test2:TestClass2 = new TestClass2();
-            Assert.assertTrue('Unexpected instance is {AncestorClass} check', test2 is TestClass1)
+            assertTrue(  test2 is TestClass1,'Unexpected instance is {AncestorClass} check');
         }
         
         [Test]
         public function testIsDistantAncestorType():void
         {
             var test4:TestClass4 = new TestClass4();
-            Assert.assertTrue('Unexpected instance is {DistantAncestorClass} check', test4 is TestClass1)
+            assertTrue( test4 is TestClass1,'Unexpected instance is {DistantAncestorClass} check');
         }
         
         
@@ -80,7 +80,7 @@ package flexUnitTests.language
         public function testIsImplementedInterface():void
         {
             var test1:TestClass1 = new TestClass1();
-            Assert.assertTrue('Unexpected instance is {OwnInterface} check', test1 is ITestInterface)
+            assertTrue( test1 is ITestInterface,'Unexpected instance is {OwnInterface} check');
         }
         
         
@@ -88,14 +88,14 @@ package flexUnitTests.language
         public function testIsAncestorInterface():void
         {
             var test2:TestClass2 = new TestClass2();
-            Assert.assertTrue('Unexpected instance is {AncestorInterface} check', test2 is ITestInterface)
+            assertTrue( test2 is ITestInterface,'Unexpected instance is {AncestorInterface} check');
         }
         
         [Test]
         public function testIsImplementedInterfaceAncestor():void
         {
             var test3:TestClass3 = new TestClass3();
-            Assert.assertTrue('Unexpected instance is {InterfaceAncestor} check', test3 is ITestInterface)
+            assertTrue( test3 is ITestInterface,'Unexpected instance is {InterfaceAncestor} check');
             
         }
         
@@ -103,7 +103,7 @@ package flexUnitTests.language
         public function testIsImplementedInterfaceAncestor2():void
         {
             var test4:TestClass4 = new TestClass4();
-            Assert.assertTrue('Unexpected instance is {InterfaceAncestor} check', test4 is ITestInterface)
+            assertTrue( test4 is ITestInterface,'Unexpected instance is {InterfaceAncestor} check');
         }
         
         
@@ -113,92 +113,92 @@ package flexUnitTests.language
             var val:Object = null;
             
             var s:String = String(val);
-            Assert.assertEquals('Unexpected coercion check', s, 'null');
+            assertEquals( s, 'null','Unexpected coercion check');
             var i:int = int(val);
-            Assert.assertTrue('Unexpected coercion check', i === 0);
+            assertTrue( i === 0,'Unexpected coercion check');
             var u:uint = uint(val);
-            Assert.assertTrue('Unexpected coercion check', u === 0);
+            assertTrue( u === 0,'Unexpected coercion check');
             var n:Number = Number(val);
-            Assert.assertTrue('Unexpected coercion check', n === 0);
+            assertTrue( n === 0,'Unexpected coercion check');
             var b:Boolean = Boolean(val);
-            Assert.assertTrue('Unexpected coercion check', b === false);
+            assertTrue( b === false,'Unexpected coercion check');
             
             var t:TestClass1 = TestClass1(val);
-            Assert.assertTrue('Unexpected coercion check', t === null);
+            assertTrue( t === null,'Unexpected coercion check');
             
             //with indirection
             var c:Class = String;
             var result:* = c(val);
-            Assert.assertTrue('Unexpected coercion check', result === 'null');
+            assertTrue( result === 'null','Unexpected coercion check');
             c = int;
             result = c(val);
-            Assert.assertTrue('Unexpected coercion check', result === 0);
+            assertTrue( result === 0,'Unexpected coercion check');
             c = uint;
             result = c(val);
-            Assert.assertTrue('Unexpected coercion check', result === 0);
+            assertTrue( result === 0,'Unexpected coercion check');
             c = Number;
             result = c(val);
-            Assert.assertTrue('Unexpected coercion check', result === 0);
+            assertTrue( result === 0,'Unexpected coercion check');
             
             c = Boolean;
             result = c(val);
-            Assert.assertTrue('Unexpected coercion check', result === false);
+            assertTrue( result === false,'Unexpected coercion check');
             
             c = TestClass1;
             result = c(val);
-            Assert.assertTrue('Unexpected coercion check', result === null);
+            assertTrue( result === null,'Unexpected coercion check');
         }
         
         [Test]
         public function testObjectCoercion():void
         {
-            Assert.assertTrue('Unexpected null check', Object(undefined) != null);
-            Assert.assertTrue('Unexpected null check', Object(null) != null);
-            Assert.assertTrue('Unexpected null check', Object('test') === 'test');
-            Assert.assertTrue('Unexpected null check', Object(1) === 1);
-            Assert.assertTrue('Unexpected null check', Object(false) === false);
-            Assert.assertTrue('Unexpected null check', Object(true) === true);
+            assertTrue( Object(undefined) != null,'Unexpected null check');
+            assertTrue( Object(null) != null,'Unexpected null check');
+            assertTrue( Object('test') === 'test','Unexpected null check');
+            assertTrue( Object(1) === 1,'Unexpected null check');
+            assertTrue( Object(false) === false,'Unexpected null check');
+            assertTrue( Object(true) === true,'Unexpected null check');
             var indirection:* = undefined;
-            Assert.assertTrue('Unexpected null check', Object(indirection) != null);
+            assertTrue( Object(indirection) != null,'Unexpected null check');
             indirection = null;
-            Assert.assertTrue('Unexpected null check', Object(indirection) != null);
+            assertTrue( Object(indirection) != null,'Unexpected null check');
             indirection = 'test';
-            Assert.assertTrue('Unexpected null check', Object(indirection) === 'test');
+            assertTrue( Object(indirection) === 'test','Unexpected null check');
             indirection = 1;
-            Assert.assertTrue('Unexpected null check', Object(indirection) === 1);
+            assertTrue( Object(indirection) === 1,'Unexpected null check');
             indirection = false;
-            Assert.assertTrue('Unexpected null check', Object(indirection) === false);
+            assertTrue( Object(indirection) === false,'Unexpected null check');
             indirection = true;
-            Assert.assertTrue('Unexpected null check', Object(indirection) === true);
+            assertTrue( Object(indirection) === true,'Unexpected null check');
             var dynObjectClass:Class = Object;
             //regular indirect coercion
             indirection = undefined;
-            Assert.assertTrue('Unexpected null check', dynObjectClass(indirection) != null);
+            assertTrue( dynObjectClass(indirection) != null,'Unexpected null check');
             indirection = null;
-            Assert.assertTrue('Unexpected null check', dynObjectClass(indirection) != null);
+            assertTrue( dynObjectClass(indirection) != null,'Unexpected null check');
             indirection = 'test';
-            Assert.assertTrue('Unexpected null check', dynObjectClass(indirection) === 'test');
+            assertTrue( dynObjectClass(indirection) === 'test','Unexpected null check');
             indirection = 1;
-            Assert.assertTrue('Unexpected null check', dynObjectClass(indirection) === 1);
+            assertTrue( dynObjectClass(indirection) === 1,'Unexpected null check');
             indirection = false;
-            Assert.assertTrue('Unexpected null check', dynObjectClass(indirection) === false);
+            assertTrue( dynObjectClass(indirection) === false,'Unexpected null check');
             indirection = true;
-            Assert.assertTrue('Unexpected null check', dynObjectClass(indirection) === true);
+            assertTrue( dynObjectClass(indirection) === true,'Unexpected null check');
             //no need to test 'new Object(something)' as it is not permitted explicitly in actionscript
             //but it can be achieved via indirection:
             var dynObject:Class = Object;
             indirection = undefined;
-            Assert.assertTrue('Unexpected null check', new dynObject(indirection) != null);
+            assertTrue( new dynObject(indirection) != null,'Unexpected null check');
             indirection = null;
-            Assert.assertTrue('Unexpected null check', new dynObject(indirection) != null);
+            assertTrue( new dynObject(indirection) != null,'Unexpected null check');
             indirection = 'test';
-            Assert.assertTrue('Unexpected null check', new dynObject(indirection) === 'test');
+            assertTrue( new dynObject(indirection) === 'test','Unexpected null check');
             indirection = 1;
-            Assert.assertTrue('Unexpected null check', new dynObject(indirection) === 1);
+            assertTrue( new dynObject(indirection) === 1,'Unexpected null check');
             indirection = false;
-            Assert.assertTrue('Unexpected null check', new dynObject(indirection) === false);
+            assertTrue( new dynObject(indirection) === false,'Unexpected null check');
             indirection = true;
-            Assert.assertTrue('Unexpected null check', new dynObject(indirection) === true);
+            assertTrue( new dynObject(indirection) === true,'Unexpected null check');
             
         }
         
@@ -217,8 +217,8 @@ package flexUnitTests.language
                 caughtError = e is TypeError
             }
             
-            Assert.assertTrue('Unexpected coercion check', caughtError);
-            Assert.assertTrue('Unexpected coercion check', testClass3 == null);
+            assertTrue( caughtError,'Unexpected coercion check');
+            assertTrue( testClass3 == null,'Unexpected coercion check');
         }
     
     
@@ -243,11 +243,11 @@ package flexUnitTests.language
             }
         
             if (isJS) {
-                Assert.assertFalse('Unexpected coercion check', caughtError);
-                Assert.assertFalse('Unexpected coercion check', testClass3 == null);
+                assertFalse( caughtError, 'Unexpected coercion check');
+                assertFalse(testClass3 == null, 'Unexpected coercion check');
             } else {
-                Assert.assertTrue('Unexpected coercion check', caughtError);
-                Assert.assertTrue('Unexpected coercion check', testClass3 == null);
+                assertTrue(caughtError, 'Unexpected coercion check');
+                assertTrue(testClass3 == null, 'Unexpected coercion check');
             }
         
         }
@@ -255,20 +255,20 @@ package flexUnitTests.language
         [Test]
         public function testNullUndefined():void
         {
-            Assert.assertTrue('Unexpected null check', null == null);
-            Assert.assertTrue('Unexpected null check', null == undefined);
-            Assert.assertTrue('Unexpected null check', null === null);
-            Assert.assertTrue('Unexpected undefined check', undefined === undefined);
-            Assert.assertFalse('Unexpected null/undefined check', undefined === null);
+            assertTrue( null == null,'Unexpected null check');
+            assertTrue( null == undefined,'Unexpected null check');
+            assertTrue( null === null,'Unexpected null check');
+            assertTrue( undefined === undefined,'Unexpected undefined check');
+            assertFalse( undefined === null,'Unexpected null/undefined check');
         }
         
         [Test]
         public function testString():void
         {
-            Assert.assertTrue('Unexpected string check', String('test') == 'test');
-            Assert.assertTrue('Unexpected string check', String('test') === 'test');
-            Assert.assertTrue('Unexpected string check', new String('test') == 'test');
-            Assert.assertTrue('Unexpected string check', new String('test') === 'test');
+            assertTrue( String('test') == 'test','Unexpected string check');
+            assertTrue( String('test') === 'test','Unexpected string check');
+            assertTrue( new String('test') == 'test','Unexpected string check');
+            assertTrue( new String('test') === 'test','Unexpected string check');
         }
         
         
diff --git a/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterTestVector.as b/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterTestVector.as
index aa53c61..79c5e83 100644
--- a/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterTestVector.as
+++ b/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterTestVector.as
@@ -19,7 +19,7 @@
 package flexUnitTests.language
 {
     
-    import flexunit.framework.Assert;
+    import org.apache.royale.test.asserts.*;
     import flexUnitTests.language.support.*;
     
     import testshim.RoyaleUnitTestRunner;
@@ -78,20 +78,20 @@ package flexUnitTests.language
             
             var vi:Vector.<int> = new Vector.<int>();
             
-            Assert.assertFalse('Unexpected Vector check', vi.fixed);
-            Assert.assertTrue('Unexpected Vector check', vi.length == 0);
+            assertFalse( vi.fixed,'Unexpected Vector check');
+            assertTrue( vi.length == 0,'Unexpected Vector check');
             
             vi = new Vector.<int>(20);
             
-            Assert.assertFalse('Unexpected Vector check', vi.fixed);
-            Assert.assertTrue('Unexpected Vector check', vi.length == 20);
-            Assert.assertEquals('Unexpected Vector check', '0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0', vi.toString());
+            assertFalse( vi.fixed,'Unexpected Vector check');
+            assertTrue( vi.length == 20,'Unexpected Vector check');
+            assertEquals( vi.toString(),'0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0','Unexpected Vector check');
             
             vi = new Vector.<int>(20, true);
             
-            Assert.assertTrue('Unexpected Vector check', vi.fixed);
-            Assert.assertTrue('Unexpected Vector check', vi.length == 20);
-            Assert.assertEquals('Unexpected Vector check', '0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0', vi.toString());
+            assertTrue( vi.fixed,'Unexpected Vector check');
+            assertTrue( vi.length == 20,'Unexpected Vector check');
+            assertEquals( vi.toString(),'0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0','Unexpected Vector check');
             
             var c:Class = Vector.<int>;
             
@@ -99,114 +99,114 @@ package flexUnitTests.language
             var n:* = new c();
             n.push(12);
             n.push(24);
-            Assert.assertFalse('Unexpected Vector check', n.fixed);
-            Assert.assertTrue('Unexpected Vector check', n.length == 2);
-            Assert.assertEquals('Unexpected Vector check', '12,24', n.toString());
+            assertFalse( n.fixed,'Unexpected Vector check');
+            assertTrue( n.length == 2,'Unexpected Vector check');
+            assertEquals( n.toString(),'12,24','Unexpected Vector check');
             
             n = new c(20);
-            Assert.assertFalse('Unexpected Vector check', n.fixed);
-            Assert.assertTrue('Unexpected Vector check', n.length == 20);
-            Assert.assertEquals('Unexpected Vector check', '0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0', n.toString());
+            assertFalse( n.fixed,'Unexpected Vector check');
+            assertTrue( n.length == 20,'Unexpected Vector check');
+            assertEquals( n.toString(),'0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0','Unexpected Vector check');
             
             n = new c(20, true);
-            Assert.assertTrue('Unexpected Vector check', n.fixed);
-            Assert.assertTrue('Unexpected Vector check', n.length == 20);
-            Assert.assertEquals('Unexpected Vector check', '0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0', n.toString());
+            assertTrue( n.fixed,'Unexpected Vector check');
+            assertTrue( n.length == 20,'Unexpected Vector check');
+            assertEquals( n.toString(),'0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0','Unexpected Vector check');
             
             var source:Array = [1, '', false, NaN, {test: true}, undefined];
             
             //coercion
             vi = Vector.<int>(source);
-            Assert.assertFalse('Unexpected Vector check', vi.fixed);
-            Assert.assertTrue('Unexpected Vector check', vi.length == 6);
-            Assert.assertEquals('Unexpected Vector check', '1,0,0,0,0,0', vi.toString());
+            assertFalse( vi.fixed,'Unexpected Vector check');
+            assertTrue( vi.length == 6,'Unexpected Vector check');
+            assertEquals( vi.toString(),'1,0,0,0,0,0','Unexpected Vector check');
             
             var vb:Vector.<Boolean> = Vector.<Boolean>(source);
-            Assert.assertFalse('Unexpected Vector check', vb.fixed);
-            Assert.assertTrue('Unexpected Vector check', vb.length == 6);
-            Assert.assertEquals('Unexpected Vector check', 'true,false,false,false,true,false', vb.toString());
+            assertFalse( vb.fixed,'Unexpected Vector check');
+            assertTrue( vb.length == 6,'Unexpected Vector check');
+            assertEquals( vb.toString(),'true,false,false,false,true,false','Unexpected Vector check');
             
             n = vb;
-            Assert.assertFalse('Unexpected Vector check', n is Vector);
-            Assert.assertFalse('Unexpected Vector check', n is Array);
-            Assert.assertTrue('Unexpected Vector check', n is Vector.<Boolean>);
+            assertFalse( n is Vector,'Unexpected Vector check');
+            assertFalse( n is Array,'Unexpected Vector check');
+            assertTrue( n is Vector.<Boolean>,'Unexpected Vector check');
             
             var vs:Vector.<String> = Vector.<String>(source);
             
-            Assert.assertFalse('Unexpected Vector check', vs.fixed);
-            Assert.assertTrue('Unexpected Vector check', vs.length == 6);
-            Assert.assertEquals('Unexpected Vector check', '1,,false,NaN,[object Object],null', vs.toString());
+            assertFalse( vs.fixed,'Unexpected Vector check');
+            assertTrue( vs.length == 6,'Unexpected Vector check');
+            assertEquals( vs.toString(),'1,,false,NaN,[object Object],null','Unexpected Vector check');
             
             var vstar:Vector.<*> = Vector.<*>(source);
             
-            Assert.assertFalse('Unexpected Vector check', vstar.fixed);
-            Assert.assertTrue('Unexpected Vector check', vstar.length == 6);
-            Assert.assertEquals('Unexpected Vector check', '1,,false,NaN,[object Object],null', vstar.toString());
+            assertFalse( vstar.fixed,'Unexpected Vector check');
+            assertTrue( vstar.length == 6,'Unexpected Vector check');
+            assertEquals( vstar.toString(),'1,,false,NaN,[object Object],null','Unexpected Vector check');
             vstar.fixed = true;
-            Assert.assertTrue('Unexpected Vector check', vstar.fixed);
+            assertTrue( vstar.fixed,'Unexpected Vector check');
             
             var customClasses:Array = [null, new TestClass2(), undefined, new TestClass1()];
             
             var vcustom:Vector.<TestClass1> = Vector.<TestClass1>(customClasses);
             
-            Assert.assertFalse('Unexpected Vector check', vcustom.fixed);
-            Assert.assertTrue('Unexpected Vector check', vcustom.length == 4);
-            Assert.assertTrue('Unexpected Vector check', vcustom[0] === null);
-            Assert.assertTrue('Unexpected Vector check', vcustom[1] is TestClass2);
-            Assert.assertTrue('Unexpected Vector check', vcustom[2] === null);
-            Assert.assertTrue('Unexpected Vector check', vcustom[3] is TestClass1);
+            assertFalse( vcustom.fixed,'Unexpected Vector check');
+            assertTrue( vcustom.length == 4,'Unexpected Vector check');
+            assertTrue( vcustom[0] === null,'Unexpected Vector check');
+            assertTrue( vcustom[1] is TestClass2,'Unexpected Vector check');
+            assertTrue( vcustom[2] === null,'Unexpected Vector check');
+            assertTrue( vcustom[3] is TestClass1,'Unexpected Vector check');
             
             var nested:Vector.<Vector.<TestClass1>> = Vector.<Vector.<TestClass1>>([vcustom, null, undefined, vcustom]);
-            Assert.assertFalse('Unexpected Vector check', nested.fixed);
-            Assert.assertTrue('Unexpected Vector check', nested.length == 4);
-            Assert.assertTrue('Unexpected Vector check', nested[0] === vcustom);
-            Assert.assertTrue('Unexpected Vector check', nested[1] === null);
-            Assert.assertTrue('Unexpected Vector check', nested[2] === null);
-            Assert.assertTrue('Unexpected Vector check', nested[3] === vcustom);
+            assertFalse( nested.fixed,'Unexpected Vector check');
+            assertTrue( nested.length == 4,'Unexpected Vector check');
+            assertTrue( nested[0] === vcustom,'Unexpected Vector check');
+            assertTrue( nested[1] === null,'Unexpected Vector check');
+            assertTrue( nested[2] === null,'Unexpected Vector check');
+            assertTrue( nested[3] === vcustom,'Unexpected Vector check');
             
             //indirect/dynamic coercion
             c = Vector.<int>;
             var result:*;
             result = c(source);
-            Assert.assertFalse('Unexpected Vector check', result.fixed);
-            Assert.assertTrue('Unexpected Vector check', result.length == 6);
-            Assert.assertFalse('Unexpected Vector check', result is Vector);
-            Assert.assertFalse('Unexpected Vector check', result is Array);
-            Assert.assertFalse('Unexpected Vector check', result is Vector.<*>);
-            Assert.assertTrue('Unexpected Vector check', result is Vector.<int>);
-            Assert.assertEquals('Unexpected Vector check', '1,0,0,0,0,0', result.toString());
+            assertFalse( result.fixed,'Unexpected Vector check');
+            assertTrue( result.length == 6,'Unexpected Vector check');
+            assertFalse( result is Vector,'Unexpected Vector check');
+            assertFalse( result is Array,'Unexpected Vector check');
+            assertFalse( result is Vector.<*>,'Unexpected Vector check');
+            assertTrue( result is Vector.<int>,'Unexpected Vector check');
+            assertEquals( result.toString(),'1,0,0,0,0,0','Unexpected Vector check');
             
             c = Vector.<Boolean>;
             result = c(source);
-            Assert.assertFalse('Unexpected Vector check', result.fixed);
-            Assert.assertTrue('Unexpected Vector check', result.length == 6);
-            Assert.assertFalse('Unexpected Vector check', result is Vector);
-            Assert.assertFalse('Unexpected Vector check', result is Array);
-            Assert.assertTrue('Unexpected Vector check', result is Vector.<*>);
-            Assert.assertTrue('Unexpected Vector check', result is Vector.<Boolean>);
-            Assert.assertEquals('Unexpected Vector check', 'true,false,false,false,true,false', result.toString());
+            assertFalse( result.fixed,'Unexpected Vector check');
+            assertTrue( result.length == 6,'Unexpected Vector check');
+            assertFalse( result is Vector,'Unexpected Vector check');
+            assertFalse( result is Array,'Unexpected Vector check');
+            assertTrue( result is Vector.<*>,'Unexpected Vector check');
+            assertTrue( result is Vector.<Boolean>,'Unexpected Vector check');
+            assertEquals( result.toString(),'true,false,false,false,true,false','Unexpected Vector check');
             
             c = Vector.<String>;
             result = c(source);
             
-            Assert.assertFalse('Unexpected Vector check', result.fixed);
-            Assert.assertTrue('Unexpected Vector check', result.length == 6);
-            Assert.assertFalse('Unexpected Vector check', result is Vector);
-            Assert.assertFalse('Unexpected Vector check', result is Array);
-            Assert.assertTrue('Unexpected Vector check', result is Vector.<*>);
-            Assert.assertTrue('Unexpected Vector check', result is Vector.<String>);
-            Assert.assertEquals('Unexpected Vector check', '1,,false,NaN,[object Object],null', result.toString());
+            assertFalse( result.fixed,'Unexpected Vector check');
+            assertTrue( result.length == 6,'Unexpected Vector check');
+            assertFalse( result is Vector,'Unexpected Vector check');
+            assertFalse( result is Array,'Unexpected Vector check');
+            assertTrue( result is Vector.<*>,'Unexpected Vector check');
+            assertTrue( result is Vector.<String>,'Unexpected Vector check');
+            assertEquals( result.toString(),'1,,false,NaN,[object Object],null','Unexpected Vector check');
             
             c = Vector.<*>;
             result = c(source);
             
-            Assert.assertFalse('Unexpected Vector check', result.fixed);
-            Assert.assertTrue('Unexpected Vector check', result.length == 6);
-            Assert.assertFalse('Unexpected Vector check', result is Vector);
-            Assert.assertFalse('Unexpected Vector check', result is Array);
-            Assert.assertTrue('Unexpected Vector check', result is Vector.<*>);
-            Assert.assertFalse('Unexpected Vector check', result is Vector.<Object>);
-            Assert.assertEquals('Unexpected Vector check', '1,,false,NaN,[object Object],null', result.toString());
+            assertFalse( result.fixed,'Unexpected Vector check');
+            assertTrue( result.length == 6,'Unexpected Vector check');
+            assertFalse( result is Vector,'Unexpected Vector check');
+            assertFalse( result is Array,'Unexpected Vector check');
+            assertTrue( result is Vector.<*>,'Unexpected Vector check');
+            assertFalse( result is Vector.<Object>,'Unexpected Vector check');
+            assertEquals( result.toString(),'1,,false,NaN,[object Object],null','Unexpected Vector check');
         }
         
         [Test]
@@ -227,7 +227,7 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
             
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( caughtError,'Unexpected Vector check');
             try
             {
                 caughtError = false;
@@ -237,7 +237,7 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
             
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( caughtError,'Unexpected Vector check');
             try
             {
                 caughtError = false;
@@ -247,7 +247,7 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
             
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( caughtError,'Unexpected Vector check');
             try
             {
                 caughtError = false;
@@ -257,7 +257,7 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
             
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( caughtError,'Unexpected Vector check');
     
             if (hasInsertAtRemoveAt()) {
                 try
@@ -269,7 +269,7 @@ package flexUnitTests.language
                     caughtError = e is RangeError
                 }
                 
-                Assert.assertTrue('Unexpected Vector check', caughtError);
+                assertTrue( caughtError,'Unexpected Vector check');
             
                 try
                 {
@@ -280,7 +280,7 @@ package flexUnitTests.language
                     caughtError = e is RangeError
                 }
     
-                Assert.assertTrue('Unexpected Vector check', caughtError);
+                assertTrue( caughtError,'Unexpected Vector check');
             } else {
                 RoyaleUnitTestRunner.consoleOut('Variance: The current target does not have support for Vector insertAt/removeAt methods', 'warn')
             }
@@ -297,16 +297,16 @@ package flexUnitTests.language
             inst[2] = '';
             inst[3] = new String();
             inst[4] = something;
-            Assert.assertTrue('unexpected coercion result', inst[0] === null);
-            Assert.assertTrue('unexpected coercion result', inst[1] === null);
-            Assert.assertTrue('unexpected coercion result', inst[2] === '');
-            Assert.assertTrue('unexpected coercion result', inst[3] === '');
-            Assert.assertTrue('unexpected coercion result', inst[4] === null);
+            assertTrue( inst[0] === null,'unexpected coercion result');
+            assertTrue( inst[1] === null,'unexpected coercion result');
+            assertTrue( inst[2] === '','unexpected coercion result');
+            assertTrue( inst[3] === '','unexpected coercion result');
+            assertTrue( inst[4] === null,'unexpected coercion result');
         
             inst.push(undefined);
-            Assert.assertTrue('unexpected coercion result', inst.pop() === null);
+            assertTrue( inst.pop() === null,'unexpected coercion result');
             inst.push(something);
-            Assert.assertTrue('unexpected coercion result', inst.pop() === null);
+            assertTrue( inst.pop() === null,'unexpected coercion result');
         }
     
         [Test]
@@ -321,19 +321,19 @@ package flexUnitTests.language
             inst[3] = new String();
             inst[4] = nothing;
             inst[5] = something;
-            Assert.assertTrue('unexpected coercion result', inst[0] === false);
-            Assert.assertTrue('unexpected coercion result', inst[1] === false);
-            Assert.assertTrue('unexpected coercion result', inst[2] === false);
-            Assert.assertTrue('unexpected coercion result', inst[3] === false);
-            Assert.assertTrue('unexpected coercion result', inst[4] === false);
-            Assert.assertTrue('unexpected coercion result', inst[5] === true);
+            assertTrue( inst[0] === false,'unexpected coercion result');
+            assertTrue( inst[1] === false,'unexpected coercion result');
+            assertTrue( inst[2] === false,'unexpected coercion result');
+            assertTrue( inst[3] === false,'unexpected coercion result');
+            assertTrue( inst[4] === false,'unexpected coercion result');
+            assertTrue( inst[5] === true,'unexpected coercion result');
             
             inst.push(undefined);
-            Assert.assertTrue('unexpected coercion result', inst.pop() === false);
+            assertTrue( inst.pop() === false,'unexpected coercion result');
             inst.push(nothing);
-            Assert.assertTrue('unexpected coercion result', inst.pop() === false);
+            assertTrue( inst.pop() === false,'unexpected coercion result');
             inst.push(something);
-            Assert.assertTrue('unexpected coercion result', inst.pop() === true);
+            assertTrue( inst.pop() === true,'unexpected coercion result');
         }
         
         [Test]
@@ -350,20 +350,20 @@ package flexUnitTests.language
             inst[4] = something;
             inst[5] = uint;
             inst[6] = TestClass1;
-            Assert.assertTrue('unexpected coercion result', inst[0] === null);
-            Assert.assertTrue('unexpected coercion result', inst[1] === null);
-            Assert.assertTrue('unexpected coercion result', inst[2] === String);
-            Assert.assertTrue('unexpected coercion result', inst[3] === null);
-            Assert.assertTrue('unexpected coercion result', inst[4] === Array);
-            Assert.assertTrue('unexpected coercion result', inst[5] === uint);
-            Assert.assertTrue('unexpected coercion result', inst[6] === TestClass1);
-            
+            assertTrue( inst[0] === null, 'unexpected coercion result');
+            assertTrue(inst[1] === null, 'unexpected coercion result');
+            assertTrue(inst[2] === String, 'unexpected coercion result');
+            assertTrue(inst[3] === null, 'unexpected coercion result');
+            assertTrue(inst[4] === Array, 'unexpected coercion result');
+            assertTrue(inst[5] === uint, 'unexpected coercion result');
+            assertTrue(inst[6] === TestClass1, 'unexpected coercion result');
+        
             inst.push(undefined);
-            Assert.assertTrue('unexpected coercion result', inst.pop() === null);
+            assertTrue(inst.pop() === null, 'unexpected coercion result');
             inst.push(nothing);
-            Assert.assertTrue('unexpected coercion result', inst.pop() === null);
+            assertTrue(inst.pop() === null,'unexpected coercion result');
             inst.push(something);
-            Assert.assertTrue('unexpected coercion result', inst.pop() === Array);
+            assertTrue(inst.pop() === Array,'unexpected coercion result');
         }
         
     
@@ -387,9 +387,9 @@ package flexUnitTests.language
             }
             //even though it was an error, it has pushed null into the vector, so it
             //now has length of 1
-            Assert.assertTrue('Unexpected Vector check', tc1Vec.length == 1);
-            Assert.assertTrue('Unexpected Vector check', caughtError);
-            Assert.assertNull('Unexpected Vector check', tc1Vec[0]);
+            assertTrue( tc1Vec.length == 1,'Unexpected Vector check');
+            assertTrue( caughtError,'Unexpected Vector check');
+            assertNull( tc1Vec[0],'Unexpected Vector check');
     
             try
             {
@@ -406,13 +406,13 @@ package flexUnitTests.language
             }
             //even though it had an extra 2 error elements, it has pushed null into the vector, so it
             //now has length of 5
-            Assert.assertTrue('Unexpected Vector check', tc1Vec.length == 5);
-            Assert.assertTrue('Unexpected Vector check', caughtError);
-            Assert.assertNull('Unexpected Vector check', tc1Vec[0]);
-            Assert.assertTrue('Unexpected Vector check', tc1Vec[1] is TestClass1);
-            Assert.assertNull('Unexpected Vector check', tc1Vec[2]);
-            Assert.assertNull('Unexpected Vector check', tc1Vec[3]);
-            Assert.assertNull('Unexpected Vector check', tc1Vec[4]);
+            assertTrue( tc1Vec.length == 5,'Unexpected Vector check');
+            assertTrue( caughtError,'Unexpected Vector check');
+            assertNull( tc1Vec[0],'Unexpected Vector check');
+            assertTrue( tc1Vec[1] is TestClass1,'Unexpected Vector check');
+            assertNull( tc1Vec[2],'Unexpected Vector check');
+            assertNull( tc1Vec[3],'Unexpected Vector check');
+            assertNull( tc1Vec[4],'Unexpected Vector check');
             
             try
             {
@@ -427,17 +427,17 @@ package flexUnitTests.language
                 caughtError = e is TypeError;
             }
     
-            Assert.assertTrue('Unexpected Vector check', tc1Vec.length == 9);
-            Assert.assertTrue('Unexpected Vector check', caughtError);
-            Assert.assertTrue('Unexpected Vector check', tc1Vec[0] is TestClass1);
-            Assert.assertNull('Unexpected Vector check', tc1Vec[1]);
-            Assert.assertNull('Unexpected Vector check', tc1Vec[2]);
-            Assert.assertNull('Unexpected Vector check', tc1Vec[3]);
-            Assert.assertNull('Unexpected Vector check', tc1Vec[4]);
-            Assert.assertTrue('Unexpected Vector check', tc1Vec[5] is TestClass1);
-            Assert.assertNull('Unexpected Vector check', tc1Vec[6]);
-            Assert.assertNull('Unexpected Vector check', tc1Vec[7]);
-            Assert.assertNull('Unexpected Vector check', tc1Vec[8]);
+            assertTrue( tc1Vec.length == 9,'Unexpected Vector check');
+            assertTrue( caughtError,'Unexpected Vector check');
+            assertTrue( tc1Vec[0] is TestClass1,'Unexpected Vector check');
+            assertNull( tc1Vec[1],'Unexpected Vector check');
+            assertNull( tc1Vec[2],'Unexpected Vector check');
+            assertNull( tc1Vec[3],'Unexpected Vector check');
+            assertNull( tc1Vec[4],'Unexpected Vector check');
+            assertTrue( tc1Vec[5] is TestClass1,'Unexpected Vector check');
+            assertNull( tc1Vec[6],'Unexpected Vector check');
+            assertNull( tc1Vec[7],'Unexpected Vector check');
+            assertNull( tc1Vec[8],'Unexpected Vector check');
             
         }
         
@@ -451,38 +451,38 @@ package flexUnitTests.language
             var vcustom:Vector.<TestClass1> = Vector.<TestClass1>(customClasses);
             var vcustom2:Vector.<TestClass1> = vcustom.map(_mapper);
             
-            Assert.assertTrue('Unexpected Vector check', vcustom2 != vcustom);
-            Assert.assertTrue('Unexpected Vector check', vcustom2[0] is TestClass1);
-            Assert.assertTrue('Unexpected Vector check', vcustom2[1] is TestClass1);
-            Assert.assertTrue('Unexpected Vector check', vcustom2[2] is TestClass1);
-            Assert.assertTrue('Unexpected Vector check', vcustom2[3] is TestClass1);
+            assertTrue( vcustom2 != vcustom,'Unexpected Vector check');
+            assertTrue( vcustom2[0] is TestClass1,'Unexpected Vector check');
+            assertTrue( vcustom2[1] is TestClass1,'Unexpected Vector check');
+            assertTrue( vcustom2[2] is TestClass1,'Unexpected Vector check');
+            assertTrue( vcustom2[3] is TestClass1,'Unexpected Vector check');
             //remove 1 item at position 1 and replace it with a new TestClass2 instance
             var vcustom3:Vector.<TestClass1> = vcustom2.splice(1, 1, new TestClass2());
-            Assert.assertTrue('Unexpected Vector check', vcustom3 != vcustom2);
-            Assert.assertTrue('Unexpected Vector check', vcustom3.length == 1);
-            Assert.assertTrue('Unexpected Vector check', vcustom2.length == 4);
-            Assert.assertTrue('Unexpected Vector check', vcustom3[0] is TestClass1);
-            Assert.assertTrue('Unexpected Vector check', vcustom2[1] is TestClass2);
+            assertTrue( vcustom3 != vcustom2,'Unexpected Vector check');
+            assertTrue( vcustom3.length == 1,'Unexpected Vector check');
+            assertTrue( vcustom2.length == 4,'Unexpected Vector check');
+            assertTrue( vcustom3[0] is TestClass1,'Unexpected Vector check');
+            assertTrue( vcustom2[1] is TestClass2,'Unexpected Vector check');
             
             
             if (hasInsertAtRemoveAt()) {
                 vcustom3['insertAt'](0, new TestClass2());
-                Assert.assertTrue('Unexpected Vector check', vcustom3.length == 2);
-                Assert.assertTrue('Unexpected Vector check', vcustom3[0] is TestClass2);
-                Assert.assertTrue('Unexpected Vector check', vcustom3[1] is TestClass1);
+                assertTrue( vcustom3.length == 2,'Unexpected Vector check');
+                assertTrue( vcustom3[0] is TestClass2,'Unexpected Vector check');
+                assertTrue( vcustom3[1] is TestClass1,'Unexpected Vector check');
     
                 var removedItem:* = vcustom3['removeAt'](0);
-                Assert.assertTrue('Unexpected Vector check', vcustom3.length == 1);
-                Assert.assertTrue('Unexpected Vector check', vcustom3[0] is TestClass1);
-                Assert.assertTrue('Unexpected Vector check', removedItem is TestClass2);
+                assertTrue( vcustom3.length == 1,'Unexpected Vector check');
+                assertTrue( vcustom3[0] is TestClass1,'Unexpected Vector check');
+                assertTrue( removedItem is TestClass2,'Unexpected Vector check');
     
                 var tc1Vec:Vector.<TestClass1> = new Vector.<TestClass1>(4);
     
                 //insert at invalid index:
                 tc1Vec['insertAt'](6, new TestClass1());
                 //no error, insertAt minimises the specified index to the Vector's length and inserts there
-                Assert.assertTrue('Unexpected Vector check', tc1Vec.length == 5);
-                Assert.assertTrue('Unexpected Vector check', tc1Vec[4] is TestClass1);
+                assertTrue( tc1Vec.length == 5,'Unexpected Vector check');
+                assertTrue( tc1Vec[4] is TestClass1,'Unexpected Vector check');
     
                 var caughtError:Boolean;
                 try
@@ -502,10 +502,10 @@ package flexUnitTests.language
                 {
                     caughtError = e is RangeError
                 }
-                Assert.assertTrue('Unexpected Vector check', tc1Vec.length == 4);
-                Assert.assertEquals('Unexpected Vector check', 'null,null,null,null', tc1Vec.toString());
+                assertTrue( tc1Vec.length == 4,'Unexpected Vector check');
+                assertEquals( tc1Vec.toString(),'null,null,null,null','Unexpected Vector check');
                 //no error
-                Assert.assertFalse('Unexpected Vector check', caughtError);
+                assertFalse( caughtError,'Unexpected Vector check');
     
                 try
                 {
@@ -516,13 +516,13 @@ package flexUnitTests.language
                     caughtError = e is RangeError
                 }
     
-                Assert.assertTrue('Unexpected Vector check', tc1Vec.length == 5);
+                assertTrue( tc1Vec.length == 5,'Unexpected Vector check');
                 //new item is at position 3
-                Assert.assertNotNull('Unexpected Vector check', tc1Vec[3]);
+                assertNotNull( tc1Vec[3],'Unexpected Vector check');
                 //moving the original content (null) from position 3 to 4
-                Assert.assertNull('Unexpected Vector check', tc1Vec[4]);
+                assertNull( tc1Vec[4],'Unexpected Vector check');
                 //no error
-                Assert.assertFalse('Unexpected Vector check', caughtError);
+                assertFalse( caughtError,'Unexpected Vector check');
     
                 try
                 {
@@ -534,13 +534,13 @@ package flexUnitTests.language
                     caughtError = e is RangeError
                 }
     
-                Assert.assertTrue('Unexpected Vector check', tc1Vec.length == 6);
+                assertTrue( tc1Vec.length == 6,'Unexpected Vector check');
                 //new item is at position 0
-                Assert.assertNotNull('Unexpected Vector check', tc1Vec[0]);
+                assertNotNull( tc1Vec[0],'Unexpected Vector check');
                 //the other non-null item is now at postion 4
-                Assert.assertNotNull('Unexpected Vector check', tc1Vec[4]);
+                assertNotNull( tc1Vec[4],'Unexpected Vector check');
                 //no error
-                Assert.assertFalse('Unexpected Vector check', caughtError);
+                assertFalse( caughtError,'Unexpected Vector check');
     
                 try
                 {
@@ -551,13 +551,13 @@ package flexUnitTests.language
                     caughtError = e is RangeError;
                 }
     
-                Assert.assertTrue('Unexpected Vector check', tc1Vec.length == 5);
+                assertTrue( tc1Vec.length == 5,'Unexpected Vector check');
                 //position 0 is now null
-                Assert.assertNull('Unexpected Vector check', tc1Vec[0]);
+                assertNull( tc1Vec[0],'Unexpected Vector check');
                 //the non-null item is now at postion 3
-                Assert.assertNotNull('Unexpected Vector check', tc1Vec[3]);
+                assertNotNull( tc1Vec[3],'Unexpected Vector check');
                 //no error
-                Assert.assertFalse('Unexpected Vector check', caughtError);
+                assertFalse( caughtError,'Unexpected Vector check');
                 
             }  else {
                 RoyaleUnitTestRunner.consoleOut('Variance: The current target does not have support for Vector insertAt/removeAt methods, so these are untested', 'warn')
@@ -570,7 +570,7 @@ package flexUnitTests.language
         public function testSort():void{
             var vi:Vector.<int> = new <int>[1, 2, 3, 4, 5];
             vi.sort(Array.NUMERIC|Array.DESCENDING);
-            Assert.assertEquals('Unexpected Vector check', '5,4,3,2,1', vi.toString());
+            assertEquals( vi.toString(),'5,4,3,2,1','Unexpected Vector check');
         }
         
         [Test]
@@ -581,8 +581,8 @@ package flexUnitTests.language
             var vi2:Vector.<int> = new <int>[5, 4, 3, 2, 1];
             var vu2:Vector.<uint> = new <uint>[5, 4, 3, 2, 1];
             var vi3:Vector.<int> = vi1.concat(vi2);
-            Assert.assertEquals('Unexpected Vector check', '1,2,3,4,5,5,4,3,2,1', vi3.toString());
-            Assert.assertTrue('Unexpected Vector check', vi3 is Vector.<int>);
+            assertEquals( vi3.toString(),'1,2,3,4,5,5,4,3,2,1','Unexpected Vector check');
+            assertTrue( vi3 is Vector.<int>,'Unexpected Vector check');
             
             var caughtError:Boolean;
             try
@@ -593,12 +593,12 @@ package flexUnitTests.language
             {
                 caughtError = e is TypeError
             }
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( caughtError,'Unexpected Vector check');
             
             var vs:Vector.<String> = Vector.<String>(source);
             var testConcat:Vector.<String> = vs.concat(vs);
-            Assert.assertEquals('Unexpected Vector check', '1,,false,NaN,[object Object],null,1,,false,NaN,[object Object],null', testConcat.toString());
-            Assert.assertTrue('Unexpected Vector check', testConcat is Vector.<String>);
+            assertEquals( testConcat.toString(),'1,,false,NaN,[object Object],null,1,,false,NaN,[object Object],null','Unexpected Vector check');
+            assertTrue( testConcat is Vector.<String>,'Unexpected Vector check');
             
         }
     
@@ -609,24 +609,24 @@ package flexUnitTests.language
             var source:Array = [1, '', false, NaN, {test: true}, undefined];
             var vi1:Vector.<int> = new <int>[1, 2, 3, 4, 5];
             var vi2:Vector.<int> = vi1.slice();
-            Assert.assertEquals('Unexpected Vector check', '1,2,3,4,5', vi2.toString());
-            Assert.assertTrue('Unexpected Vector check', vi2 is Vector.<int>);
+            assertEquals( vi2.toString(),'1,2,3,4,5','Unexpected Vector check');
+            assertTrue( vi2 is Vector.<int>,'Unexpected Vector check');
             vi2 = vi1.slice(1);
-            Assert.assertEquals('Unexpected Vector check', '2,3,4,5', vi2.toString());
-            Assert.assertTrue('Unexpected Vector check', vi2 is Vector.<int>);
+            assertEquals( vi2.toString(),'2,3,4,5','Unexpected Vector check');
+            assertTrue( vi2 is Vector.<int>,'Unexpected Vector check');
     
             vi2 = vi1.slice(0,0);
-            Assert.assertEquals('Unexpected Vector check', '', vi2.toString());
-            Assert.assertTrue('Unexpected Vector check', vi2 is Vector.<int>);
+            assertEquals( vi2.toString(),'','Unexpected Vector check');
+            assertTrue( vi2 is Vector.<int>,'Unexpected Vector check');
     
             vi2 = vi1.slice(1,-1);
-            Assert.assertEquals('Unexpected Vector check', '2,3,4', vi2.toString());
-            Assert.assertTrue('Unexpected Vector check', vi2 is Vector.<int>);
+            assertEquals( vi2.toString(),'2,3,4','Unexpected Vector check');
+            assertTrue( vi2 is Vector.<int>,'Unexpected Vector check');
         
             var vs:Vector.<String> = Vector.<String>(source);
             var testSlice:Vector.<String> = vs.slice();
-            Assert.assertEquals('Unexpected Vector check', '1,,false,NaN,[object Object],null', testSlice.toString());
-            Assert.assertTrue('Unexpected Vector check', testSlice is Vector.<String>);
+            assertEquals( testSlice.toString(),'1,,false,NaN,[object Object],null','Unexpected Vector check');
+            assertTrue( testSlice is Vector.<String>,'Unexpected Vector check');
         
         }
         
@@ -643,9 +643,9 @@ package flexUnitTests.language
             };
             
             var vi2:Vector.<int> = vi1.filter(f);
-            Assert.assertEquals('Unexpected Vector check', '3,4,5,4,3', vi2.toString());
-            Assert.assertFalse('Unexpected Vector check', vi2 is Array);
-            Assert.assertTrue('Unexpected Vector check', vi2 is Vector.<int>);
+            assertEquals( vi2.toString(),'3,4,5,4,3','Unexpected Vector check');
+            assertFalse( vi2 is Array,'Unexpected Vector check');
+            assertTrue( vi2 is Vector.<int>,'Unexpected Vector check');
         }
         
         [Test]
@@ -654,50 +654,50 @@ package flexUnitTests.language
             var source:Array = [1, '', false, NaN, {test: true}, undefined];
             
             var vi:Vector.<int> = Vector.<int>(source);
-            Assert.assertFalse('Unexpected Vector check', vi is Vector);
-            Assert.assertFalse('Unexpected Vector check', vi is Array);
-            Assert.assertTrue('Unexpected Vector check', vi is Vector.<int>);
-            Assert.assertFalse('Unexpected Vector check', vi is Vector.<*>);
+            assertFalse( vi is Vector,'Unexpected Vector check');
+            assertFalse( vi is Array,'Unexpected Vector check');
+            assertTrue( vi is Vector.<int>,'Unexpected Vector check');
+            assertFalse( vi is Vector.<*>,'Unexpected Vector check');
             
             var vu:Vector.<uint> = Vector.<uint>(source);
-            Assert.assertFalse('Unexpected Vector check', vu is Vector);
-            Assert.assertFalse('Unexpected Vector check', vu is Array);
-            Assert.assertTrue('Unexpected Vector check', vu is Vector.<uint>);
-            Assert.assertFalse('Unexpected Vector check', vu is Vector.<*>);
+            assertFalse( vu is Vector,'Unexpected Vector check');
+            assertFalse( vu is Array,'Unexpected Vector check');
+            assertTrue( vu is Vector.<uint>,'Unexpected Vector check');
+            assertFalse( vu is Vector.<*>,'Unexpected Vector check');
             
             var vn:Vector.<Number> = Vector.<Number>(source);
-            Assert.assertFalse('Unexpected Vector check', vn is Vector);
-            Assert.assertFalse('Unexpected Vector check', vn is Array);
-            Assert.assertTrue('Unexpected Vector check', vn is Vector.<Number>);
-            Assert.assertFalse('Unexpected Vector check', vn is Vector.<*>);
+            assertFalse( vn is Vector,'Unexpected Vector check');
+            assertFalse( vn is Array,'Unexpected Vector check');
+            assertTrue( vn is Vector.<Number>,'Unexpected Vector check');
+            assertFalse( vn is Vector.<*>,'Unexpected Vector check');
             
             var vb:Vector.<Boolean> = Vector.<Boolean>(source);
-            Assert.assertFalse('Unexpected Vector check', vb is Vector);
-            Assert.assertFalse('Unexpected Vector check', vb is Array);
-            Assert.assertTrue('Unexpected Vector check', vb is Vector.<Boolean>);
-            Assert.assertTrue('Unexpected Vector check', vb is Vector.<*>);
+            assertFalse( vb is Vector,'Unexpected Vector check');
+            assertFalse( vb is Array,'Unexpected Vector check');
+            assertTrue( vb is Vector.<Boolean>,'Unexpected Vector check');
+            assertTrue( vb is Vector.<*>,'Unexpected Vector check');
             
             var vs:Vector.<String> = Vector.<String>(source);
-            Assert.assertFalse('Unexpected Vector check', vs is Vector);
-            Assert.assertFalse('Unexpected Vector check', vs is Array);
-            Assert.assertTrue('Unexpected Vector check', vs is Vector.<String>);
-            Assert.assertTrue('Unexpected Vector check', vs is Vector.<*>);
+            assertFalse( vs is Vector,'Unexpected Vector check');
+            assertFalse( vs is Array,'Unexpected Vector check');
+            assertTrue( vs is Vector.<String>,'Unexpected Vector check');
+            assertTrue( vs is Vector.<*>,'Unexpected Vector check');
             
             var vstar:Vector.<*> = Vector.<*>(source);
-            Assert.assertFalse('Unexpected Vector check', vstar is Vector);
-            Assert.assertFalse('Unexpected Vector check', vstar is Array);
-            Assert.assertTrue('Unexpected Vector check', vstar is Vector.<*>);
-            Assert.assertTrue('Unexpected Vector check', vstar is Vector.<*>);
+            assertFalse( vstar is Vector,'Unexpected Vector check');
+            assertFalse( vstar is Array,'Unexpected Vector check');
+            assertTrue( vstar is Vector.<*>,'Unexpected Vector check');
+            assertTrue( vstar is Vector.<*>,'Unexpected Vector check');
             
             
             var customClasses:Array = [null, new TestClass2(), undefined, new TestClass1()];
             
             var vcustom:Vector.<TestClass1> = Vector.<TestClass1>(customClasses);
             
-            Assert.assertFalse('Unexpected Vector check', vcustom is Vector);
-            Assert.assertFalse('Unexpected Vector check', vcustom is Array);
-            Assert.assertTrue('Unexpected Vector check', vcustom is Vector.<TestClass1>);
-            Assert.assertTrue('Unexpected Vector check', vcustom is Vector.<*>);
+            assertFalse( vcustom is Vector,'Unexpected Vector check');
+            assertFalse( vcustom is Array,'Unexpected Vector check');
+            assertTrue( vcustom is Vector.<TestClass1>,'Unexpected Vector check');
+            assertTrue( vcustom is Vector.<*>,'Unexpected Vector check');
     
             customClasses.push(new TestClass5());
             var oldDef:Vector.<TestClass1> = vcustom;
@@ -712,8 +712,8 @@ package flexUnitTests.language
                 caughtError = e is TypeError;
             }
     
-            Assert.assertTrue('Unexpected Vector check', caughtError);
-            Assert.assertEquals('Unexpected Vector check', oldDef,vcustom);
+            assertTrue( caughtError,'Unexpected Vector check');
+            assertEquals( oldDef,vcustom,'Unexpected Vector check');
         }
         
         [Test]
@@ -725,58 +725,58 @@ package flexUnitTests.language
             var source:Array = [1, '', false, NaN, {test: true}, undefined];
             
             var vi:Vector.<int> = Vector.<int>(source);
-            Assert.assertFalse('Unexpected Vector check', vi is Vector);
-            Assert.assertFalse('Unexpected Vector check', vi is Array);
-            Assert.assertTrue('Unexpected Vector check', vi is Vector.<int>);
-            Assert.assertFalse('Unexpected Vector check', vi is Vector.<*>);
+            assertFalse( vi is Vector,'Unexpected Vector check');
+            assertFalse( vi is Array,'Unexpected Vector check');
+            assertTrue( vi is Vector.<int>,'Unexpected Vector check');
+            assertFalse( vi is Vector.<*>,'Unexpected Vector check');
             
             var vu:Vector.<uint> = Vector.<uint>(source);
-            Assert.assertFalse('Unexpected Vector check', vu is Vector);
-            Assert.assertFalse('Unexpected Vector check', vu is Array);
-            Assert.assertTrue('Unexpected Vector check', vu is Vector.<uint>);
-            Assert.assertFalse('Unexpected Vector check', vu is Vector.<*>);
+            assertFalse( vu is Vector,'Unexpected Vector check');
+            assertFalse( vu is Array,'Unexpected Vector check');
+            assertTrue( vu is Vector.<uint>,'Unexpected Vector check');
+            assertFalse( vu is Vector.<*>,'Unexpected Vector check');
             
             var vn:Vector.<Number> = Vector.<Number>(source);
-            Assert.assertFalse('Unexpected Vector check', vn is Vector);
-            Assert.assertFalse('Unexpected Vector check', vn is Array);
-            Assert.assertTrue('Unexpected Vector check', vn is Vector.<Number>);
-            Assert.assertFalse('Unexpected Vector check', vn is Vector.<*>);
+            assertFalse( vn is Vector,'Unexpected Vector check');
+            assertFalse( vn is Array,'Unexpected Vector check');
+            assertTrue( vn is Vector.<Number>,'Unexpected Vector check');
+            assertFalse( vn is Vector.<*>,'Unexpected Vector check');
             
             var vb:Vector.<Boolean> = Vector.<Boolean>(source);
-            Assert.assertFalse('Unexpected Vector check', vb is Vector);
-            Assert.assertFalse('Unexpected Vector check', vb is Array);
-            Assert.assertTrue('Unexpected Vector check', vb is Vector.<Boolean>);
-            Assert.assertTrue('Unexpected Vector check', vb is Vector.<*>);
+            assertFalse( vb is Vector,'Unexpected Vector check');
+            assertFalse( vb is Array,'Unexpected Vector check');
+            assertTrue( vb is Vector.<Boolean>,'Unexpected Vector check');
+            assertTrue( vb is Vector.<*>,'Unexpected Vector check');
             
             var vs:Vector.<String> = Vector.<String>(source);
-            Assert.assertFalse('Unexpected Vector check', vs is Vector);
-            Assert.assertFalse('Unexpected Vector check', vs is Array);
-            Assert.assertTrue('Unexpected Vector check', vs is Vector.<String>);
-            Assert.assertTrue('Unexpected Vector check', vs is Vector.<*>);
+            assertFalse( vs is Vector,'Unexpected Vector check');
+            assertFalse( vs is Array,'Unexpected Vector check');
+            assertTrue( vs is Vector.<String>,'Unexpected Vector check');
+            assertTrue( vs is Vector.<*>,'Unexpected Vector check');
             
             var vstar:Vector.<*> = Vector.<*>(source);
-            Assert.assertFalse('Unexpected Vector check', vstar is Vector);
-            Assert.assertFalse('Unexpected Vector check', vstar is Array);
-            Assert.assertTrue('Unexpected Vector check', vstar is Vector.<*>);
-            Assert.assertTrue('Unexpected Vector check', vstar is Vector.<*>);
+            assertFalse( vstar is Vector,'Unexpected Vector check');
+            assertFalse( vstar is Array,'Unexpected Vector check');
+            assertTrue( vstar is Vector.<*>,'Unexpected Vector check');
+            assertTrue( vstar is Vector.<*>,'Unexpected Vector check');
             
             
             var customClasses:Array = [null, new TestClass2(), undefined, new TestClass1()];
             
             var vcustom:Vector.<TestClass1> = Vector.<TestClass1>(customClasses);
             
-            Assert.assertFalse('Unexpected Vector check', vcustom is Vector);
-            Assert.assertFalse('Unexpected Vector check', vcustom is Array);
-            Assert.assertTrue('Unexpected Vector check', vcustom is Vector.<TestClass1>);
-            Assert.assertTrue('Unexpected Vector check', vcustom is Vector.<*>);
+            assertFalse( vcustom is Vector,'Unexpected Vector check');
+            assertFalse( vcustom is Array,'Unexpected Vector check');
+            assertTrue( vcustom is Vector.<TestClass1>,'Unexpected Vector check');
+            assertTrue( vcustom is Vector.<*>,'Unexpected Vector check');
     
             var claZZ:Class = Vector.<TestClass1>;
             vcustom = claZZ(customClasses);
     
-            Assert.assertFalse('Unexpected Vector check', vcustom is Vector);
-            Assert.assertFalse('Unexpected Vector check', vcustom is Array);
-            Assert.assertTrue('Unexpected Vector check', vcustom is Vector.<TestClass1>);
-            Assert.assertTrue('Unexpected Vector check', vcustom is Vector.<*>);
+            assertFalse( vcustom is Vector,'Unexpected Vector check');
+            assertFalse( vcustom is Array,'Unexpected Vector check');
+            assertTrue( vcustom is Vector.<TestClass1>,'Unexpected Vector check');
+            assertTrue( vcustom is Vector.<*>,'Unexpected Vector check');
         }
         
         [Test]
@@ -785,9 +785,9 @@ package flexUnitTests.language
             var test:* = 'hello';
             var vi:Vector.<int> = new <int>[1, 2, test, 4, 5];
             
-            Assert.assertFalse('Unexpected Vector check', vi.fixed);
-            Assert.assertTrue('Unexpected Vector check', vi.length == 5);
-            Assert.assertEquals('Unexpected Vector check', '1,2,0,4,5', vi.toString());
+            assertFalse( vi.fixed,'Unexpected Vector check');
+            assertTrue( vi.length == 5,'Unexpected Vector check');
+            assertEquals( vi.toString(),'1,2,0,4,5','Unexpected Vector check');
         }
         
         [Test]
@@ -795,9 +795,9 @@ package flexUnitTests.language
         {
             var vi:Vector.<int> = new <int>[1, 2, 3, 4, 5];
             vi.length = 10;
-            Assert.assertFalse('Unexpected Vector check', vi.fixed);
-            Assert.assertTrue('Unexpected Vector check', vi.length == 10);
-            Assert.assertEquals('Unexpected Vector check', '1,2,3,4,5,0,0,0,0,0', vi.toString());
+            assertFalse( vi.fixed,'Unexpected Vector check');
+            assertTrue( vi.length == 10,'Unexpected Vector check');
+            assertEquals( vi.toString(),'1,2,3,4,5,0,0,0,0,0','Unexpected Vector check');
         }
         
         [TestVariance(variance="JS", description="Variance in js implementation for access to 'constructor' via Vector instance, js is specific vs. Vector.<*> in swf.")]
@@ -805,30 +805,41 @@ package flexUnitTests.language
         public function testVectorConstructor():void
         {
             var vi:Vector.<int> = new <int>[1, 2, 3, 4, 5];
-            Assert.assertTrue('Unexpected Vector check', vi['constructor'] === Vector.<int>);
+            assertTrue( vi['constructor'] === Vector.<int>,'Unexpected Vector check');
             
             var vui:Vector.<uint> = new <uint>[1, 2, 3, 4, 5];
-            Assert.assertTrue('Unexpected Vector check', vui['constructor'] === Vector.<uint>);
+            assertTrue( vui['constructor'] === Vector.<uint>,'Unexpected Vector check');
             
             var vn:Vector.<Number> = new <Number>[1, 2, 3, 4, 5];
-            Assert.assertTrue('Unexpected Vector check', vn['constructor'] === Vector.<Number>);
+            assertTrue( vn['constructor'] === Vector.<Number>,'Unexpected Vector check');
             
             var vs:Vector.<String> = new <String>[];
             //current variance in the javascript vs. avm implementations
             const expected:Class = isJS ? Vector.<String> : Vector.<*>;
-            Assert.assertTrue('Unexpected Vector check', vs['constructor'] === expected);
+            assertTrue( vs['constructor'] === expected,'Unexpected Vector check');
         }
         
         [Test]
+        [TestVariance(variance="SWF",description="SWF tests for removeAt are not run when swf version<30")]
         public function testVectorRemoveAtType():void{
-            var customClasses:Array = [null, new TestClass2(), undefined, new TestClass1()];
+            if (hasInsertAtRemoveAt()) {
+                var customClasses:Array = [null, new TestClass2(), undefined, new TestClass1()];
     
-            var vcustom:Vector.<TestClass1> = Vector.<TestClass1>(customClasses);
-            
-            var tc1:TestClass1 = vcustom.removeAt(1);
-            Assert.assertTrue('Unexpected Vector check', tc1 != null);
-            Assert.assertTrue('Unexpected Vector check', tc1 is TestClass1);
-            Assert.assertTrue('Unexpected Vector check', tc1 is TestClass2);
+                var vcustom:Vector.<TestClass1> = Vector.<TestClass1>(customClasses);
+    
+                COMPILE::SWF{
+                    var tc1:TestClass1 = vcustom['removeAt'](1);
+                }
+                COMPILE::JS{
+                    var tc1:TestClass1 = vcustom.removeAt(1);
+                }
+                assertTrue(tc1 != null, 'Unexpected Vector check');
+                assertTrue(tc1 is TestClass1, 'Unexpected Vector check');
+                assertTrue(tc1 is TestClass2, 'Unexpected Vector check');
+            } else {
+                assertTrue(true);
+            }
+           
         }
         
         private var _viTest:Vector.<int>;
@@ -855,7 +866,7 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
             
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( caughtError,'Unexpected Vector check');
             
             try
             {
@@ -866,7 +877,7 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
             
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( caughtError,'Unexpected Vector check');
             
             try
             {
@@ -877,7 +888,7 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
             
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( caughtError,'Unexpected Vector check');
             
             try
             {
@@ -888,7 +899,7 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
             
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( caughtError,'Unexpected Vector check');
             
             try
             {
@@ -899,7 +910,7 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
             
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( caughtError,'Unexpected Vector check');
             
             try
             {
@@ -910,7 +921,7 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
             
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( caughtError,'Unexpected Vector check');
             
             try
             {
@@ -921,7 +932,7 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
             
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( caughtError,'Unexpected Vector check');
             
             try
             {
@@ -932,7 +943,7 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
             
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( caughtError,'Unexpected Vector check');
             
             try
             {
@@ -943,7 +954,7 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
             
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( caughtError,'Unexpected Vector check');
             
             try
             {
@@ -954,7 +965,7 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
             
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( caughtError,'Unexpected Vector check');
             
             try
             {
@@ -965,7 +976,7 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
             
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( caughtError,'Unexpected Vector check');
             
             try
             {
@@ -976,7 +987,7 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
             
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( caughtError,'Unexpected Vector check');
             
             try
             {
@@ -987,7 +998,7 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
             
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( caughtError,'Unexpected Vector check');
             
             try
             {
@@ -998,7 +1009,7 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
             
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( caughtError,'Unexpected Vector check');
             
             try
             {
@@ -1009,7 +1020,7 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
             
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( caughtError,'Unexpected Vector check');
             
             try
             {
@@ -1020,7 +1031,7 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
             
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( caughtError,'Unexpected Vector check');
             
             try
             {
@@ -1031,7 +1042,7 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
             
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( caughtError,'Unexpected Vector check');
             
             try
             {
@@ -1042,7 +1053,7 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
             
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( caughtError,'Unexpected Vector check');
             
             try
             {
@@ -1053,7 +1064,7 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
             
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( caughtError,'Unexpected Vector check');
             
             try
             {
@@ -1064,7 +1075,7 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
             
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( caughtError,'Unexpected Vector check');
             
             try
             {
@@ -1075,7 +1086,7 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
             
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( caughtError,'Unexpected Vector check');
         }
         
         [Test]
@@ -1088,8 +1099,8 @@ package flexUnitTests.language
             var vi:Vector.<int> = new <int>[1, 2, 3, 4, 5];
             //allowed, not an error:
             vi[5] = 6;
-            Assert.assertTrue('Unexpected Vector check', vi.length == 6);
-            Assert.assertEquals('Unexpected Vector check', '1,2,3,4,5,6', vi.toString());
+            assertTrue( vi.length == 6,'Unexpected Vector check');
+            assertEquals( vi.toString(),'1,2,3,4,5,6', 'Unexpected Vector check');
             var caughtError:Boolean;
             try
             {
@@ -1103,8 +1114,8 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
             
-            Assert.assertTrue('Unexpected Vector check', vi.length == 6);
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( vi.length == 6,'Unexpected Vector check');
+            assertTrue( caughtError,'Unexpected Vector check');
             
             try
             {
@@ -1118,8 +1129,8 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
             
-            Assert.assertTrue('Unexpected Vector check', vi.length == 6);
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( vi.length == 6,'Unexpected Vector check');
+            assertTrue( caughtError,'Unexpected Vector check');
     
             try
             {
@@ -1132,8 +1143,8 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
     
-            Assert.assertTrue('Unexpected Vector check', vi.length == 6);
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( vi.length == 6,'Unexpected Vector check');
+            assertTrue( caughtError,'Unexpected Vector check');
             
             try
             {
@@ -1145,7 +1156,7 @@ package flexUnitTests.language
             {
                 caughtError = e is RangeError
             }
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( caughtError,'Unexpected Vector check');
         }
     
     
@@ -1162,8 +1173,8 @@ package flexUnitTests.language
             var vi:Vector.<int> = new <int>[1, 2, 3, 4, 5];
             //allowed, not an error:
             vi[5] = 6;
-            Assert.assertTrue('Unexpected Vector check', vi.length == 6);
-            Assert.assertEquals('Unexpected Vector check', '1,2,3,4,5,6', vi.toString());
+            assertTrue( vi.length == 6,'Unexpected Vector check');
+            assertEquals( vi.toString(), '1,2,3,4,5,6','Unexpected Vector check');
             var caughtError:Boolean;
             try
             {
@@ -1177,8 +1188,8 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
             
-            Assert.assertTrue('Unexpected Vector check', vi.length == (isJS? 8 : 6));
-            Assert.assertTrue('Unexpected Vector check', caughtError === (isJS ? false : true));
+            assertTrue( vi.length == (isJS? 8 : 6),'Unexpected Vector check');
+            assertTrue( caughtError === (isJS ? false : true),'Unexpected Vector check');
     
             try
             {
@@ -1192,8 +1203,8 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
     
-            Assert.assertTrue('Unexpected Vector check', vi.length == (isJS? 8 : 6));
-            Assert.assertTrue('Unexpected Vector check', caughtError === (isJS ? false : true));
+            assertTrue( vi.length == (isJS? 8 : 6),'Unexpected Vector check');
+            assertTrue( caughtError === (isJS ? false : true),'Unexpected Vector check');
     
             try
             {
@@ -1206,8 +1217,8 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
     
-            Assert.assertTrue('Unexpected Vector check', vi.length == (isJS? 8 : 6));
-            Assert.assertTrue('Unexpected Vector check', caughtError === (isJS ? false : true));
+            assertTrue( vi.length == (isJS? 8 : 6),'Unexpected Vector check');
+            assertTrue( caughtError === (isJS ? false : true),'Unexpected Vector check');
     
             try
             {
@@ -1219,7 +1230,7 @@ package flexUnitTests.language
             {
                 caughtError = e is RangeError
             }
-            Assert.assertTrue('Unexpected Vector check', caughtError  === (isJS ? false : true));
+            assertTrue( caughtError  === (isJS ? false : true),'Unexpected Vector check');
         }
     
         [TestVariance(variance="JS", description="Variance in js implementation with @royalesuppressvectorindexcheck {name here}, Vector instance can enter invalid state.")]
@@ -1237,8 +1248,8 @@ package flexUnitTests.language
             var vi:Vector.<int> = new <int>[1, 2, 3, 4, 5];
             //allowed, not an error:
             vi[5] = 6;
-            Assert.assertTrue('Unexpected Vector check', vi.length == 6);
-            Assert.assertEquals('Unexpected Vector check', '1,2,3,4,5,6', vi.toString());
+            assertTrue( vi.length == 6,'Unexpected Vector check');
+            assertEquals( vi.toString(), '1,2,3,4,5,6','Unexpected Vector check');
             var caughtError:Boolean;
             try
             {
@@ -1252,8 +1263,8 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
     
-            Assert.assertTrue('Unexpected Vector check', vi.length == 6);
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( vi.length == 6,'Unexpected Vector check');
+            assertTrue( caughtError,'Unexpected Vector check');
     
             try
             {
@@ -1267,8 +1278,8 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
     
-            Assert.assertTrue('Unexpected Vector check', vi.length == 6);
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( vi.length == 6,'Unexpected Vector check');
+            assertTrue( caughtError,'Unexpected Vector check');
     
             try
             {
@@ -1281,8 +1292,8 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
     
-            Assert.assertTrue('Unexpected Vector check', vi.length == 6);
-            Assert.assertTrue('Unexpected Vector check', caughtError);
+            assertTrue( vi.length == 6,'Unexpected Vector check');
+            assertTrue( caughtError,'Unexpected Vector check');
             
             var vi2:Vector.<int> = vi;
             try
@@ -1296,8 +1307,8 @@ package flexUnitTests.language
                 caughtError = e is RangeError
             }
         
-            Assert.assertTrue('Unexpected Vector check', vi2.length == 6);
-            Assert.assertTrue('Unexpected Vector check', caughtError === (isJS ? false : true));
+            assertTrue( vi2.length == 6,'Unexpected Vector check');
+            assertTrue( caughtError === (isJS ? false : true),'Unexpected Vector check');
         }
         
         
@@ -1331,51 +1342,51 @@ package flexUnitTests.language
         public function testGetter():void{
             var vString:Vector.<String> = instGetterTest;
     
-            Assert.assertTrue('Unexpected Vector check', vString is Vector.<String>);
-            Assert.assertFalse('Unexpected Vector check', vString is Array);
+            assertTrue( vString is Vector.<String>,'Unexpected Vector check');
+            assertFalse( vString is Array,'Unexpected Vector check');
             
             vString = instMyVec;
     
-            Assert.assertTrue('Unexpected Vector check', vString is Vector.<String>);
-            Assert.assertFalse('Unexpected Vector check', vString is Array);
+            assertTrue( vString is Vector.<String>,'Unexpected Vector check');
+            assertFalse( vString is Array,'Unexpected Vector check');
     
             vString = instGetTestVector();
     
-            Assert.assertTrue('Unexpected Vector check', vString is Vector.<String>);
-            Assert.assertFalse('Unexpected Vector check', vString is Array);
+            assertTrue( vString is Vector.<String>,'Unexpected Vector check');
+            assertFalse( vString is Array,'Unexpected Vector check');
             
             //static
             vString = getterTest;
     
-            Assert.assertTrue('Unexpected Vector check', vString is Vector.<String>);
-            Assert.assertFalse('Unexpected Vector check', vString is Array);
+            assertTrue( vString is Vector.<String>,'Unexpected Vector check');
+            assertFalse( vString is Array,'Unexpected Vector check');
     
             vString = getTestVector();
     
-            Assert.assertTrue('Unexpected Vector check', vString is Vector.<String>);
-            Assert.assertFalse('Unexpected Vector check', vString is Array);
+            assertTrue( vString is Vector.<String>,'Unexpected Vector check');
+            assertFalse( vString is Array,'Unexpected Vector check');
     
             vString = myVec;
     
-            Assert.assertTrue('Unexpected Vector check', vString is Vector.<String>);
-            Assert.assertFalse('Unexpected Vector check', vString is Array);
+            assertTrue( vString is Vector.<String>,'Unexpected Vector check');
+            assertFalse( vString is Array,'Unexpected Vector check');
         }
         
         [Test]
         public function checkInterface():void{
             var v:Vector.<ITestInterface> = new <ITestInterface>[];
             v.push(new TestClass1());
-            Assert.assertTrue('Unexpected Vector check', v.length == 1);
-            Assert.assertTrue('Unexpected Vector check', v[0] is TestClass1);
- 
+            assertTrue( v.length == 1,'Unexpected Vector check');
+            assertTrue( v[0] is TestClass1,'Unexpected Vector check');
+        
             v=new Vector.<ITestInterface>();
             v.push(new TestClass1());
-            Assert.assertTrue('Unexpected Vector check', v.length == 1);
-            Assert.assertTrue('Unexpected Vector check', v[0] is TestClass1);
-    
+            assertTrue( v.length == 1,'Unexpected Vector check');
+            assertTrue( v[0] is TestClass1,'Unexpected Vector check');
+        
             v = Vector.<ITestInterface>([new TestClass1()]);
-            Assert.assertTrue('Unexpected Vector check', v.length == 1);
-            Assert.assertTrue('Unexpected Vector check', v[0] is TestClass1);
+            assertTrue( v.length == 1,'Unexpected Vector check');
+            assertTrue( v[0] is TestClass1,'Unexpected Vector check');
             var err:Boolean;
             try {
                 v.push(new TestClass5())
@@ -1383,7 +1394,7 @@ package flexUnitTests.language
             {
                 err=true;
             }
-            Assert.assertTrue('Unexpected Vector check', err);
+            assertTrue( err,'Unexpected Vector check');
         }
     
         [Test]
@@ -1392,19 +1403,19 @@ package flexUnitTests.language
             //literal:
             var v:Vector.<PrivateClass> = new <PrivateClass>[];
             v.push(new PrivateClass());
-            Assert.assertTrue('Unexpected Vector check', v.length == 1);
-            Assert.assertTrue('Unexpected Vector check', v[0] is PrivateClass);
+            assertTrue( v.length == 1,'Unexpected Vector check');
+            assertTrue( v[0] is PrivateClass,'Unexpected Vector check');
             //normal constructor:
             v=new Vector.<PrivateClass>();
             v.push(new PrivateClass());
-            Assert.assertTrue('Unexpected Vector check', v.length == 1);
-            Assert.assertTrue('Unexpected Vector check', v[0] is PrivateClass);
+            assertTrue( v.length == 1,'Unexpected Vector check');
+            assertTrue( v[0] is PrivateClass,'Unexpected Vector check');
             //coercion
             v = Vector.<PrivateClass>([]);
             v.push(new PrivateClass());
-            Assert.assertTrue('Unexpected Vector check', v.length == 1);
-            Assert.assertTrue('Unexpected Vector check', v[0] is PrivateClass);
-            
+            assertTrue( v.length == 1,'Unexpected Vector check');
+            assertTrue( v[0] is PrivateClass,'Unexpected Vector check');
+        
         }
         
     }


[royale-asjs] 04/04: Migrate other manualtests/UnitTests to alternate assertion methods to match RoyaleUnit (prep for adding new tests to RoyaleUnit)

Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

gregdove pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git

commit 7d6d754ca9e646e57f98e6e0ecb80e5eb19b7fe8
Author: greg-dove <gr...@gmail.com>
AuthorDate: Wed Aug 7 17:26:14 2019 +1200

    Migrate other manualtests/UnitTests to alternate assertion methods to match RoyaleUnit (prep for adding new tests to RoyaleUnit)
---
 .../royale/flexUnitTests/BinaryDataTesterTest.as   | 216 +++++---
 .../flexUnitTests/core/BinaryDataTesterTest.as     | 556 ++++++++++-----------
 .../royale/flexUnitTests/core/StrandTesterTest.as  |   5 +-
 .../network/AMFBinaryDataTesterTest.as             | 224 ++++-----
 .../flexUnitTests/observedbugs/ObservedBugTests.as |   7 +-
 .../reflection/ReflectionTesterNativeTypes.as      |  81 ++-
 .../reflection/ReflectionTesterTest.as             | 209 ++++----
 .../reflection/ReflectionTesterTestAlias.as        |  12 +-
 .../reflection/ReflectionTesterTestDynamic.as      |  78 +--
 .../reflection/ReflectionTesterTestUseCache.as     |   4 +-
 .../flexUnitTests/xml/XMLListTesterGeneralTest.as  |  46 +-
 .../flexUnitTests/xml/XMLTesterGeneralTest.as      | 300 +++++------
 .../flexUnitTests/xml/XMLTesterStringifyTest.as    |  32 +-
 13 files changed, 912 insertions(+), 858 deletions(-)

diff --git a/frameworks/projects/Core/src/test/royale/flexUnitTests/BinaryDataTesterTest.as b/frameworks/projects/Core/src/test/royale/flexUnitTests/BinaryDataTesterTest.as
index 22068a8..32c2e29 100644
--- a/frameworks/projects/Core/src/test/royale/flexUnitTests/BinaryDataTesterTest.as
+++ b/frameworks/projects/Core/src/test/royale/flexUnitTests/BinaryDataTesterTest.as
@@ -478,88 +478,144 @@ package flexUnitTests {
 
 
         }
-
-
-    [Test]
-    public function testDoubleRoundTripping():void
-    {
-
-        var ble:BinaryData = new BinaryData();
-        //test LITTLE_ENDIAN round-tripping
-        ble.endian = Endian.LITTLE_ENDIAN;
-        ble.writeDouble(86.54);
-
-
-        assertEquals(ble.length, 8, "Error testing post writeDouble/readDouble round-tripping");
-        assertEquals(ble.position, 8, "Error testing post writeDouble/readDouble round-tripping");
-
-        //check bytes
-        assertTrue(bytesMatchExpectedData(ble,[195,245,40,92,143,162,85,64]), "Error testing post writeDouble/readDouble round-tripping");
-
-        var bbe:BinaryData = new BinaryData();
-        //test BIG_ENDIAN round-tripping
-        bbe.endian = Endian.BIG_ENDIAN;
-        bbe.writeDouble(86.54);
-
-
-        assertEquals(bbe.length, 8, "Error testing post writeDouble/readDouble round-tripping");
-        assertEquals(bbe.position, 8, "Error testing post writeDouble/readDouble round-tripping");
-        //check bytes
-
-        assertTrue(bytesMatchExpectedData(bbe,[64,85,162,143,92,40,245,195]), "Error testing post writeDouble/readDouble round-tripping");
-
-
-        ble.position = 0;
-        bbe.position = 0;
-        assertEquals(bbe.readDouble(), 86.54, "Error testing post writeDouble/readDouble round-tripping");
-        assertEquals(ble.readDouble(), 86.54, "Error testing post writeDouble/readDouble round-tripping");
-
-        assertEquals(bbe.position, 8, "Error testing post writeDouble/readDouble round-tripping");
-        assertEquals(ble.position, 8, "Error testing post writeDouble/readDouble round-tripping");
-
-    }
-
-
-
-    [Test]
-    public function testWriteBinaryData():void
-    {
-        var ba:BinaryData = new BinaryData();
-        for (var i:int=0;i<50;i++) ba.writeByte(i);
-
-
-        var newBa:BinaryData = new BinaryData();
-        newBa.writeBinaryData(ba);
-
-        assertEquals(50, newBa.length, "BinaryData writeBinaryData: length");
-        assertEquals(50, newBa.position, "BinaryData writeBinaryData: position");
-
-        for (i=0;i<50;i++) {
-            assertEquals(i, newBa.array[i], "BinaryData writeBinaryData: content check");
+    
+    
+        [Test]
+        public function testDoubleRoundTripping():void
+        {
+        
+            var ble:BinaryData = new BinaryData();
+            //test LITTLE_ENDIAN round-tripping
+            ble.endian = Endian.LITTLE_ENDIAN;
+            ble.writeDouble(86.54);
+        
+        
+            assertEquals(ble.length, 8, "Error testing post writeDouble/readDouble round-tripping");
+            assertEquals(ble.position, 8, "Error testing post writeDouble/readDouble round-tripping");
+        
+            //check bytes
+            assertTrue(bytesMatchExpectedData(ble,[195,245,40,92,143,162,85,64]), "Error testing post writeDouble/readDouble round-tripping");
+        
+            var bbe:BinaryData = new BinaryData();
+            //test BIG_ENDIAN round-tripping
+            bbe.endian = Endian.BIG_ENDIAN;
+            bbe.writeDouble(86.54);
+        
+        
+            assertEquals(bbe.length, 8, "Error testing post writeDouble/readDouble round-tripping");
+            assertEquals(bbe.position, 8, "Error testing post writeDouble/readDouble round-tripping");
+            //check bytes
+        
+            assertTrue(bytesMatchExpectedData(bbe,[64,85,162,143,92,40,245,195]), "Error testing post writeDouble/readDouble round-tripping");
+        
+        
+            ble.position = 0;
+            bbe.position = 0;
+            assertEquals(bbe.readDouble(), 86.54, "Error testing post writeDouble/readDouble round-tripping");
+            assertEquals(ble.readDouble(), 86.54, "Error testing post writeDouble/readDouble round-tripping");
+        
+            assertEquals(bbe.position, 8, "Error testing post writeDouble/readDouble round-tripping");
+            assertEquals(ble.position, 8, "Error testing post writeDouble/readDouble round-tripping");
+        
         }
-
-
-
-    }
-
-    [Test]
-    public function testReadBinaryData():void
-    {
-        var ba:BinaryData = new BinaryData();
-        for (var i:int=0;i<50;i++) ba.writeByte(i);
-        ba.position=0;
-        var newBa:BinaryData = new BinaryData();
-
-        ba.readBinaryData(newBa,5,10);
-        assertEquals(10, ba.position, "BinaryData readBinaryData: position");
-        assertEquals(15, newBa.length, "BinaryData readBinaryData: length");
-        assertEquals(0, newBa.position, "BinaryData readBinaryData: position");
-        var expected:Array = [0,0,0,0,0,0,1,2,3,4,5,6,7,8,9];
-        for (i=5;i<15;i++) {
-            assertEquals(expected[i], newBa.array[i], "BinaryData readBinaryData: content check");
+    
+    
+    
+        [Test]
+        public function testWriteBinaryData():void
+        {
+            var ba:BinaryData = new BinaryData();
+            for (var i:int=0;i<50;i++) ba.writeByte(i);
+        
+        
+            var newBa:BinaryData = new BinaryData();
+            newBa.writeBinaryData(ba);
+        
+            assertEquals(50, newBa.length, "BinaryData writeBinaryData: length");
+            assertEquals(50, newBa.position, "BinaryData writeBinaryData: position");
+        
+            for (i=0;i<50;i++) {
+                assertEquals(i, newBa.array[i], "BinaryData writeBinaryData: content check");
+            }
+        
+        
+        
+        }
+        
+        [Test]
+        public function testReadBinaryData():void
+        {
+            var ba:BinaryData = new BinaryData();
+            for (var i:int = 0; i < 50; i++) ba.writeByte(i);
+            ba.position = 0;
+            var newBa:BinaryData = new BinaryData();
+            
+            ba.readBinaryData(newBa, 5, 10);
+            assertEquals(10, ba.position, "BinaryData readBinaryData: position");
+            assertEquals(15, newBa.length, "BinaryData readBinaryData: length");
+            assertEquals(0, newBa.position, "BinaryData readBinaryData: position");
+            var expected:Array = [0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
+            for (i = 0; i < 15; i++)
+            {
+                assertEquals(expected[i], newBa.array[i], "BinaryData readBinaryData: content check");
+            }
+            newBa.position = 15;
+            ba.readBinaryData(newBa, 5, 10);
+            expected = [0, 0, 0, 0, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19];
+            for (i = 0; i < 15; i++)
+            {
+                assertEquals(expected[i], newBa.array[i], "BinaryData readBinaryData: content check");
+            }
+            assertEquals(15, newBa.length, "BinaryData readBinaryData: length");
+            assertEquals(15, newBa.position, "BinaryData readBinaryData: position");
+        }
+        
+        [Test]
+        public function testReadOddBytes():void
+        {
+            var ba:BinaryData = new BinaryData();
+            for (var i:int = 0; i < 50; i++) ba.writeByte(i);
+            ba.endian = Endian.BIG_ENDIAN;
+            ba.position = 0;
+            assertEquals( 0, ba.readByte(),"BinaryData readByte: should be 0");
+            assertEquals( 258, ba.readShort(),"BinaryData readShort: should be 258");
+            assertEquals( 50595078, ba.readInt(), "BinaryData readInt: should be 50595078");
+            ba.endian = Endian.LITTLE_ENDIAN;
+            ba.position = 0;
+            assertEquals( 0, ba.readByte(), "BinaryData readByte: should be 0");
+            assertEquals( 513, ba.readShort(),"BinaryData readShort: should be 513");
+            assertEquals(100992003, ba.readInt(), "BinaryData readInt: should be 100992003");
+        
+            ba = new BinaryData();
+            ba.writeByte(25);
+            ba.writeShort(65535);
+            ba.writeUnsignedInt(4294967295);
+            ba.position = 0;
+            assertEquals(25, ba.readByte(), "BinaryData readByte: should be 25");
+            assertEquals(65535, ba.readUnsignedShort(), "BinaryData readUnsignedShort: should be 65535");
+            assertEquals( 4294967295, ba.readUnsignedInt(), "BinaryData readInt: should be 4294967295");
+        
+            ba = new BinaryData();
+            ba.writeByte(-25);
+            ba.writeShort(-1029);
+            ba.writeInt(-131072);
+            ba.writeFloat(12345.2);
+            ba.writeDouble(3.1415927410);
+            ba.position = 0;
+            assertEquals(-25, ba.readByte(), "BinaryData readByte: should be -25");
+            assertEquals( -1029, ba.readShort(), "BinaryData readShort: should be -1029");
+            assertEquals( -131072, ba.readInt(), "BinaryData readInt: should be -131072");
+            assertEquals( 12345.2, Math.round(ba.readFloat() * 100) / 100, "BinaryData readFloat: should be 12345.2");
+            assertEquals( 3.1415927410, ba.readDouble(), "BinaryData readDouble: should be 3.1415927410");
+            ba = new BinaryData()
+            ba.writeFloat(12345.2);
+            ba.position = 0;
+            assertEquals( 12345.2, Math.round(ba.readFloat() * 100) / 100, "BinaryData readFloat: should be 12345.2");
+            ba.position = 0;
+            ba.writeDouble(3.1415927410);
+            ba.position = 0;
+            assertEquals( 3.1415927410, ba.readDouble(), "BinaryData readDouble: should be 3.1415927410");
         }
-    }
-
 
 }
 }
diff --git a/manualtests/UnitTests/src/main/royale/flexUnitTests/core/BinaryDataTesterTest.as b/manualtests/UnitTests/src/main/royale/flexUnitTests/core/BinaryDataTesterTest.as
index 867a103..5bf9b46 100644
--- a/manualtests/UnitTests/src/main/royale/flexUnitTests/core/BinaryDataTesterTest.as
+++ b/manualtests/UnitTests/src/main/royale/flexUnitTests/core/BinaryDataTesterTest.as
@@ -21,9 +21,7 @@ package flexUnitTests.core
     
     
     import org.apache.royale.utils.Endian;
-    
-    import flexunit.framework.Assert;
-    
+    import org.apache.royale.test.asserts.*;
     import org.apache.royale.utils.BinaryData
     
     
@@ -84,70 +82,70 @@ package flexUnitTests.core
         public function testBasicPositionAndLength():void
         {
             var ba:BinaryData = new BinaryData();
-            
-            Assert.assertEquals("new Instance, position", 0, ba.position);
-            Assert.assertEquals("new Instance, length", 0, ba.length);
-            
-            ba.position = 100;
-            Assert.assertEquals("position change, position", 100, ba.position);
-            Assert.assertEquals("position change, length", 0, ba.length);
-            Assert.assertEquals("position change, length", 0, ba.bytesAvailable);
-            
-            ba.length = 100;
-            Assert.assertEquals("length change, position", 100, ba.position);
-            Assert.assertEquals("length change, length", 100, ba.length);
-            
-            ba.length = 50;
-            Assert.assertEquals("length change, position", 50, ba.position);
-            Assert.assertEquals("length change, length", 50, ba.length);
-            
-            
+
+            assertEquals(ba.position, 0, "new Instance, position");
+            assertEquals(ba.length, 0, "new Instance, length");
+
+            ba.position=100;
+            assertEquals(ba.position,100, "position change, position");
+            assertEquals(ba.length, 0, "position change, length");
+            assertEquals(ba.bytesAvailable, 0, "position change, length");
+
+            ba.length=100;
+            assertEquals(ba.position,100, "length change, position");
+            assertEquals(ba.length, 100, "length change, length");
+
+            ba.length=50;
+            assertEquals(ba.position,50, "length change, position");
+            assertEquals(ba.length, 50, "length change, length");
+
+
         }
-        
+
         [Test]
         public function testAdvancedPositionAndLength():void
         {
             var ba:BinaryData = new BinaryData();
-            
-            ba.position = 100;
-            ba.length = 100;
-            
-            ba.writeByteAt(49, 255);
-            Assert.assertEquals("writeByteAt does not affect position", 100, ba.position);
-            Assert.assertEquals("writeByteAt (internal) does not affect length", 100, ba.length);
-            
+
+            ba.position=100;
+            ba.length=100;
+
+            ba.writeByteAt(49,255);
+            assertEquals(ba.position,100, "writeByteAt does not affect position");
+            assertEquals(ba.length,100, "writeByteAt (internal) does not affect length");
+
             ba.readByteAt(48);
-            Assert.assertEquals("readByteAt does not affect position", 100, ba.position);
-            Assert.assertEquals("readByteAt does not affect length", 100, ba.length);
-            
-            ba.writeByteAt(199, 255);
-            Assert.assertEquals("writeByteAt (beyond length) does affect length", 200, ba.length);
-            Assert.assertEquals("writeByteAt (beyond length) does not affect position", 100, ba.position);
-            
-            Assert.assertStrictlyEquals("out of range byte read request", 0, ba.readByteAt(205));
-            
+            assertEquals(ba.position,100, "readByteAt does not affect position");
+            assertEquals(ba.length,100, "readByteAt does not affect length");
+
+            ba.writeByteAt(199,255);
+            assertEquals(ba.length, 200, "writeByteAt (beyond length) does affect length");
+            assertEquals(ba.position,100, "writeByteAt (beyond length) does not affect position");
+
+            assertStrictlyEquals(ba.readByteAt(205),0, "out of range byte read request");
+
         }
-        
-        
+
+
         [Test]
         public function testUTFWritePosition():void
         {
             var ba:BinaryData = new BinaryData();
             ba.writeUTF('This is a test');
             //writeUTF
-            Assert.assertEquals("basic post-writeUTF position", 16, ba.position);
-            ba = new BinaryData();
+            assertEquals(ba.position, 16, "basic post-writeUTF position");
+            ba=new BinaryData();
             ba.writeUTFBytes('This is a test');
             //writeUTFBytes
-            Assert.assertEquals("basic post-writeUTFBytes position", 14, ba.position);
-            
+            assertEquals(ba.position, 14, "basic post-writeUTFBytes position");
+
             //overlapping
-            ba.position = 5;
+            ba.position=5;
             ba.writeUTFBytes('This is a test');
-            Assert.assertEquals("Advanced post-writeUTFBytes position (overlap)", 19, ba.position);
-            
+            assertEquals(ba.position, 19, "Advanced post-writeUTFBytes position (overlap)");
+
         }
-        
+
         [Test]
         public function testBooleanRoundTripping():void
         {
@@ -155,10 +153,10 @@ package flexUnitTests.core
             ba.writeBoolean(true);
             ba.writeBoolean(false);
             ba.position = 0;
-            Assert.assertTrue(ba.readBoolean());
-            Assert.assertFalse(ba.readBoolean());
+            assertTrue(ba.readBoolean());
+            assertFalse(ba.readBoolean());
         }
-        
+
         [Test]
         public function testByteRoundTripping():void
         {
@@ -173,20 +171,20 @@ package flexUnitTests.core
             ba.writeByte(-50);
             ba.writeByte(50);
             ba.position = 0;
-            
-            
-            Assert.assertEquals("Error testing post writeByte/readByte round-tripping", -1, ba.readByte());
-            Assert.assertEquals("Error testing post writeByte/readByte round-tripping", 0, ba.readByte());
-            Assert.assertEquals("Error testing post writeByte/readByte round-tripping", 0, ba.readByte());
-            Assert.assertEquals("Error testing post writeByte/readByte round-tripping", -1, ba.readByte());
-            Assert.assertEquals("Error testing post writeByte/readByte round-tripping", -128, ba.readByte());
-            Assert.assertEquals("Error testing post writeByte/readByte round-tripping", -128, ba.readByte());
-            Assert.assertEquals("Error testing post writeByte/readByte round-tripping", 127, ba.readByte());
-            Assert.assertEquals("Error testing post writeByte/readByte round-tripping", -50, ba.readByte());
-            Assert.assertEquals("Error testing post writeByte/readByte round-tripping", 50, ba.readByte());
+
+
+            assertEquals(ba.readByte(), -1, "Error testing post writeByte/readByte round-tripping");
+            assertEquals(ba.readByte(), 0, "Error testing post writeByte/readByte round-tripping");
+            assertEquals(ba.readByte(), 0, "Error testing post writeByte/readByte round-tripping");
+            assertEquals(ba.readByte(), -1, "Error testing post writeByte/readByte round-tripping");
+            assertEquals(ba.readByte(), -128, "Error testing post writeByte/readByte round-tripping");
+            assertEquals(ba.readByte(), -128, "Error testing post writeByte/readByte round-tripping");
+            assertEquals(ba.readByte(), 127, "Error testing post writeByte/readByte round-tripping");
+            assertEquals(ba.readByte(), -50, "Error testing post writeByte/readByte round-tripping");
+            assertEquals(ba.readByte(), 50, "Error testing post writeByte/readByte round-tripping");
         }
-        
-        
+
+
         [Test]
         public function testUnsignedByteRoundTripping():void
         {
@@ -202,55 +200,55 @@ package flexUnitTests.core
             ba.writeByte(50);
             ba.position = 0;
             //check read values
-            
-            Assert.assertEquals("Error testing post writeByte/readUnsignedByte round-tripping", 255, ba.readUnsignedByte());
-            Assert.assertEquals("Error testing post writeByte/readUnsignedByte round-tripping", 0, ba.readUnsignedByte());
-            Assert.assertEquals("Error testing post writeByte/readUnsignedByte round-tripping", 0, ba.readUnsignedByte());
-            Assert.assertEquals("Error testing post writeByte/readUnsignedByte round-tripping", 255, ba.readUnsignedByte());
-            Assert.assertEquals("Error testing post writeByte/readUnsignedByte round-tripping", 128, ba.readUnsignedByte());
-            Assert.assertEquals("Error testing post writeByte/readUnsignedByte round-tripping", 128, ba.readUnsignedByte());
-            Assert.assertEquals("Error testing post writeByte/readUnsignedByte round-tripping", 127, ba.readUnsignedByte());
-            Assert.assertEquals("Error testing post writeByte/readUnsignedByte round-tripping", 206, ba.readUnsignedByte());
-            Assert.assertEquals("Error testing post writeByte/readUnsignedByte round-tripping", 50, ba.readUnsignedByte());
+
+            assertEquals(ba.readUnsignedByte(), 255, "Error testing post writeByte/readUnsignedByte round-tripping");
+            assertEquals(ba.readUnsignedByte(), 0, "Error testing post writeByte/readUnsignedByte round-tripping");
+            assertEquals(ba.readUnsignedByte(), 0, "Error testing post writeByte/readUnsignedByte round-tripping");
+            assertEquals(ba.readUnsignedByte(), 255, "Error testing post writeByte/readUnsignedByte round-tripping");
+            assertEquals(ba.readUnsignedByte(), 128, "Error testing post writeByte/readUnsignedByte round-tripping");
+            assertEquals(ba.readUnsignedByte(), 128, "Error testing post writeByte/readUnsignedByte round-tripping");
+            assertEquals(ba.readUnsignedByte(), 127, "Error testing post writeByte/readUnsignedByte round-tripping");
+            assertEquals(ba.readUnsignedByte(), 206, "Error testing post writeByte/readUnsignedByte round-tripping");
+            assertEquals(ba.readUnsignedByte(), 50, "Error testing post writeByte/readUnsignedByte round-tripping");
         }
-        
-        
+
+
         [Test]
         public function testBasicEndian():void
         {
-            
+
             var systemEndian:String = Endian.systemEndian;
             //check we have a decisive systemEndian detection
-            Assert.assertNotNull(systemEndian);
-            
-            
+            assertNotNull(systemEndian );
+
+
             var ba:BinaryData = new BinaryData();
             var defaultEndian:String = ba.endian;
-            
+
             var alternateEndian:String = (defaultEndian == Endian.BIG_ENDIAN) ? Endian.LITTLE_ENDIAN : Endian.BIG_ENDIAN;
-            var expected:Object = {};
+            var expected:Object ={};
             expected[Endian.BIG_ENDIAN] = 218038271;
             expected[Endian.LITTLE_ENDIAN] = 4294966796;
             var bytes:Array = [12, 254, 255, 255];
             for each(var byte:uint in bytes) ba.writeByte(byte);
             ba.position = 0;
-            
-            Assert.assertEquals("testing endian:" + defaultEndian, expected[defaultEndian], ba.readUnsignedInt());
-            
+
+            assertEquals(ba.readUnsignedInt(), expected[defaultEndian], "testing endian:"+defaultEndian);
+
             ba.position = 0;
             ba.endian = alternateEndian;
-            var result:uint = ba.readUnsignedInt();
-            
-            Assert.assertEquals("testing endian:" + alternateEndian, expected[alternateEndian], result);
-            
+            var result:uint =  ba.readUnsignedInt();
+
+            assertEquals(result, expected[alternateEndian], "testing endian:"+alternateEndian);
+
             ba.position = 0;
             ba.endian = defaultEndian;
-            Assert.assertEquals("testing endian:" + defaultEndian, int(expected[defaultEndian]), ba.readInt());
-            
+            assertEquals(ba.readInt(), int(expected[defaultEndian]), "testing endian:"+defaultEndian);
+
             ba.position = 0;
             ba.endian = alternateEndian;
-            Assert.assertEquals("testing endian:" + alternateEndian, int(expected[alternateEndian]), ba.readInt());
-            
+            assertEquals(ba.readInt(), int(expected[alternateEndian]), "testing endian:"+alternateEndian);
+
             var leBA:BinaryData = new BinaryData();
             leBA.endian = Endian.LITTLE_ENDIAN;
             var beBA:BinaryData = new BinaryData();
@@ -259,85 +257,85 @@ package flexUnitTests.core
             beBA.writeInt(-500);
             leBA.writeInt(-500);
             //check they represent reversed byte sequence
-            Assert.assertTrue(reversedBytesMatch(beBA, leBA, 4));
-            beBA.position = 0;
-            leBA.position = 0;
+            assertTrue(reversedBytesMatch(beBA,leBA,4));
+            beBA.position=0;
+            leBA.position=0;
             //check they each read back to the same uint value
-            Assert.assertEquals('big endian', 4294966796, beBA.readUnsignedInt());
-            Assert.assertEquals('little endian', 4294966796, leBA.readUnsignedInt());
-            
-            beBA.position = 0;
-            leBA.position = 0;
+            assertEquals(beBA.readUnsignedInt(),4294966796, 'big endian');
+            assertEquals(leBA.readUnsignedInt(),4294966796, 'little endian');
+
+            beBA.position=0;
+            leBA.position=0;
             //uint writing
             beBA.writeUnsignedInt(4294966796);
             leBA.writeUnsignedInt(4294966796);
             //check they represent reversed byte sequence
-            Assert.assertTrue(reversedBytesMatch(beBA, leBA, 4));
-            beBA.position = 0;
-            leBA.position = 0;
+            assertTrue(reversedBytesMatch(beBA,leBA,4));
+            beBA.position=0;
+            leBA.position=0;
             //check they each read back to the same uint value
-            Assert.assertEquals('big endian', 4294966796, beBA.readUnsignedInt());
-            Assert.assertEquals('little endian', 4294966796, leBA.readUnsignedInt());
-            
-            
-            beBA.position = 0;
-            leBA.position = 0;
-            
+            assertEquals(beBA.readUnsignedInt(),4294966796, 'big endian');
+            assertEquals(leBA.readUnsignedInt(),4294966796, 'little endian');
+
+
+            beBA.position=0;
+            leBA.position=0;
+
             //check they each read back to the same int value
-            Assert.assertEquals('big endian', -500, beBA.readInt());
-            Assert.assertEquals('little endian', -500, leBA.readInt());
-            
-            
-            beBA.position = 0;
-            leBA.position = 0;
-            
+            assertEquals(beBA.readInt(),-500, 'big endian');
+            assertEquals(leBA.readInt(),-500, 'little endian');
+
+
+            beBA.position=0;
+            leBA.position=0;
+
             //short writing
             beBA.writeShort(-500);
             leBA.writeShort(-500);
             //check they represent reversed byte sequence
-            Assert.assertTrue(reversedBytesMatch(beBA, leBA, 2));
-            beBA.position = 0;
-            leBA.position = 0;
+            assertTrue(reversedBytesMatch(beBA,leBA,2));
+            beBA.position=0;
+            leBA.position=0;
             //check they each read back to the same uint value
-            Assert.assertEquals('big endian', 65036, beBA.readUnsignedShort());
-            Assert.assertEquals('little endian', 65036, leBA.readUnsignedShort());
-            
-            
-            beBA.position = 0;
-            leBA.position = 0;
-            
+            assertEquals(beBA.readUnsignedShort(),65036, 'big endian');
+            assertEquals(leBA.readUnsignedShort(),65036, 'little endian');
+
+
+            beBA.position=0;
+            leBA.position=0;
+
             //check they each read back to the same int value
-            Assert.assertEquals('big endian', -500, beBA.readShort());
-            Assert.assertEquals('little endian', -500, leBA.readShort());
-            
+            assertEquals(beBA.readShort(),-500, 'big endian');
+            assertEquals(leBA.readShort(),-500, 'little endian');
+
         }
-        
-        
+
+
         [Test]
         public function testUTFRoundtripping():void
         {
-            
+
             //test big-endian round-tripping
             var ba:BinaryData = new BinaryData();
             ba.endian = Endian.BIG_ENDIAN;
             ba.writeUTF('This is a test');
             //writeUTF
-            Assert.assertEquals("basic post-writeUTF position", 16, ba.position);
+            assertEquals(ba.position, 16, "basic post-writeUTF position");
             ba.position = 0;
-            Assert.assertEquals("utf big endian round-tripping", 'This is a test', ba.readUTF());
-            
+            assertEquals(ba.readUTF(), 'This is a test', "utf big endian round-tripping");
+
             ba = new BinaryData();
             //test little-endian round-tripping
             ba.endian = Endian.LITTLE_ENDIAN;
             ba.writeUTF('This is a test');
             //writeUTF
-            Assert.assertEquals("basic post-writeUTF position", 16, ba.position);
+            assertEquals(ba.position, 16, "basic post-writeUTF position");
             ba.position = 0;
-            Assert.assertEquals("utf big endian round-tripping", 'This is a test', ba.readUTF());
-            
+            assertEquals(ba.readUTF(), 'This is a test', "utf big endian round-tripping");
+
         }
-        
-        
+
+
         [Test]
         public function testShortRoundTripping():void
         {
@@ -348,28 +346,28 @@ package flexUnitTests.core
             ba.writeShort(-50);
             ba.writeShort(50);
             ba.position = 0;
-            
-            Assert.assertEquals("Error testing post writeShort/readShort round-tripping", 6, ba.length);
-            Assert.assertEquals("Error testing post writeShort/readShort round-tripping", 255, ba.readShort());
-            Assert.assertEquals("Error testing post writeShort/readShort round-tripping", -50, ba.readShort());
-            Assert.assertEquals("Error testing post writeShort/readShort round-tripping", 50, ba.readShort());
-            
+
+            assertEquals(ba.length, 6, "Error testing post writeShort/readShort round-tripping");
+            assertEquals(ba.readShort(), 255, "Error testing post writeShort/readShort round-tripping");
+            assertEquals(ba.readShort(), -50, "Error testing post writeShort/readShort round-tripping");
+            assertEquals(ba.readShort(), 50, "Error testing post writeShort/readShort round-tripping");
+
             //test BIG_ENDIAN round-tripping
-            
+
             ba.position = 0;
-            ba.endian = Endian.BIG_ENDIAN;
+            ba.endian = Endian.BIG_ENDIAN ;
             ba.writeShort(255);
             ba.writeShort(-50);
             ba.writeShort(50);
             ba.position = 0;
-            
-            Assert.assertEquals("Error testing post writeShort/readShort round-tripping", 6, ba.length);
-            Assert.assertEquals("Error testing post writeShort/readShort round-tripping", 255, ba.readShort());
-            Assert.assertEquals("Error testing post writeShort/readShort round-tripping", -50, ba.readShort());
-            Assert.assertEquals("Error testing post writeShort/readShort round-tripping", 50, ba.readShort());
+
+            assertEquals(ba.length, 6, "Error testing post writeShort/readShort round-tripping");
+            assertEquals(ba.readShort(), 255, "Error testing post writeShort/readShort round-tripping");
+            assertEquals(ba.readShort(), -50, "Error testing post writeShort/readShort round-tripping");
+            assertEquals(ba.readShort(), 50, "Error testing post writeShort/readShort round-tripping");
         }
-        
-        
+
+
         [Test]
         public function testUnsignedShortRoundTripping():void
         {
@@ -380,27 +378,27 @@ package flexUnitTests.core
             ba.writeShort(-50);
             ba.writeShort(50);
             ba.position = 0;
-            
-            Assert.assertEquals("Error testing post unsigned writeShort/readShort round-tripping", 6, ba.length);
-            Assert.assertEquals("Error testing post unsigned writeShort/readShort round-tripping", 255, ba.readUnsignedShort());
-            Assert.assertEquals("Error testing post unsigned writeShort/readShort round-tripping", 65486, ba.readUnsignedShort());
-            Assert.assertEquals("Error testing post unsigned writeShort/readShort round-tripping", 50, ba.readUnsignedShort());
-            
+
+            assertEquals(ba.length, 6, "Error testing post unsigned writeShort/readShort round-tripping");
+            assertEquals(ba.readUnsignedShort(), 255, "Error testing post unsigned writeShort/readShort round-tripping");
+            assertEquals(ba.readUnsignedShort(), 65486, "Error testing post unsigned writeShort/readShort round-tripping");
+            assertEquals(ba.readUnsignedShort(), 50, "Error testing post unsigned writeShort/readShort round-tripping");
+
             //test BIG_ENDIAN round-tripping
-            
+
             ba.position = 0;
-            ba.endian = Endian.BIG_ENDIAN;
+            ba.endian = Endian.BIG_ENDIAN ;
             ba.writeShort(255);
             ba.writeShort(-50);
             ba.writeShort(50);
             ba.position = 0;
-            
-            Assert.assertEquals("Error testing post unsigned writeShort/readShort round-tripping", 6, ba.length);
-            Assert.assertEquals("Error testing post unsigned writeShort/readShort round-tripping", 255, ba.readUnsignedShort());
-            Assert.assertEquals("Error testing post unsigned writeShort/readShort round-tripping", 65486, ba.readUnsignedShort());
-            Assert.assertEquals("Error testing post unsigned writeShort/readShort round-tripping", 50, ba.readUnsignedShort());
+
+            assertEquals(ba.length, 6, "Error testing post unsigned writeShort/readShort round-tripping");
+            assertEquals(ba.readUnsignedShort(), 255, "Error testing post unsigned writeShort/readShort round-tripping");
+            assertEquals(ba.readUnsignedShort(), 65486, "Error testing post unsigned writeShort/readShort round-tripping");
+            assertEquals(ba.readUnsignedShort(), 50, "Error testing post unsigned writeShort/readShort round-tripping");
         }
-        
+
         [Test]
         public function testIntRoundTripping():void
         {
@@ -411,28 +409,28 @@ package flexUnitTests.core
             ba.writeInt(-50);
             ba.writeInt(50);
             ba.position = 0;
-            
-            Assert.assertEquals("Error testing post writeInt/readInt round-tripping", 12, ba.length);
-            Assert.assertEquals("Error testing post writeInt/readInt round-tripping", 65536, ba.readInt());
-            Assert.assertEquals("Error testing post writeInt/readInt round-tripping", -50, ba.readInt());
-            Assert.assertEquals("Error testing post writeInt/readInt round-tripping", 50, ba.readInt());
-            
+
+            assertEquals(ba.length, 12, "Error testing post writeInt/readInt round-tripping");
+            assertEquals(ba.readInt(), 65536, "Error testing post writeInt/readInt round-tripping");
+            assertEquals(ba.readInt(), -50, "Error testing post writeInt/readInt round-tripping");
+            assertEquals(ba.readInt(), 50, "Error testing post writeInt/readInt round-tripping");
+
             //test BIG_ENDIAN round-tripping
-            
+
             ba.position = 0;
-            ba.endian = Endian.BIG_ENDIAN;
+            ba.endian = Endian.BIG_ENDIAN ;
             ba.writeInt(65536);
             ba.writeInt(-50);
             ba.writeInt(50);
             ba.position = 0;
-            
-            Assert.assertEquals("Error testing post writeInt/readInt round-tripping", 12, ba.length);
-            Assert.assertEquals("Error testing post writeInt/readInt round-tripping", 65536, ba.readInt());
-            Assert.assertEquals("Error testing post writeInt/readInt round-tripping", -50, ba.readInt());
-            Assert.assertEquals("Error testing post writeInt/readInt round-tripping", 50, ba.readInt());
+
+            assertEquals(ba.length, 12, "Error testing post writeInt/readInt round-tripping");
+            assertEquals(ba.readInt(), 65536, "Error testing post writeInt/readInt round-tripping");
+            assertEquals(ba.readInt(), -50, "Error testing post writeInt/readInt round-tripping");
+            assertEquals(ba.readInt(), 50, "Error testing post writeInt/readInt round-tripping");
         }
-        
-        
+
+
         [Test]
         public function testUnsignedIntRoundTripping():void
         {
@@ -443,27 +441,27 @@ package flexUnitTests.core
             ba.writeUnsignedInt(-50);
             ba.writeUnsignedInt(50);
             ba.position = 0;
-            
-            Assert.assertEquals("Error testing post writeInt/readInt round-tripping", 12, ba.length);
-            Assert.assertEquals("Error testing post writeInt/readInt round-tripping", 65536, ba.readUnsignedInt());
-            Assert.assertEquals("Error testing post writeInt/readInt round-tripping", 4294967246, ba.readUnsignedInt());
-            Assert.assertEquals("Error testing post writeInt/readInt round-tripping", 50, ba.readUnsignedInt());
-            
+
+            assertEquals(ba.length, 12, "Error testing post writeInt/readInt round-tripping");
+            assertEquals(ba.readUnsignedInt(),65536, "Error testing post writeInt/readInt round-tripping");
+            assertEquals(ba.readUnsignedInt(), 4294967246, "Error testing post writeInt/readInt round-tripping");
+            assertEquals(ba.readUnsignedInt(), 50, "Error testing post writeInt/readInt round-tripping");
+
             //test BIG_ENDIAN round-tripping
-            
+
             ba.position = 0;
-            ba.endian = Endian.BIG_ENDIAN;
+            ba.endian = Endian.BIG_ENDIAN ;
             ba.writeUnsignedInt(65536);
             ba.writeUnsignedInt(-50);
             ba.writeUnsignedInt(50);
             ba.position = 0;
-            
-            Assert.assertEquals("Error testing post writeInt/readInt round-tripping", 12, ba.length);
-            Assert.assertEquals("Error testing post writeInt/readInt round-tripping", 65536, ba.readUnsignedInt());
-            Assert.assertEquals("Error testing post writeInt/readInt round-tripping", 4294967246, ba.readUnsignedInt());
-            Assert.assertEquals("Error testing post writeInt/readInt round-tripping", 50, ba.readUnsignedInt());
+
+            assertEquals(ba.length, 12, "Error testing post writeInt/readInt round-tripping");
+            assertEquals(ba.readUnsignedInt(),65536, "Error testing post writeInt/readInt round-tripping");
+            assertEquals(ba.readUnsignedInt(), 4294967246, "Error testing post writeInt/readInt round-tripping");
+            assertEquals(ba.readUnsignedInt(), 50, "Error testing post writeInt/readInt round-tripping");
         }
-        
+
         [Test]
         public function testFloatRoundTripping():void
         {
@@ -471,87 +469,88 @@ package flexUnitTests.core
             //test LITTLE_ENDIAN round-tripping
             ble.endian = Endian.LITTLE_ENDIAN;
             ble.writeFloat(86.54);
-            
-            
-            Assert.assertEquals("Error testing post writeFloat/readFloat round-tripping", 4, ble.length);
-            Assert.assertEquals("Error testing post writeFloat/readFloat round-tripping", 4, ble.position);
+
+
+            assertEquals(ble.length, 4, "Error testing post writeFloat/readFloat round-tripping");
+            assertEquals(ble.position, 4, "Error testing post writeFloat/readFloat round-tripping");
             //check bytes to account for precision loss between double and float comparisons
-            Assert.assertTrue("Error testing post writeFloat/readFloat round-tripping", bytesMatchExpectedData(ble, [123, 20, 173, 66]));
-            
+            assertTrue(bytesMatchExpectedData(ble,[123,20,173,66]), "Error testing post writeFloat/readFloat round-tripping");
+
             var bbe:BinaryData = new BinaryData();
             //test BIG_ENDIAN round-tripping
             bbe.endian = Endian.BIG_ENDIAN;
             bbe.writeFloat(86.54);
-            
-            
-            Assert.assertEquals("Error testing post writeFloat/readFloat round-tripping", 4, bbe.length);
-            Assert.assertEquals("Error testing post writeFloat/readFloat round-tripping", 4, bbe.position);
+
+
+            assertEquals(bbe.length, 4, "Error testing post writeFloat/readFloat round-tripping");
+            assertEquals(bbe.position, 4, "Error testing post writeFloat/readFloat round-tripping");
             //check bytes to account for precision loss between double and float comparisons
-            Assert.assertTrue("Error testing post writeFloat/readFloat round-tripping", bytesMatchExpectedData(bbe, [66, 173, 20, 123]));
-            
-            
+            assertTrue(bytesMatchExpectedData(bbe,[66,173,20,123]), "Error testing post writeFloat/readFloat round-tripping");
+
+
         }
-        
-        
+    
+    
         [Test]
         public function testDoubleRoundTripping():void
         {
-            
+        
             var ble:BinaryData = new BinaryData();
             //test LITTLE_ENDIAN round-tripping
             ble.endian = Endian.LITTLE_ENDIAN;
             ble.writeDouble(86.54);
-            
-            
-            Assert.assertEquals("Error testing post writeDouble/readDouble round-tripping", 8, ble.length);
-            Assert.assertEquals("Error testing post writeDouble/readDouble round-tripping", 8, ble.position);
-            
+        
+        
+            assertEquals(ble.length, 8, "Error testing post writeDouble/readDouble round-tripping");
+            assertEquals(ble.position, 8, "Error testing post writeDouble/readDouble round-tripping");
+        
             //check bytes
-            Assert.assertTrue("Error testing post writeDouble/readDouble round-tripping", bytesMatchExpectedData(ble, [195, 245, 40, 92, 143, 162, 85, 64]));
-            
+            assertTrue(bytesMatchExpectedData(ble,[195,245,40,92,143,162,85,64]), "Error testing post writeDouble/readDouble round-tripping");
+        
             var bbe:BinaryData = new BinaryData();
             //test BIG_ENDIAN round-tripping
             bbe.endian = Endian.BIG_ENDIAN;
             bbe.writeDouble(86.54);
-            
-            
-            Assert.assertEquals("Error testing post writeDouble/readDouble round-tripping", 8, bbe.length);
-            Assert.assertEquals("Error testing post writeDouble/readDouble round-tripping", 8, bbe.position);
+        
+        
+            assertEquals(bbe.length, 8, "Error testing post writeDouble/readDouble round-tripping");
+            assertEquals(bbe.position, 8, "Error testing post writeDouble/readDouble round-tripping");
             //check bytes
-            
-            Assert.assertTrue("Error testing post writeDouble/readDouble round-tripping", bytesMatchExpectedData(bbe, [64, 85, 162, 143, 92, 40, 245, 195]));
-            
-            
+        
+            assertTrue(bytesMatchExpectedData(bbe,[64,85,162,143,92,40,245,195]), "Error testing post writeDouble/readDouble round-tripping");
+        
+        
             ble.position = 0;
             bbe.position = 0;
-            Assert.assertEquals("Error testing post writeDouble/readDouble round-tripping", 86.54, bbe.readDouble());
-            Assert.assertEquals("Error testing post writeDouble/readDouble round-tripping", 86.54, ble.readDouble());
-            
-            Assert.assertEquals("Error testing post writeDouble/readDouble round-tripping", 8, bbe.position);
-            Assert.assertEquals("Error testing post writeDouble/readDouble round-tripping", 8, ble.position);
-            
-        }
+            assertEquals(bbe.readDouble(), 86.54, "Error testing post writeDouble/readDouble round-tripping");
+            assertEquals(ble.readDouble(), 86.54, "Error testing post writeDouble/readDouble round-tripping");
         
+            assertEquals(bbe.position, 8, "Error testing post writeDouble/readDouble round-tripping");
+            assertEquals(ble.position, 8, "Error testing post writeDouble/readDouble round-tripping");
         
+        }
+    
+    
+    
         [Test]
         public function testWriteBinaryData():void
         {
             var ba:BinaryData = new BinaryData();
-            for (var i:int = 0; i < 50; i++) ba.writeByte(i);
-            
-            
+            for (var i:int=0;i<50;i++) ba.writeByte(i);
+        
+        
             var newBa:BinaryData = new BinaryData();
             newBa.writeBinaryData(ba);
-            
-            Assert.assertEquals("BinaryData writeBinaryData: length", 50, newBa.length);
-            Assert.assertEquals("BinaryData writeBinaryData: position", 50, newBa.position);
-            
-            for (i = 0; i < 50; i++)
-            {
-                Assert.assertEquals("BinaryData writeBinaryData: content check", i, newBa.array[i]);
+        
+            assertEquals(50, newBa.length, "BinaryData writeBinaryData: length");
+            assertEquals(50, newBa.position, "BinaryData writeBinaryData: position");
+        
+            for (i=0;i<50;i++) {
+                assertEquals(i, newBa.array[i], "BinaryData writeBinaryData: content check");
             }
-            
-            
+        
+        
+        
         }
         
         [Test]
@@ -563,23 +562,23 @@ package flexUnitTests.core
             var newBa:BinaryData = new BinaryData();
             
             ba.readBinaryData(newBa, 5, 10);
-            Assert.assertEquals("BinaryData readBinaryData: position", 10, ba.position);
-            Assert.assertEquals("BinaryData readBinaryData: length", 15, newBa.length);
-            Assert.assertEquals("BinaryData readBinaryData: position", 0, newBa.position);
+            assertEquals(10, ba.position, "BinaryData readBinaryData: position");
+            assertEquals(15, newBa.length, "BinaryData readBinaryData: length");
+            assertEquals(0, newBa.position, "BinaryData readBinaryData: position");
             var expected:Array = [0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
             for (i = 0; i < 15; i++)
             {
-                Assert.assertEquals("BinaryData readBinaryData: content check", expected[i], newBa.array[i]);
+                assertEquals(expected[i], newBa.array[i], "BinaryData readBinaryData: content check");
             }
             newBa.position = 15;
             ba.readBinaryData(newBa, 5, 10);
             expected = [0, 0, 0, 0, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19];
             for (i = 0; i < 15; i++)
             {
-                Assert.assertEquals("BinaryData readBinaryData: content check", expected[i], newBa.array[i]);
+                assertEquals(expected[i], newBa.array[i], "BinaryData readBinaryData: content check");
             }
-            Assert.assertEquals("BinaryData readBinaryData: length", 15, newBa.length);
-            Assert.assertEquals("BinaryData readBinaryData: position", 15, newBa.position);
+            assertEquals(15, newBa.length, "BinaryData readBinaryData: length");
+            assertEquals(15, newBa.position, "BinaryData readBinaryData: position");
         }
         
         [Test]
@@ -589,24 +588,24 @@ package flexUnitTests.core
             for (var i:int = 0; i < 50; i++) ba.writeByte(i);
             ba.endian = Endian.BIG_ENDIAN;
             ba.position = 0;
-            Assert.assertEquals("BinaryData readByte: should be 0", 0, ba.readByte());
-            Assert.assertEquals("BinaryData readShort: should be 258", 258, ba.readShort());
-            Assert.assertEquals("BinaryData readInt: should be 50595078", 50595078, ba.readInt());
+            assertEquals( 0, ba.readByte(),"BinaryData readByte: should be 0");
+            assertEquals( 258, ba.readShort(),"BinaryData readShort: should be 258");
+            assertEquals( 50595078, ba.readInt(), "BinaryData readInt: should be 50595078");
             ba.endian = Endian.LITTLE_ENDIAN;
             ba.position = 0;
-            Assert.assertEquals("BinaryData readByte: should be 0", 0, ba.readByte());
-            Assert.assertEquals("BinaryData readShort: should be 513", 513, ba.readShort());
-            Assert.assertEquals("BinaryData readInt: should be 100992003", 100992003, ba.readInt());
-            
+            assertEquals( 0, ba.readByte(), "BinaryData readByte: should be 0");
+            assertEquals( 513, ba.readShort(),"BinaryData readShort: should be 513");
+            assertEquals(100992003, ba.readInt(), "BinaryData readInt: should be 100992003");
+        
             ba = new BinaryData();
             ba.writeByte(25);
             ba.writeShort(65535);
             ba.writeUnsignedInt(4294967295);
             ba.position = 0;
-            Assert.assertEquals("BinaryData readByte: should be 25", 25, ba.readByte());
-            Assert.assertEquals("BinaryData readUnsignedShort: should be 65535", 65535, ba.readUnsignedShort());
-            Assert.assertEquals("BinaryData readInt: should be 4294967295", 4294967295, ba.readUnsignedInt());
-            
+            assertEquals(25, ba.readByte(), "BinaryData readByte: should be 25");
+            assertEquals(65535, ba.readUnsignedShort(), "BinaryData readUnsignedShort: should be 65535");
+            assertEquals( 4294967295, ba.readUnsignedInt(), "BinaryData readInt: should be 4294967295");
+        
             ba = new BinaryData();
             ba.writeByte(-25);
             ba.writeShort(-1029);
@@ -614,21 +613,20 @@ package flexUnitTests.core
             ba.writeFloat(12345.2);
             ba.writeDouble(3.1415927410);
             ba.position = 0;
-            Assert.assertEquals("BinaryData readByte: should be -25", -25, ba.readByte());
-            Assert.assertEquals("BinaryData readShort: should be -1029", -1029, ba.readShort());
-            Assert.assertEquals("BinaryData readInt: should be -131072", -131072, ba.readInt());
-            Assert.assertEquals("BinaryData readFloat: should be 12345.2", 12345.2, Math.round(ba.readFloat() * 100) / 100);
-            Assert.assertEquals("BinaryData readDouble: should be 3.1415927410", 3.1415927410, ba.readDouble());
+            assertEquals(-25, ba.readByte(), "BinaryData readByte: should be -25");
+            assertEquals( -1029, ba.readShort(), "BinaryData readShort: should be -1029");
+            assertEquals( -131072, ba.readInt(), "BinaryData readInt: should be -131072");
+            assertEquals( 12345.2, Math.round(ba.readFloat() * 100) / 100, "BinaryData readFloat: should be 12345.2");
+            assertEquals( 3.1415927410, ba.readDouble(), "BinaryData readDouble: should be 3.1415927410");
             ba = new BinaryData()
             ba.writeFloat(12345.2);
             ba.position = 0;
-            Assert.assertEquals("BinaryData readFloat: should be 12345.2", 12345.2, Math.round(ba.readFloat() * 100) / 100);
+            assertEquals( 12345.2, Math.round(ba.readFloat() * 100) / 100, "BinaryData readFloat: should be 12345.2");
             ba.position = 0;
             ba.writeDouble(3.1415927410);
             ba.position = 0;
-            Assert.assertEquals("BinaryData readDouble: should be 3.1415927410", 3.1415927410, ba.readDouble());
+            assertEquals( 3.1415927410, ba.readDouble(), "BinaryData readDouble: should be 3.1415927410");
         }
-        
-        
-    }
+
+}
 }
diff --git a/manualtests/UnitTests/src/main/royale/flexUnitTests/core/StrandTesterTest.as b/manualtests/UnitTests/src/main/royale/flexUnitTests/core/StrandTesterTest.as
index 8d09d33..74cc20f 100644
--- a/manualtests/UnitTests/src/main/royale/flexUnitTests/core/StrandTesterTest.as
+++ b/manualtests/UnitTests/src/main/royale/flexUnitTests/core/StrandTesterTest.as
@@ -18,8 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package flexUnitTests.core
 {
-    import flexunit.framework.Assert;
-    
+    import org.apache.royale.test.asserts.*;
     import org.apache.royale.core.Strand;
     
     public class StrandTesterTest
@@ -49,7 +48,7 @@ package flexUnitTests.core
         {
             var strand:Strand = new Strand();
             strand.id = "foo";
-            Assert.assertEquals("Error testing Srand.id", "foo", strand.id);
+            assertEquals(strand.id, "foo", "Error testing Srand.id");
         }
     }
 }
diff --git a/manualtests/UnitTests/src/main/royale/flexUnitTests/network/AMFBinaryDataTesterTest.as b/manualtests/UnitTests/src/main/royale/flexUnitTests/network/AMFBinaryDataTesterTest.as
index 98a2ca8..144d034 100644
--- a/manualtests/UnitTests/src/main/royale/flexUnitTests/network/AMFBinaryDataTesterTest.as
+++ b/manualtests/UnitTests/src/main/royale/flexUnitTests/network/AMFBinaryDataTesterTest.as
@@ -28,7 +28,7 @@ package flexUnitTests.network
     import flexUnitTests.network.support.TestClass4;
     import flexUnitTests.network.support.DynamicTestClass;
     
-    import flexunit.framework.Assert;
+    import org.apache.royale.test.asserts.*;
     
     import org.apache.royale.net.remoting.amf.AMFBinaryData;
     import org.apache.royale.reflection.*;
@@ -94,11 +94,11 @@ package flexUnitTests.network
             
             ba.writeObject(testString);
             
-            Assert.assertEquals("post-write length was not correct", ba.length, 12);
-            Assert.assertEquals("post-write position was not correct", ba.position, 12);
+            assertEquals( ba.length, 12, "post-write length was not correct");
+            assertEquals( ba.position, 12, "post-write position was not correct");
             ba.position = 0;
             var readString:String = ba.readObject() as String;
-            Assert.assertEquals("post-write read of written string was not correct", readString, testString);
+            assertEquals( readString, testString, "post-write read of written string was not correct");
         }
         
         [Test]
@@ -109,12 +109,12 @@ package flexUnitTests.network
             ba.writeObject(false);
             ba.writeObject(true);
             
-            Assert.assertEquals("post-write length was not correct", ba.length, 2);
-            Assert.assertEquals("post-write position was not correct", ba.position, 2);
+            assertEquals( ba.length, 2, "post-write length was not correct");
+            assertEquals( ba.position, 2, "post-write position was not correct");
             ba.position = 0;
             
-            Assert.assertTrue("post-write read of written boolean was not correct", ba.readObject() === false);
-            Assert.assertTrue("post-write read of written boolean was not correct", ba.readObject() === true);
+            assertTrue( ba.readObject() === false, "post-write read of written boolean was not correct");
+            assertTrue( ba.readObject() === true, "post-write read of written boolean was not correct");
         }
         
         [Test]
@@ -131,33 +131,33 @@ package flexUnitTests.network
             ba.writeObject(Infinity);
             ba.writeObject(-Infinity);
             
-            Assert.assertEquals("post-write length was not correct", ba.length, 52);
-            Assert.assertEquals("post-write position was not correct", ba.position, 52);
+            assertEquals( ba.length, 52, "post-write length was not correct");
+            assertEquals( ba.position, 52, "post-write position was not correct");
             ba.position = 0;
             
             var num:Number = ba.readObject();
-            Assert.assertTrue("post-write read of written Number was not correct", (num is Number));
-            Assert.assertTrue("post-write read of written Number was not correct", isNaN(num));
+            assertTrue( (num is Number), "post-write read of written Number was not correct");
+            assertTrue( isNaN(num), "post-write read of written Number was not correct");
             num = ba.readObject();
-            Assert.assertTrue("post-write read of written Number was not correct", (num is Number));
-            Assert.assertTrue("post-write read of written Number was not correct", num === 1.0);
+            assertTrue( (num is Number), "post-write read of written Number was not correct");
+            assertTrue( num === 1.0, "post-write read of written Number was not correct");
             num = ba.readObject();
-            Assert.assertTrue("post-write read of written Number was not correct", (num is Number));
-            Assert.assertTrue("post-write read of written Number was not correct", num === -1.0);
+            assertTrue( (num is Number), "post-write read of written Number was not correct");
+            assertTrue( num === -1.0, "post-write read of written Number was not correct");
             num = ba.readObject();
-            Assert.assertTrue("post-write read of written Number was not correct", (num is Number));
-            Assert.assertTrue("post-write read of written Number was not correct", num === 1.5);
+            assertTrue( (num is Number), "post-write read of written Number was not correct");
+            assertTrue( num === 1.5, "post-write read of written Number was not correct");
             num = ba.readObject();
-            Assert.assertTrue("post-write read of written Number was not correct", (num is Number));
-            Assert.assertTrue("post-write read of written Number was not correct", num === -1.5);
+            assertTrue( (num is Number), "post-write read of written Number was not correct");
+            assertTrue( num === -1.5, "post-write read of written Number was not correct");
             num = ba.readObject();
-            Assert.assertTrue("post-write read of written Number was not correct", (num is Number));
-            Assert.assertTrue("post-write read of written Number was not correct", !isFinite(num));
-            Assert.assertTrue("post-write read of written Number was not correct", (num > 0));
+            assertTrue( (num is Number), "post-write read of written Number was not correct");
+            assertTrue( !isFinite(num), "post-write read of written Number was not correct");
+            assertTrue( (num > 0), "post-write read of written Number was not correct");
             num = ba.readObject();
-            Assert.assertTrue("post-write read of written Number was not correct", (num is Number));
-            Assert.assertTrue("post-write read of written Number was not correct", !isFinite(num));
-            Assert.assertTrue("post-write read of written Number was not correct", (num < 0));
+            assertTrue( (num is Number), "post-write read of written Number was not correct");
+            assertTrue( !isFinite(num), "post-write read of written Number was not correct");
+            assertTrue( (num < 0), "post-write read of written Number was not correct");
         }
         
         
@@ -168,48 +168,48 @@ package flexUnitTests.network
             var instance:Array = [];
             ba.writeObject(instance);
             
-            Assert.assertEquals("post-write length was not correct", ba.length, 3);
-            Assert.assertEquals("post-write position was not correct", ba.position, 3);
+            assertEquals( ba.length, 3, "post-write length was not correct");
+            assertEquals( ba.position, 3, "post-write position was not correct");
             
             instance = [99];
             ba.length = 0;
             ba.writeObject(instance);
             ba.position = 0;
-            Assert.assertTrue("post-write bytes did not match expected data", bytesMatchExpectedData(ba, [9, 3, 1, 4, 99]));
+            assertTrue( bytesMatchExpectedData(ba, [9, 3, 1, 4, 99]), "post-write bytes did not match expected data");
             instance = ba.readObject() as Array;
-            Assert.assertTrue("post-write read did not match expected result", instance.length == 1 && instance[0] == 99);
+            assertTrue( instance.length == 1 && instance[0] == 99, "post-write read did not match expected result");
             //sparse array
             instance = [];
             instance[100] = '100';
             ba.length = 0;
             ba.writeObject(instance);
-            Assert.assertEquals("post-write length was not correct", ba.length, 9);
-            Assert.assertEquals("post-write position was not correct", ba.position, 9);
-            Assert.assertTrue("post-write bytes did not match expected data", bytesMatchExpectedData(ba, [9, 1, 7, 49, 48, 48, 6, 0, 1]));
+            assertEquals( ba.length, 9, "post-write length was not correct");
+            assertEquals( ba.position, 9, "post-write position was not correct");
+            assertTrue( bytesMatchExpectedData(ba, [9, 1, 7, 49, 48, 48, 6, 0, 1]), "post-write bytes did not match expected data");
             //check that read matches
             ba.position = 0;
             instance = ba.readObject();
             
-            Assert.assertEquals("post-write read was not correct", instance.length, 101);
-            Assert.assertEquals("post-write read was not correct", instance[100], '100');
-            Assert.assertTrue("post-write read was not correct", instance[0] === undefined);
+            assertEquals( instance.length, 101, "post-write read was not correct");
+            assertEquals( instance[100], '100', "post-write read was not correct");
+            assertTrue( instance[0] === undefined, "post-write read was not correct");
             //sparse with associative content
             instance = [];
             instance['test'] = true;
             instance[10] = 'I am number 10';
             ba.length = 0;
             ba.writeObject(instance);
-            Assert.assertEquals("post-write length was not correct", ba.length, 28);
-            Assert.assertEquals("post-write position was not correct", ba.position, 28);
-            Assert.assertTrue("post-write bytes did not match expected data", bytesMatchExpectedData(ba, [9, 1, 5, 49, 48, 6, 29, 73, 32, 97, 109, 32, 110, 117, 109, 98, 101, 114, 32, 49, 48, 9, 116, 101, 115, 116, 3, 1]));
+            assertEquals( ba.length, 28, "post-write length was not correct");
+            assertEquals( ba.position, 28, "post-write position was not correct");
+            assertTrue( bytesMatchExpectedData(ba, [9, 1, 5, 49, 48, 6, 29, 73, 32, 97, 109, 32, 110, 117, 109, 98, 101, 114, 32, 49, 48, 9, 116, 101, 115, 116, 3, 1]), "post-write bytes did not match expected data");
             
             //check that read matches
             ba.position = 0;
             instance = ba.readObject();
-            Assert.assertEquals("post-write read was not correct", instance.length, 11);
-            Assert.assertEquals("post-write read was not correct", instance[10], 'I am number 10');
-            Assert.assertEquals("post-write read was not correct", instance['test'], true);
-            Assert.assertTrue("post-write read was not correct", instance[0] === undefined);
+            assertEquals( instance.length, 11, "post-write read was not correct");
+            assertEquals( instance[10], 'I am number 10', "post-write read was not correct");
+            assertEquals( instance['test'], true, "post-write read was not correct");
+            assertTrue( instance[0] === undefined, "post-write read was not correct");
             
             //edge cases
             instance = [];
@@ -219,24 +219,24 @@ package flexUnitTests.network
             instance['test'] = true;
             ba.length = 0;
             ba.writeObject(instance);
-            Assert.assertEquals("post-write length was not correct", ba.length, 12);
-            Assert.assertEquals("post-write position was not correct", ba.position, 12);
+            assertEquals( ba.length, 12, "post-write length was not correct");
+            assertEquals( ba.position, 12, "post-write position was not correct");
             
-            Assert.assertTrue("post-write bytes did not match expected data", bytesMatchExpectedData(ba, [9, 1, 3, 49, 3, 9, 116, 101, 115, 116, 3, 1]));
+            assertTrue( bytesMatchExpectedData(ba, [9, 1, 3, 49, 3, 9, 116, 101, 115, 116, 3, 1]), "post-write bytes did not match expected data");
             
             //empty array with length
             instance = new Array(100);
-            Assert.assertEquals("pre-write array length was not correct", instance.length, 100);
+            assertEquals( instance.length, 100, "pre-write array length was not correct");
             ba.length = 0;
             ba.writeObject(instance);
-            Assert.assertEquals("post-write length was not correct", ba.length, 3);
-            Assert.assertEquals("post-write position was not correct", ba.position, 3);
-            Assert.assertTrue("post-write bytes did not match expected data", bytesMatchExpectedData(ba, [9, 1, 1]));
+            assertEquals( ba.length, 3, "post-write length was not correct");
+            assertEquals( ba.position, 3, "post-write position was not correct");
+            assertTrue( bytesMatchExpectedData(ba, [9, 1, 1]), "post-write bytes did not match expected data");
             
             ba.position = 0;
             instance = ba.readObject() as Array;
             //although the Array had a length of 100 on write, it has length zero on read:
-            Assert.assertTrue("post-write read did not match expected value", instance.length == 0);
+            assertTrue( instance.length == 0, "post-write read did not match expected value");
             
             var ar:Array = [1, 2, 3];
             var f:Function = function ():void
@@ -246,27 +246,27 @@ package flexUnitTests.network
             ar['__AS3__.vec'] = f;
             ba.length = 0;
             ba.writeObject(ar);
-            Assert.assertEquals("post-write length was not correct", ba.length, 9);
-            Assert.assertEquals("post-write position was not correct", ba.position, 9);
-            Assert.assertTrue("post-write bytes did not match expected data", bytesMatchExpectedData(ba, [9, 7, 1, 4, 1, 4, 2, 4, 3]));
+            assertEquals( ba.length, 9, "post-write length was not correct");
+            assertEquals( ba.position, 9, "post-write position was not correct");
+            assertTrue( bytesMatchExpectedData(ba, [9, 7, 1, 4, 1, 4, 2, 4, 3]), "post-write bytes did not match expected data");
             ar = [f, 1, 2, 3, f];
             ba.length = 0;
             ba.writeObject(ar);
-            Assert.assertEquals("post-write length was not correct", ba.length, 15);
-            Assert.assertEquals("post-write position was not correct", ba.position, 15);
-            Assert.assertTrue("post-write bytes did not match expected data", bytesMatchExpectedData(ba, [9, 1, 3, 49, 4, 1, 3, 50, 4, 2, 3, 51, 4, 3, 1]));
+            assertEquals( ba.length, 15, "post-write length was not correct");
+            assertEquals( ba.position, 15, "post-write position was not correct");
+            assertTrue( bytesMatchExpectedData(ba, [9, 1, 3, 49, 4, 1, 3, 50, 4, 2, 3, 51, 4, 3, 1]), "post-write bytes did not match expected data");
             //post write read is an array with length of 4 instead of 5.
             ba.position = 0;
             ar = ba.readObject();
-            Assert.assertEquals("post-write read length was not correct", ar.length, 4);
+            assertEquals( ar.length, 4, "post-write read length was not correct");
             
             
             ar = [Object, 1, 2, 3, Object];
             ba.length = 0;
             ba.writeObject(ar);
-            Assert.assertEquals("post-write length was not correct", ba.length, 15);
-            Assert.assertEquals("post-write position was not correct", ba.position, 15);
-            Assert.assertTrue("post-write bytes did not match expected data", bytesMatchExpectedData(ba, [9, 11, 1, 10, 11, 1, 1, 4, 1, 4, 2, 4, 3, 10, 2]));
+            assertEquals( ba.length, 15, "post-write length was not correct");
+            assertEquals( ba.position, 15, "post-write position was not correct");
+            assertTrue( bytesMatchExpectedData(ba, [9, 11, 1, 10, 11, 1, 1, 4, 1, 4, 2, 4, 3, 10, 2]), "post-write bytes did not match expected data");
             
             
         }
@@ -280,13 +280,13 @@ package flexUnitTests.network
             var instance:Object = {};
             ba.writeObject(instance);
             
-            Assert.assertEquals("post-write length was not correct", ba.length, 4);
-            Assert.assertEquals("post-write position was not correct", ba.position, 4);
+            assertEquals( ba.length, 4, "post-write length was not correct");
+            assertEquals( ba.position, 4, "post-write position was not correct");
             ba.position = 0;
             
-            Assert.assertTrue("post-write bytes did not match expected data", bytesMatchExpectedData(ba, [10, 11, 1, 1]));
+            assertTrue( bytesMatchExpectedData(ba, [10, 11, 1, 1]), "post-write bytes did not match expected data");
             instance = ba.readObject();
-            Assert.assertTrue("post-write read did not match expected result", dynamicKeyCountMatches(instance, 0));
+            assertTrue( dynamicKeyCountMatches(instance, 0), "post-write read did not match expected result");
             
             var obj1:Object = {test: true};
             var obj2:Object = {test: 'maybe'};
@@ -294,7 +294,7 @@ package flexUnitTests.network
             ba.length = 0;
             ba.writeObject([obj1, obj2, obj3]);
             ba.position = 0;
-            Assert.assertTrue("post-write bytes did not match expected data", bytesMatchExpectedData(ba, [9, 7, 1, 10, 11, 1, 9, 116, 101, 115, 116, 3, 1, 10, 1, 0, 6, 11, 109, 97, 121, 98, 101, 1, 10, 1, 0, 3, 1]));
+            assertTrue( bytesMatchExpectedData(ba, [9, 7, 1, 10, 11, 1, 9, 116, 101, 115, 116, 3, 1, 10, 1, 0, 6, 11, 109, 97, 121, 98, 101, 1, 10, 1, 0, 3, 1]), "post-write bytes did not match expected data");
             
         }
         
@@ -309,14 +309,14 @@ package flexUnitTests.network
             };
             ba.writeObject(instance);
             
-            Assert.assertEquals("post-write length was not correct", ba.length, 1);
-            Assert.assertEquals("post-write position was not correct", ba.position, 1);
+            assertEquals( ba.length, 1, "post-write length was not correct");
+            assertEquals( ba.position, 1, "post-write position was not correct");
             ba.position = 0;
             
-            Assert.assertTrue("post-write bytes did not match expected data", bytesMatchExpectedData(ba, [0]));
+            assertTrue( bytesMatchExpectedData(ba, [0]), "post-write bytes did not match expected data");
             instance = ba.readObject();
             
-            Assert.assertTrue("post-write read did not match expected result", instance === null);
+            assertTrue( instance === null, "post-write read did not match expected result");
             
             //for a property that has a function value, the property is also undefined
             var objectWithFunction:Object = {
@@ -327,14 +327,14 @@ package flexUnitTests.network
             ba.length = 0;
             ba.writeObject(objectWithFunction);
             
-            Assert.assertEquals("post-write length was not correct", ba.length, 4);
-            Assert.assertEquals("post-write position was not correct", ba.position, 4);
+            assertEquals( ba.length, 4, "post-write length was not correct");
+            assertEquals( ba.position, 4, "post-write position was not correct");
             ba.position = 0;
-            Assert.assertTrue("post-write bytes did not match expected data", bytesMatchExpectedData(ba, [10, 11, 1, 1]));
+            assertTrue( bytesMatchExpectedData(ba, [10, 11, 1, 1]), "post-write bytes did not match expected data");
             
             //the dynamic deserialized object has no key for the function value
             var obj:Object = ba.readObject();
-            Assert.assertTrue("post-write read did not match expected result", dynamicKeyCountMatches(obj, 0));
+            assertTrue( dynamicKeyCountMatches(obj, 0), "post-write read did not match expected result");
             
             ba.length = 0;
             var tc4:TestClass4 = new TestClass4();
@@ -343,10 +343,10 @@ package flexUnitTests.network
             };
             
             ba.writeObject(tc4);
-            Assert.assertEquals("post-write length was not correct", ba.length, 15);
-            Assert.assertEquals("post-write position was not correct", ba.position, 15);
+            assertEquals( ba.length, 15, "post-write length was not correct");
+            assertEquals( ba.position, 15, "post-write position was not correct");
             
-            Assert.assertTrue("post-write bytes did not match expected data", bytesMatchExpectedData(ba, [10, 19, 1, 21, 116, 101, 115, 116, 70, 105, 101, 108, 100, 49, 0]));
+            assertTrue( bytesMatchExpectedData(ba, [10, 19, 1, 21, 116, 101, 115, 116, 70, 105, 101, 108, 100, 49, 0]), "post-write bytes did not match expected data");
             
         }
         
@@ -362,26 +362,26 @@ package flexUnitTests.network
             var instance:TestClass1 = new TestClass1();
             ba.writeObject(instance);
             
-            Assert.assertEquals("post-write length was not correct", ba.length, 16);
-            Assert.assertEquals("post-write position was not correct", ba.position, 16);
+            assertEquals( ba.length, 16, "post-write length was not correct");
+            assertEquals( ba.position, 16, "post-write position was not correct");
             
             ba.position = 0;
-            Assert.assertTrue("post-write bytes did not match expected data", bytesMatchExpectedData(ba, [10, 19, 1, 21, 116, 101, 115, 116, 70, 105, 101, 108, 100, 49, 6, 1]));
+            assertTrue( bytesMatchExpectedData(ba, [10, 19, 1, 21, 116, 101, 115, 116, 70, 105, 101, 108, 100, 49, 6, 1]), "post-write bytes did not match expected data");
             ba.position = 0;
             
             var anonObject:Object = ba.readObject();
             
-            Assert.assertTrue('post-write read did not match expected value', anonObject['testField1'] === instance.testField1);
+            assertTrue(anonObject['testField1'] === instance.testField1, "post-write read did not match expected value" );
             
             var multipleDifferentInstances:Array = [new TestClass1(), new TestClass2()];
             ba.length = 0;
             ba.writeObject(multipleDifferentInstances);
             
-            Assert.assertEquals("post-write length was not correct", ba.length, 24);
-            Assert.assertEquals("post-write position was not correct", ba.position, 24);
+            assertEquals( ba.length, 24, "post-write length was not correct");
+            assertEquals( ba.position, 24, "post-write position was not correct");
             ba.position = 0;
             
-            Assert.assertTrue("post-write bytes did not match expected data", bytesMatchExpectedData(ba, [9, 5, 1, 10, 19, 1, 21, 116, 101, 115, 116, 70, 105, 101, 108, 100, 49, 6, 1, 10, 19, 1, 0, 3]));
+            assertTrue( bytesMatchExpectedData(ba, [9, 5, 1, 10, 19, 1, 21, 116, 101, 115, 116, 70, 105, 101, 108, 100, 49, 6, 1, 10, 19, 1, 0, 3]), "post-write bytes did not match expected data");
             
         }
         
@@ -392,21 +392,21 @@ package flexUnitTests.network
             var instance:DynamicTestClass = new DynamicTestClass();
             ba.writeObject(instance);
             
-            Assert.assertEquals("post-write length was not correct", ba.length, 25);
-            Assert.assertEquals("post-write position was not correct", ba.position, 25);
+            assertEquals( ba.length, 25, "post-write length was not correct");
+            assertEquals( ba.position, 25, "post-write position was not correct");
             ba.position = 0;
-            Assert.assertTrue("post-write bytes did not match expected data", bytesMatchExpectedData(ba, [10, 27, 1, 39, 115, 101, 97, 108, 101, 100, 73, 110, 115, 116, 97, 110, 99, 101, 80, 114, 111, 112, 49, 2, 1]));
+            assertTrue( bytesMatchExpectedData(ba, [10, 27, 1, 39, 115, 101, 97, 108, 101, 100, 73, 110, 115, 116, 97, 110, 99, 101, 80, 114, 111, 112, 49, 2, 1]), "post-write bytes did not match expected data");
             
             instance['someDynamicField'] = 'nonSealedPropValue';
             
             ba.writeObject(instance);
-            Assert.assertEquals("post-write length was not correct", ba.length, 62);
-            Assert.assertEquals("post-write position was not correct", ba.position, 62);
+            assertEquals( ba.length, 62, "post-write length was not correct");
+            assertEquals( ba.position, 62, "post-write position was not correct");
             ba.position = 0;
-            Assert.assertTrue("post-write bytes did not match expected data", bytesMatchExpectedData(ba, [10, 27, 1, 39, 115, 101, 97, 108, 101, 100, 73, 110, 115, 116, 97, 110, 99, 101, 80, 114, 111, 112, 49, 2, 33, 115, 111, 109, 101, 68, 121, 110, 97, 109, 105, 99, 70, 105, 101, 108, 100, 6, 37, 110, 111, 110, 83, 101, 97, 108, 101, 100, 80, 114, 111, 112, 86, 97, 108, 117, 101, 1]));
+            assertTrue( bytesMatchExpectedData(ba, [10, 27, 1, 39, 115, 101, 97, 108, 101, 100, 73, 110, 115, 116, 97, 110, 99, 101, 80, 114, 111, 112, 49, 2, 33, 115, 111, 109, 101, 68, 121, 110, 97, 109, 105, 99, 70, 105, 101, 108, 100, 6, 37, 110, 111, 110, 83, 101, 97, 108, 101, 100, 80, 114, 111, 112, 86, 97, 108, 117, 101, 1]), "post-write bytes did not match expected data");
             
             var instanceAnon:Object = ba.readObject();
-            Assert.assertTrue('post-write read did not match expected value', instanceAnon['someDynamicField'] === 'nonSealedPropValue');
+            assertTrue(instanceAnon['someDynamicField'] === 'nonSealedPropValue', "post-write read did not match expected value");
             
             
         }
@@ -430,10 +430,10 @@ package flexUnitTests.network
             var holder:Array = [source, source];
             
             ba.writeObject(holder);
-            Assert.assertEquals("post-write error length was not correct", ba.length, 33);
-            Assert.assertEquals("post-write error position was not correct", ba.position, 33);
+            assertEquals( ba.length, 33, "post-write error length was not correct");
+            assertEquals( ba.position, 33, "post-write error position was not correct");
             ba.position = 0;
-            Assert.assertTrue("post-write bytes did not match expected data", bytesMatchExpectedData(ba, [9, 5, 1, 12, 53, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 12, 2]));
+            assertTrue( bytesMatchExpectedData(ba, [9, 5, 1, 12, 53, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 12, 2]), "post-write bytes did not match expected data");
         }
         
         
@@ -453,33 +453,33 @@ package flexUnitTests.network
                 err = e;
             }
             
-            Assert.assertTrue("externalizable writing should fail without an alias registered", err != null);
-            Assert.assertEquals("post-write error length was not correct", ba.length, 1);
-            Assert.assertEquals("post-write error position was not correct", ba.position, 1);
+            assertTrue( err != null, "externalizable writing should fail without an alias registered");
+            assertEquals( ba.length, 1, "post-write error length was not correct");
+            assertEquals( ba.position, 1, "post-write error position was not correct");
             ba.position = 0;
-            Assert.assertTrue("post-write bytes did not match expected data", bytesMatchExpectedData(ba, [10]));
+            assertTrue( bytesMatchExpectedData(ba, [10]), "post-write bytes did not match expected data");
             
             ba.length = 0;
             //register an alias
             registerClassAlias('TestClass3', TestClass3);
             ba.writeObject(test3);
-            Assert.assertEquals("post-write length was not correct", ba.length, 18);
-            Assert.assertEquals("post-write position was not correct", ba.position, 18);
+            assertEquals( ba.length, 18, "post-write length was not correct");
+            assertEquals( ba.position, 18, "post-write position was not correct");
             
             ba.position = 0;
-            Assert.assertTrue("post-write bytes did not match expected data", bytesMatchExpectedData(ba, [10, 7, 21, 84, 101, 115, 116, 67, 108, 97, 115, 115, 51, 9, 3, 1, 6, 0]));
+            assertTrue( bytesMatchExpectedData(ba, [10, 7, 21, 84, 101, 115, 116, 67, 108, 97, 115, 115, 51, 9, 3, 1, 6, 0]), "post-write bytes did not match expected data");
             
             test3.content[0] = (test3.content[0]).split("").reverse().join("");
             ba.writeObject(test3);
-            Assert.assertEquals("post-write length was not correct", ba.length, 28);
-            Assert.assertEquals("post-write position was not correct", ba.position, 28);
-            Assert.assertTrue("post-write bytes did not match expected data", bytesMatchExpectedData(ba, [10, 7, 21, 84, 101, 115, 116, 67, 108, 97, 115, 115, 51, 9, 3, 1, 6, 21, 51, 115, 115, 97, 108, 67, 116, 115, 101, 84]));
+            assertEquals( ba.length, 28, "post-write length was not correct");
+            assertEquals( ba.position, 28, "post-write position was not correct");
+            assertTrue( bytesMatchExpectedData(ba, [10, 7, 21, 84, 101, 115, 116, 67, 108, 97, 115, 115, 51, 9, 3, 1, 6, 21, 51, 115, 115, 97, 108, 67, 116, 115, 101, 84]), "post-write bytes did not match expected data");
             
             ba.position = 0;
             var test3Read:TestClass3 = ba.readObject() as TestClass3;
             
             //proof that it created a new instance, and that the reversed content string content is present in the new instance
-            Assert.assertTrue("post-write read did not match expected data", test3Read.content[0] == test3.content[0]);
+            assertTrue( test3Read.content[0] == test3.content[0], "post-write read did not match expected data");
             
         }
         
@@ -494,24 +494,24 @@ package flexUnitTests.network
             
             ba.writeObject(instance);
             
-            Assert.assertEquals("post-write length was not correct", ba.length, 84);
-            Assert.assertEquals("post-write position was not correct", ba.position, 84);
+            assertEquals( ba.length, 84, "post-write length was not correct");
+            assertEquals( ba.position, 84, "post-write position was not correct");
             
             //in this case the order of encoding the dynamic fields is not defined. So we need to account for the valid serialization options of either output sequence of the two fields
             var raining_then_underscore:Array = [10, 27, 1, 39, 115, 101, 97, 108, 101, 100, 73, 110, 115, 116, 97, 110, 99, 101, 80, 114, 111, 112, 49, 2, 15, 114, 97, 105, 110, 105, 110, 103, 6, 27, 99, 97, 116, 115, 32, 97, 110, 100, 32, 100, 111, 103, 115, 23, 95, 117, 110, 100, 101, 114, 115, 99, 111, 114, 101, 6, 45, 112, 115, 101, 117, 100, 111, 32, 45, 32, 112, 114, 105, 118, 97, 116, 101, 32, 118, 97, 108, 117, 101, 1];
             var underscore_then_raining:Array = [10, 27, 1, 39, 115, 101, 97, 108, 101, 100, 73, 110, 115, 116, 97, 110, 99, 101, 80, 114, 111, 112, 49, 2, 23, 95, 117, 110, 100, 101, 114, 115, 99, 111, 114, 101, 6, 45, 112, 115, 101, 117, 100, 111, 32, 45, 32, 112, 114, 105, 118, 97, 116, 101, 32, 118, 97, 108, 117, 101, 15, 114, 97, 105, 110, 105, 110, 103, 6, 27, 99, 97, 116, 115, 32, 97, 110, 100, 32, 100, 111, 103, 115, 1];
             
             ba.position = 0;
-            Assert.assertTrue("post-write bytes did not match expected data", bytesMatchExpectedData(ba, raining_then_underscore) || bytesMatchExpectedData(ba, underscore_then_raining));
+            assertTrue( bytesMatchExpectedData(ba, raining_then_underscore) || bytesMatchExpectedData(ba, underscore_then_raining), "post-write bytes did not match expected data");
             
             //now test the same instance with an IDynamicPropertyWriter that ignores the underscored field, only outputting the 'raining' field
             ba.length = 0;
             AMFBinaryData.dynamicPropertyWriter = new DynamicPropertyWriter();
             ba.writeObject(instance);
-            Assert.assertEquals("post-write length was not correct", ba.length, 48);
-            Assert.assertEquals("post-write position was not correct", ba.position, 48);
+            assertEquals( ba.length, 48, "post-write length was not correct");
+            assertEquals( ba.position, 48, "post-write position was not correct");
             ba.position = 0;
-            Assert.assertTrue("post-write bytes did not match expected data", bytesMatchExpectedData(ba, [10, 27, 1, 39, 115, 101, 97, 108, 101, 100, 73, 110, 115, 116, 97, 110, 99, 101, 80, 114, 111, 112, 49, 2, 15, 114, 97, 105, 110, 105, 110, 103, 6, 27, 99, 97, 116, 115, 32, 97, 110, 100, 32, 100, 111, 103, 115, 1]));
+            assertTrue( bytesMatchExpectedData(ba, [10, 27, 1, 39, 115, 101, 97, 108, 101, 100, 73, 110, 115, 116, 97, 110, 99, 101, 80, 114, 111, 112, 49, 2, 15, 114, 97, 105, 110, 105, 110, 103, 6, 27, 99, 97, 116, 115, 32, 97, 110, 100, 32, 100, 111, 103, 115, 1]), "post-write bytes did not match expected data");
             
             //remove the custom dynamicPropertyWriter
             AMFBinaryData.dynamicPropertyWriter = null;
@@ -530,7 +530,7 @@ package flexUnitTests.network
             var xml2:XML = ba.readObject() as XML;
             
             //javascript toXMLString pretty printing does not match exactly flash...
-            Assert.assertTrue('XML round-tripping failed', xml.toXMLString() === xml2.toXMLString());
+            assertTrue( xml.toXMLString() === xml2.toXMLString(), "XML round-tripping failed");
         }
         
     }
diff --git a/manualtests/UnitTests/src/main/royale/flexUnitTests/observedbugs/ObservedBugTests.as b/manualtests/UnitTests/src/main/royale/flexUnitTests/observedbugs/ObservedBugTests.as
index a0a3f52..af0979f 100644
--- a/manualtests/UnitTests/src/main/royale/flexUnitTests/observedbugs/ObservedBugTests.as
+++ b/manualtests/UnitTests/src/main/royale/flexUnitTests/observedbugs/ObservedBugTests.as
@@ -18,9 +18,10 @@
 ////////////////////////////////////////////////////////////////////////////////
 package flexUnitTests.observedbugs
 {
-    import flexunit.framework.Assert;
+    import org.apache.royale.test.asserts.*;
     
     import org.apache.royale.reflection.*;
+    import org.apache.royale.test.asserts.assertTrue;
     
     /**
      * @royalesuppresspublicvarwarning
@@ -77,7 +78,7 @@ package flexUnitTests.observedbugs
                 js = 2;
             }
             
-            Assert.assertTrue("Unexpected value following try/catch", (isJS ? (js == 2) : (js == 1)));
+            assertTrue( (isJS ? (js == 2) : (js == 1)), "Unexpected value following try/catch");
             
         }
         
@@ -97,7 +98,7 @@ package flexUnitTests.observedbugs
                 js = true;
             }
             
-            Assert.assertTrue("Unexpected value following try/catch", (isJS ? (js === true) : (js === false)));
+            assertTrue( (isJS ? (js === true) : (js === false)), "Unexpected value following try/catch");
         }
     }
 }
diff --git a/manualtests/UnitTests/src/main/royale/flexUnitTests/reflection/ReflectionTesterNativeTypes.as b/manualtests/UnitTests/src/main/royale/flexUnitTests/reflection/ReflectionTesterNativeTypes.as
index d37f38f..8b9d74e 100644
--- a/manualtests/UnitTests/src/main/royale/flexUnitTests/reflection/ReflectionTesterNativeTypes.as
+++ b/manualtests/UnitTests/src/main/royale/flexUnitTests/reflection/ReflectionTesterNativeTypes.as
@@ -18,8 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package flexUnitTests.reflection
 {
-    import flexunit.framework.Assert;
-    
+    import org.apache.royale.test.asserts.*;
     import flexUnitTests.reflection.support.*;
     import org.apache.royale.reflection.*;
     import testshim.RoyaleUnitTestRunner;
@@ -74,11 +73,11 @@ package flexUnitTests.reflection
         [Test]
         public function testArrayClass():void
         {
-            Assert.assertEquals("Unexpected type name", getQualifiedClassName(Array), "Array");
-            Assert.assertEquals("Unexpected type", getDefinitionByName("Array"), Array);
+            assertEquals( getQualifiedClassName(Array), "Array", "Unexpected type name");
+            assertEquals( getDefinitionByName("Array"), Array, "Unexpected type");
             var def:TypeDefinition = describeType(Array);
-            Assert.assertTrue("unexpected value", def.accessors.length == 1);
-            Assert.assertEquals("Unexpected type name", def.name, "Array");
+            assertTrue( def.accessors.length == 1, "unexpected value");
+            assertEquals( def.name, "Array", "Unexpected type name");
         }
     
     
@@ -86,22 +85,22 @@ package flexUnitTests.reflection
         public function testArrayInstance():void
         {
             var inst:Array = [];
-            Assert.assertEquals("Unexpected type name", getQualifiedClassName(inst), "Array");
+            assertEquals( getQualifiedClassName(inst), "Array", "Unexpected type name");
             
             var def:TypeDefinition = describeType([]);
-            Assert.assertTrue("unexpected value", def.accessors.length == 1);
-            Assert.assertEquals("Unexpected type name", def.name, "Array");
+            assertTrue( def.accessors.length == 1, "unexpected value");
+            assertEquals( def.name, "Array", "Unexpected type name");
             
         }
     
         [Test]
         public function testStringClass():void
         {
-            Assert.assertEquals("Unexpected type name", getQualifiedClassName(String), "String");
-            Assert.assertEquals("Unexpected type", getDefinitionByName("String"), String);
+            assertEquals( getQualifiedClassName(String), "String", "Unexpected type name");
+            assertEquals( getDefinitionByName("String"), String, "Unexpected type");
             var def:TypeDefinition = describeType(String);
-            Assert.assertTrue("unexpected value", def.accessors.length == 1);
-            Assert.assertEquals("Unexpected type name", def.name, "String");           
+            assertTrue( def.accessors.length == 1, "unexpected value");
+            assertEquals( def.name, "String", "Unexpected type name");
         }
     
     
@@ -109,22 +108,22 @@ package flexUnitTests.reflection
         public function testStringInstance():void
         {
             var inst:String = '';
-            Assert.assertEquals("Unexpected type name", getQualifiedClassName(inst), "String");
+            assertEquals( getQualifiedClassName(inst), "String", "Unexpected type name");
     
             var def:TypeDefinition = describeType(inst);
-            Assert.assertTrue("unexpected value", def.accessors.length == 1);
-            Assert.assertEquals("Unexpected type name", def.name, "String");
+            assertTrue( def.accessors.length == 1, "unexpected value");
+            assertEquals( def.name, "String", "Unexpected type name");
         }
     
     
         [Test]
         public function testNumberClass():void
         {
-            Assert.assertEquals("Unexpected type name", getQualifiedClassName(Number), "Number");
-            Assert.assertEquals("Unexpected type", getDefinitionByName("Number"), Number);
+            assertEquals( getQualifiedClassName(Number), "Number", "Unexpected type name");
+            assertEquals( getDefinitionByName("Number"), Number, "Unexpected type");
             var def:TypeDefinition = describeType(Number);
-            Assert.assertTrue("unexpected value", def.staticMethods.length == 18);
-            Assert.assertEquals("Unexpected type name", def.name, "Number");
+            assertTrue( def.staticMethods.length == 18, "unexpected value");
+            assertEquals( def.name, "Number", "Unexpected type name");
         }
     
     
@@ -132,12 +131,12 @@ package flexUnitTests.reflection
         public function testNumberInstance():void
         {
             var inst:Number = 1.5;
-            Assert.assertEquals("Unexpected type name", getQualifiedClassName(inst), "Number");
+            assertEquals( getQualifiedClassName(inst), "Number", "Unexpected type name");
             
             var def:TypeDefinition = describeType(inst);
             //This is resolved as Number
-            Assert.assertEquals("Unexpected type name", def.name, "Number");
-            Assert.assertTrue("unexpected value", def.staticMethods.length == 18);
+            assertEquals( def.name, "Number", "Unexpected type name");
+            assertTrue( def.staticMethods.length == 18, "unexpected value");
 
         }
     
@@ -145,11 +144,11 @@ package flexUnitTests.reflection
         public function testIntClass():void
         {
     
-            Assert.assertEquals("Unexpected type name", getQualifiedClassName(int), "int");
-            Assert.assertEquals("Unexpected type", getDefinitionByName("int"), int);
+            assertEquals( getQualifiedClassName(int), "int", "Unexpected type name");
+            assertEquals( getDefinitionByName("int"), int, "Unexpected type");
             var def:TypeDefinition = describeType(int);
             
-            Assert.assertEquals("Unexpected type name", def.name, "int");
+            assertEquals( def.name, "int", "Unexpected type name");
         }
     
     
@@ -158,16 +157,16 @@ package flexUnitTests.reflection
         {
             var inst:int = -268435456;
             
-            Assert.assertEquals("Unexpected type name", getQualifiedClassName(inst), "int");
+            assertEquals( getQualifiedClassName(inst), "int", "Unexpected type name");
             inst-=1;
             //resolves to Number outside boundary:
-            Assert.assertEquals("Unexpected type name", getQualifiedClassName(inst), "Number");
+            assertEquals( getQualifiedClassName(inst), "Number", "Unexpected type name");
             inst = 268435455;
             
-            Assert.assertEquals("Unexpected type name", getQualifiedClassName(inst), "int");
+            assertEquals( getQualifiedClassName(inst), "int", "Unexpected type name");
             inst+=1;
             //resolves to Number outside boundary:
-            Assert.assertEquals("Unexpected type name", getQualifiedClassName(inst), "Number");
+            assertEquals( getQualifiedClassName(inst), "Number", "Unexpected type name");
             inst = -268435456;
             
             var def:TypeDefinition = describeType(inst);
@@ -175,18 +174,18 @@ package flexUnitTests.reflection
             //    RoyaleUnitTestRunner.consoleOut('def name is '+def.name);
 
             //This is treated as Number
-            Assert.assertEquals("Unexpected type name", def.name, "int");
+            assertEquals( def.name, "int", "Unexpected type name");
         
         }
     
         [Test]
         public function testUintClass():void
         {
-            Assert.assertEquals("Unexpected type name", getQualifiedClassName(uint), "uint");
-            Assert.assertEquals("Unexpected type", getDefinitionByName("uint"), uint);
+            assertEquals( getQualifiedClassName(uint), "uint", "Unexpected type name");
+            assertEquals( getDefinitionByName("uint"), uint, "Unexpected type");
             
             var def:TypeDefinition = describeType(uint);
-            Assert.assertEquals("Unexpected type name", def.name, "uint");
+            assertEquals( def.name, "uint", "Unexpected type name");
         
         }
     
@@ -196,11 +195,11 @@ package flexUnitTests.reflection
         {
             var inst:uint = 1;
             //resolves to Number:
-            Assert.assertEquals("Unexpected type name", getQualifiedClassName(inst), "int");
+            assertEquals( getQualifiedClassName(inst), "int", "Unexpected type name");
     
             var def:TypeDefinition = describeType(inst);
             //This is treated as Number
-            Assert.assertEquals("Unexpected type name", def.name, "int");
+            assertEquals( def.name, "int", "Unexpected type name");
         
         }
     
@@ -208,11 +207,11 @@ package flexUnitTests.reflection
         [Test]
         public function testSpecificVectorClass():void
         {
-            Assert.assertEquals("Unexpected type name", getQualifiedClassName(Vector.<uint>), "Vector.<uint>");
-            Assert.assertEquals("Unexpected type", getDefinitionByName("Vector.<uint>"), Vector.<uint>);
+            assertEquals( getQualifiedClassName(Vector.<uint>), "Vector.<uint>", "Unexpected type name");
+            assertEquals( getDefinitionByName("Vector.<uint>"), Vector.<uint>, "Unexpected type");
             var def:TypeDefinition = describeType(Vector.<uint>);
          //   RoyaleUnitTestRunner.consoleOut(def.toString(true));
-            Assert.assertEquals("Unexpected type name", def.name, "Vector.<uint>");
+            assertEquals( def.name, "Vector.<uint>", "Unexpected type name");
             
         }
     
@@ -222,10 +221,10 @@ package flexUnitTests.reflection
         {
             var inst:Vector.<uint> = new Vector.<uint>();
             //resolves to Number:
-            Assert.assertEquals("Unexpected type name", getQualifiedClassName(inst), "Vector.<uint>");
+            assertEquals( getQualifiedClassName(inst), "Vector.<uint>", "Unexpected type name");
             
             var def:TypeDefinition = describeType(inst);
-            Assert.assertEquals("Unexpected type name", def.name, "Vector.<uint>");
+            assertEquals( def.name, "Vector.<uint>", "Unexpected type name");
         
         }
         
diff --git a/manualtests/UnitTests/src/main/royale/flexUnitTests/reflection/ReflectionTesterTest.as b/manualtests/UnitTests/src/main/royale/flexUnitTests/reflection/ReflectionTesterTest.as
index 452c3cd..c8b34de 100644
--- a/manualtests/UnitTests/src/main/royale/flexUnitTests/reflection/ReflectionTesterTest.as
+++ b/manualtests/UnitTests/src/main/royale/flexUnitTests/reflection/ReflectionTesterTest.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package flexUnitTests.reflection
 {
-    import flexunit.framework.Assert;
+    import org.apache.royale.test.asserts.*;
     
     import flexUnitTests.reflection.support.*;
     
@@ -92,56 +92,55 @@ package flexUnitTests.reflection
         {
             var def:TypeDefinition = describeType(TestClass2);
             
-            Assert.assertEquals("Unexpected package name", def.packageName, "flexUnitTests.reflection.support");
-            Assert.assertEquals("Unexpected type name", def.name, "TestClass2");
+            assertEquals( def.packageName, "flexUnitTests.reflection.support", "Unexpected package name");
+            assertEquals( def.name, "TestClass2", "Unexpected type name");
             
             var variables:Array = def.variables;
-            Assert.assertEquals("unexpected variables length", 1, variables.length);
+            assertEquals( 1, variables.length, "unexpected variables length");
             
             
             var methods:Array = def.methods;
-            Assert.assertEquals("unexpected methods length", 2, methods.length);
+            assertEquals( 2, methods.length, "unexpected methods length");
             
             var accessors:Array = def.accessors;
-            Assert.assertEquals("unexpected accessors length", 3, accessors.length);
+            assertEquals( 3, accessors.length, "unexpected accessors length");
             
             var constructor:MethodDefinition = def.constructorMethod;
-            Assert.assertEquals("unexpected constructor declaredBy",
-                    "flexUnitTests.reflection.support.TestClass2",
-                    constructor.declaredBy.qualifiedName);
+            assertEquals( constructor.declaredBy.qualifiedName,
+                    "flexUnitTests.reflection.support.TestClass2", "unexpected constructor declaredBy");
             
-            Assert.assertEquals("unexpected constructor params",
+            assertEquals(
                     1,
-                    constructor.parameters.length);
+                    constructor.parameters.length, "unexpected constructor params");
             
             var meta:Array = def.retrieveMetaDataByName("TestMeta");
-            Assert.assertEquals("unexpected class specific meta length",
+            assertEquals(
                     1,
-                    meta.length);
+                    meta.length, "unexpected class specific meta length");
             
             
             def = describeType(TestClass4);
-            Assert.assertEquals("Unexpected package name", def.packageName, "flexUnitTests.reflection.support");
-            Assert.assertEquals("Unexpected type name", def.name, "TestClass4");
+            assertEquals( def.packageName, "flexUnitTests.reflection.support", "Unexpected package name");
+            assertEquals( def.name, "TestClass4", "Unexpected type name");
             
             variables = def.variables;
-            Assert.assertEquals("unexpected variables length", 2, variables.length);
+            assertEquals( 2, variables.length, "unexpected variables length");
             
             
             methods = def.methods;
-            Assert.assertEquals("unexpected methods length", 4, methods.length);
+            assertEquals( 4, methods.length, "unexpected methods length");
             
             accessors = def.accessors;
-            Assert.assertEquals("unexpected accessors length", 6, accessors.length);
+            assertEquals( 6, accessors.length, "unexpected accessors length");
             
             constructor = def.constructorMethod;
-            Assert.assertEquals("unexpected constructor declaredBy",
+            assertEquals(
                     "flexUnitTests.reflection.support.TestClass4",
-                    constructor.declaredBy.qualifiedName);
+                    constructor.declaredBy.qualifiedName, "unexpected constructor declaredBy");
             
-            Assert.assertEquals("unexpected constructor params",
+            assertEquals(
                     0,
-                    constructor.parameters.length);
+                    constructor.parameters.length, "unexpected constructor params");
             
             
         }
@@ -153,29 +152,29 @@ package flexUnitTests.reflection
         {
             var def:TypeDefinition = describeType(TestClass1);
             var expected:*;
-            Assert.assertEquals("Unexpected package name", "flexUnitTests.reflection.support", def.packageName);
-            Assert.assertEquals("Unexpected type name", def.name, "TestClass1");
+            assertEquals( "flexUnitTests.reflection.support", def.packageName, "Unexpected package name");
+            assertEquals( def.name, "TestClass1", "Unexpected type name");
             
             var variables:Array = def.variables;
-            Assert.assertEquals("unexpected instance variables length", 3, variables.length);
+            assertEquals( 3, variables.length, "unexpected instance variables length");
             
             //there is a difference based on the EventDispatcher inheritance chain differences between js and swf:
             expected = isJS ? 4 : 7;
             var methods:Array = def.methods;
-            Assert.assertEquals("unexpected instance methods length", expected, methods.length);
+            assertEquals( expected, methods.length, "unexpected instance methods length");
             
             var accessors:Array = def.accessors;
-            Assert.assertEquals("unexpected instance accessors length", 4, accessors.length);
+            assertEquals( 4, accessors.length, "unexpected instance accessors length");
             
             var staticVariables:Array = def.staticVariables;
-            Assert.assertEquals("unexpected static variables length", 2, staticVariables.length);
+            assertEquals( 2, staticVariables.length, "unexpected static variables length");
             
             var staticMethods:Array = def.staticMethods;
-            Assert.assertEquals("unexpected static methods length", 1, staticMethods.length);
+            assertEquals( 1, staticMethods.length, "unexpected static methods length");
             //there is a difference based on the native inheritance of readonly 'prototype' not collected from 'Class' (or Object for js):
             expected = isJS ? 3 : 4;
             var staticAccessors:Array = def.staticAccessors;
-            Assert.assertEquals("unexpected static accessors length", expected, staticAccessors.length);
+            assertEquals( expected, staticAccessors.length, "unexpected static accessors length");
             
             
         }
@@ -186,29 +185,29 @@ package flexUnitTests.reflection
         {
             var def:TypeDefinition = describeType(new TestClass1());
             var expected:*;
-            Assert.assertEquals("Unexpected package name", "flexUnitTests.reflection.support", def.packageName);
-            Assert.assertEquals("Unexpected type name", def.name, "TestClass1");
+            assertEquals( "flexUnitTests.reflection.support", def.packageName, "Unexpected package name");
+            assertEquals( def.name, "TestClass1", "Unexpected type name");
             
             var variables:Array = def.variables;
-            Assert.assertEquals("unexpected instance variables length", 3, variables.length);
+            assertEquals( 3, variables.length, "unexpected instance variables length");
             
             //there is a difference based on the EventDispatcher inheritance chain differences between js and swf:
             expected = isJS ? 4 : 7;
             var methods:Array = def.methods;
-            Assert.assertEquals("unexpected instance methods length", expected, methods.length);
+            assertEquals( expected, methods.length, "unexpected instance methods length");
             
             var accessors:Array = def.accessors;
-            Assert.assertEquals("unexpected instance accessors length", 4, accessors.length);
+            assertEquals( 4, accessors.length, "unexpected instance accessors length");
             
             var staticVariables:Array = def.staticVariables;
-            Assert.assertEquals("unexpected static variables length", 2, staticVariables.length);
+            assertEquals( 2, staticVariables.length, "unexpected static variables length");
             
             var staticMethods:Array = def.staticMethods;
-            Assert.assertEquals("unexpected static methods length", 1, staticMethods.length);
+            assertEquals( 1, staticMethods.length, "unexpected static methods length");
             //there is a difference based on the native inheritance of readonly 'prototype' not collected from 'Class' (or Object for js):
             expected = isJS ? 3 : 4;
             var staticAccessors:Array = def.staticAccessors;
-            Assert.assertEquals("unexpected static accessors length", expected, staticAccessors.length);
+            assertEquals( expected, staticAccessors.length, "unexpected static accessors length");
             
             
         }
@@ -221,7 +220,7 @@ package flexUnitTests.reflection
             
             var baseClasses:Array = def.baseClasses;
             var expected:uint = isJS ? 1 : 3;
-            Assert.assertEquals("unexpected baseclasses length", expected, baseClasses.length);
+            assertEquals( expected, baseClasses.length, "unexpected baseclasses length");
         }
         
         
@@ -236,65 +235,65 @@ package flexUnitTests.reflection
             
             var variables:Array = def.variables;
             var variable:VariableDefinition = variables[0];
-            Assert.assertEquals("unexpected variable name", "testVar", variable.name);
+            assertEquals( "testVar", variable.name, "unexpected variable name");
             var meta:MetaDataDefinition = variable.retrieveMetaDataByName("TestMeta")[0];
-            Assert.assertEquals("unexpected meta name", "TestMeta", meta.name);
+            assertEquals( "TestMeta", meta.name, "unexpected meta name");
             
             var metaArg:MetaDataArgDefinition = meta.getArgsByKey("foo")[0];
-            Assert.assertEquals("unexpected meta arg name", "foo", metaArg.name);
-            Assert.assertEquals("unexpected meta arg value", "instanceVariable", metaArg.value);
+            assertEquals( "foo", metaArg.name, "unexpected meta arg name");
+            assertEquals( "instanceVariable", metaArg.value, "unexpected meta arg value");
             
-            //       Assert.assertEquals("unexpected reflection initial variable value","testVar_val",inst[variable.name]);
-            Assert.assertEquals("unexpected reflection initial variable value", "testVar_val", variable.getValue(inst));
+            //       assertEquals("testVar_val",inst[variable.name], "unexpected reflection initial variable value");
+            assertEquals( "testVar_val", variable.getValue(inst), "unexpected reflection initial variable value");
             variable.setValue(inst, "testVar_val_reflection_set");
-            Assert.assertEquals("unexpected reflection initial variable value", "testVar_val_reflection_set", variable.getValue(inst));
+            assertEquals( "testVar_val_reflection_set", variable.getValue(inst), "unexpected reflection initial variable value");
             inst.testVar = "testVar_val";
             
             var accessors:Array = def.accessors;
             var testReadOnly:AccessorDefinition = retrieveItemWithName(accessors, "testReadOnly") as AccessorDefinition;
             meta = testReadOnly.retrieveMetaDataByName("TestMeta")[0];
-            Assert.assertEquals("unexpected meta name", "TestMeta", meta.name);
+            assertEquals( "TestMeta", meta.name, "unexpected meta name");
             
             metaArg = meta.getArgsByKey("foo")[0];
-            Assert.assertEquals("unexpected meta arg name", "foo", metaArg.name);
-            Assert.assertEquals("unexpected meta arg value", "instanceAccessor", metaArg.value);
+            assertEquals( "foo", metaArg.name, "unexpected meta arg name");
+            assertEquals( "instanceAccessor", metaArg.value, "unexpected meta arg value");
             
             /** instance accessors **/
             var testWriteOnly:AccessorDefinition = retrieveItemWithName(accessors, "testWriteOnly") as AccessorDefinition;
             var testReadWrite:AccessorDefinition = retrieveItemWithName(accessors, "testReadWrite") as AccessorDefinition;
-            Assert.assertNotNull(testReadOnly);
-            Assert.assertNotNull(testWriteOnly);
-            Assert.assertNotNull(testReadWrite);
+            assertNotNull(testReadOnly);
+            assertNotNull(testWriteOnly);
+            assertNotNull(testReadWrite);
             
-            Assert.assertEquals("unexpected accessor initial value", "instanceAccessor_initial_value", inst[testReadOnly.name]);
-            Assert.assertEquals("unexpected accessor initial value", "instanceAccessor_initial_value", inst[testReadWrite.name]);
+            assertEquals( "instanceAccessor_initial_value", inst[testReadOnly.name], "unexpected accessor initial value");
+            assertEquals( "instanceAccessor_initial_value", inst[testReadWrite.name], "unexpected accessor initial value");
             
             inst[testWriteOnly.name] = "test";
-            Assert.assertEquals("unexpected accessor initial value", "test", inst[testReadOnly.name]);
-            Assert.assertEquals("unexpected accessor initial value", "test", inst[testReadWrite.name]);
+            assertEquals( "test", inst[testReadOnly.name], "unexpected accessor initial value");
+            assertEquals( "test", inst[testReadWrite.name], "unexpected accessor initial value");
             
             inst[testReadWrite.name] = "test2";
-            Assert.assertEquals("unexpected accessor initial value", "test2", inst[testReadOnly.name]);
-            Assert.assertEquals("unexpected accessor initial value", "test2", inst[testReadWrite.name]);
+            assertEquals( "test2", inst[testReadOnly.name], "unexpected accessor initial value");
+            assertEquals( "test2", inst[testReadWrite.name], "unexpected accessor initial value");
             
             /** instance methods **/
             var methods:Array = def.methods;
             var testMethod:MethodDefinition = retrieveItemWithName(methods, "testMethod") as MethodDefinition;
             meta = testMethod.retrieveMetaDataByName("TestMeta")[0];
-            Assert.assertEquals("unexpected meta name", "TestMeta", meta.name);
+            assertEquals( "TestMeta", meta.name, "unexpected meta name");
             
             metaArg = meta.getArgsByKey("foo")[0];
-            Assert.assertEquals("unexpected meta arg name", "foo", metaArg.name);
-            Assert.assertEquals("unexpected meta arg value", "instanceMethod", metaArg.value);
-            Assert.assertEquals("unexpected parameter count", 0, testMethod.parameters.length);
+            assertEquals( "foo", metaArg.name, "unexpected meta arg name");
+            assertEquals( "instanceMethod", metaArg.value, "unexpected meta arg value");
+            assertEquals( 0, testMethod.parameters.length, "unexpected parameter count");
             inst[testMethod.name]();
-            Assert.assertEquals("unexpected method invocation result", "testMethod was called", inst[testReadWrite.name]);
+            assertEquals( "testMethod was called", inst[testReadWrite.name], "unexpected method invocation result");
             
             var testMethodWithArgs:MethodDefinition = retrieveItemWithName(methods, "testMethodWithArgs") as MethodDefinition;
-            Assert.assertEquals("unexpected parameter count", 2, testMethodWithArgs.parameters.length);
-            Assert.assertTrue("unexpected method invocation result", inst[testMethodWithArgs.name]("test"));
-            Assert.assertFalse("unexpected method invocation result", inst[testMethodWithArgs.name]("test", false));
-            Assert.assertEquals("unexpected method invocation result", "testMethodWithArgs was called", inst[testReadWrite.name]);
+            assertEquals( 2, testMethodWithArgs.parameters.length, "unexpected parameter count");
+            assertTrue( inst[testMethodWithArgs.name]("test"), "unexpected method invocation result");
+            assertFalse( inst[testMethodWithArgs.name]("test", false), "unexpected method invocation result");
+            assertEquals( "testMethodWithArgs was called", inst[testReadWrite.name], "unexpected method invocation result");
             
             
             /** static vars **/
@@ -302,18 +301,18 @@ package flexUnitTests.reflection
             
             
             variable = variables[0];
-            Assert.assertEquals("unexpected variable name", "testStaticVar", variable.name);
+            assertEquals( "testStaticVar", variable.name, "unexpected variable name");
             meta = variable.retrieveMetaDataByName("TestMeta")[0];
-            Assert.assertEquals("unexpected meta name", "TestMeta", meta.name);
+            assertEquals( "TestMeta", meta.name, "unexpected meta name");
             
             metaArg = meta.getArgsByKey("foo")[0];
-            Assert.assertEquals("unexpected meta arg name", "foo", metaArg.name);
-            Assert.assertEquals("unexpected meta arg value", "staticVariable", metaArg.value);
+            assertEquals( "foo", metaArg.name, "unexpected meta arg name");
+            assertEquals( "staticVariable", metaArg.value, "unexpected meta arg value");
             
-            // Assert.assertEquals("unexpected reflection initial variable value","testStaticVar_val",TestClass2[variable.name]);
-            Assert.assertEquals("unexpected reflection initial variable value", "testStaticVar_val", variable.getValue());
+            // assertEquals("testStaticVar_val",TestClass2[variable.name], "unexpected reflection initial variable value");
+            assertEquals( "testStaticVar_val", variable.getValue(), "unexpected reflection initial variable value");
             variable.setValue("testStaticVar_val_reflection_set");
-            Assert.assertEquals("unexpected reflection initial variable value", "testStaticVar_val_reflection_set", variable.getValue());
+            assertEquals( "testStaticVar_val_reflection_set", variable.getValue(), "unexpected reflection initial variable value");
             TestClass2.testStaticVar = "testStaticVar_val";
             
             
@@ -324,49 +323,49 @@ package flexUnitTests.reflection
             
             testReadOnly = retrieveItemWithName(accessors, "testStaticReadOnly") as AccessorDefinition;
             meta = testReadOnly.retrieveMetaDataByName("TestMeta")[0];
-            Assert.assertEquals("unexpected meta name", "TestMeta", meta.name);
+            assertEquals( "TestMeta", meta.name, "unexpected meta name");
             
             metaArg = meta.getArgsByKey("foo")[0];
-            Assert.assertEquals("unexpected meta arg name", "foo", metaArg.name);
-            Assert.assertEquals("unexpected meta arg value", "staticAccessor", metaArg.value);
+            assertEquals( "foo", metaArg.name, "unexpected meta arg name");
+            assertEquals( "staticAccessor", metaArg.value, "unexpected meta arg value");
             
             
             testWriteOnly = retrieveItemWithName(accessors, "testStaticWriteOnly") as AccessorDefinition;
             testReadWrite = retrieveItemWithName(accessors, "testStaticReadWrite") as AccessorDefinition;
-            Assert.assertNotNull(testReadOnly);
-            Assert.assertNotNull(testWriteOnly);
-            Assert.assertNotNull(testReadWrite);
+            assertNotNull(testReadOnly);
+            assertNotNull(testWriteOnly);
+            assertNotNull(testReadWrite);
             
-            Assert.assertEquals("unexpected accessor initial value", "staticAccessor_initial_value", TestClass2[testReadOnly.name]);
-            Assert.assertEquals("unexpected accessor initial value", "staticAccessor_initial_value", TestClass2[testReadWrite.name]);
+            assertEquals( "staticAccessor_initial_value", TestClass2[testReadOnly.name], "unexpected accessor initial value");
+            assertEquals( "staticAccessor_initial_value", TestClass2[testReadWrite.name], "unexpected accessor initial value");
             
             TestClass2[testWriteOnly.name] = "test";
-            Assert.assertEquals("unexpected accessor initial value", "test", TestClass2[testReadOnly.name]);
-            Assert.assertEquals("unexpected accessor initial value", "test", TestClass2[testReadWrite.name]);
+            assertEquals( "test", TestClass2[testReadOnly.name], "unexpected accessor initial value");
+            assertEquals( "test", TestClass2[testReadWrite.name], "unexpected accessor initial value");
             
             TestClass2[testReadWrite.name] = "test2";
-            Assert.assertEquals("unexpected accessor initial value", "test2", TestClass2[testReadOnly.name]);
-            Assert.assertEquals("unexpected accessor initial value", "test2", TestClass2[testReadWrite.name]);
+            assertEquals( "test2", TestClass2[testReadOnly.name], "unexpected accessor initial value");
+            assertEquals( "test2", TestClass2[testReadWrite.name], "unexpected accessor initial value");
             
             
             /** static methods **/
             methods = def.staticMethods;
             testMethod = retrieveItemWithName(methods, "testStaticMethod") as MethodDefinition;
             meta = testMethod.retrieveMetaDataByName("TestMeta")[0];
-            Assert.assertEquals("unexpected meta name", "TestMeta", meta.name);
+            assertEquals( "TestMeta", meta.name, "unexpected meta name");
             
             metaArg = meta.getArgsByKey("foo")[0];
-            Assert.assertEquals("unexpected meta arg name", "foo", metaArg.name);
-            Assert.assertEquals("unexpected meta arg value", "staticMethod", metaArg.value);
-            Assert.assertEquals("unexpected parameter count", 0, testMethod.parameters.length);
+            assertEquals( "foo", metaArg.name, "unexpected meta arg name");
+            assertEquals( "staticMethod", metaArg.value, "unexpected meta arg value");
+            assertEquals( 0, testMethod.parameters.length, "unexpected parameter count");
             TestClass2[testMethod.name]();
-            Assert.assertEquals("unexpected method invocation result", "testStaticMethod was called", TestClass2[testReadWrite.name]);
+            assertEquals( "testStaticMethod was called", TestClass2[testReadWrite.name], "unexpected method invocation result");
             
             testMethodWithArgs = retrieveItemWithName(methods, "testStaticMethodWithArgs") as MethodDefinition;
-            Assert.assertEquals("unexpected parameter count", 2, testMethodWithArgs.parameters.length);
-            Assert.assertTrue("unexpected method invocation result", TestClass2[testMethodWithArgs.name]("test"));
-            Assert.assertFalse("unexpected method invocation result", TestClass2[testMethodWithArgs.name]("test", false));
-            Assert.assertEquals("unexpected method invocation result", "testStaticMethodWithArgs was called", TestClass2[testReadWrite.name]);
+            assertEquals( 2, testMethodWithArgs.parameters.length, "unexpected parameter count");
+            assertTrue( TestClass2[testMethodWithArgs.name]("test"), "unexpected method invocation result");
+            assertFalse( TestClass2[testMethodWithArgs.name]("test", false), "unexpected method invocation result");
+            assertEquals( "testStaticMethodWithArgs was called", TestClass2[testReadWrite.name], "unexpected method invocation result");
             
         }
         
@@ -375,16 +374,16 @@ package flexUnitTests.reflection
         public function testInterfaceReflection():void
         {
             var def:TypeDefinition = describeType(ITestInterface4);
-            Assert.assertEquals("unexpected kind value", "interface", def.kind);
-            Assert.assertEquals("unexpected interfaces length", 3, def.interfaces.length);
-            Assert.assertEquals("unexpected accessors length", 1, def.accessors.length);
-            Assert.assertEquals("unexpected methods length", 1, def.methods.length);
-            
-            Assert.assertEquals("unexpected variables length", 0, def.variables.length);
-            Assert.assertEquals("unexpected staticVariables length", 0, def.staticVariables.length);
-            Assert.assertEquals("unexpected variables length", 0, def.staticMethods.length);
-            Assert.assertEquals("unexpected staticVariables length", 0, def.staticAccessors.length);
-            Assert.assertNull("unexpected constructor Method definition", def.constructorMethod);
+            assertEquals( "interface", def.kind, "unexpected kind value");
+            assertEquals( 3, def.interfaces.length, "unexpected interfaces length");
+            assertEquals( 1, def.accessors.length, "unexpected accessors length");
+            assertEquals( 1, def.methods.length, "unexpected methods length");
+            
+            assertEquals( 0, def.variables.length, "unexpected variables length");
+            assertEquals( 0, def.staticVariables.length, "unexpected staticVariables length");
+            assertEquals( 0, def.staticMethods.length, "unexpected variables length");
+            assertEquals( 0, def.staticAccessors.length, "unexpected staticVariables length");
+            assertNull( def.constructorMethod, "unexpected constructor Method definition");
         }
         
         
diff --git a/manualtests/UnitTests/src/main/royale/flexUnitTests/reflection/ReflectionTesterTestAlias.as b/manualtests/UnitTests/src/main/royale/flexUnitTests/reflection/ReflectionTesterTestAlias.as
index 65a3942..caf3335 100644
--- a/manualtests/UnitTests/src/main/royale/flexUnitTests/reflection/ReflectionTesterTestAlias.as
+++ b/manualtests/UnitTests/src/main/royale/flexUnitTests/reflection/ReflectionTesterTestAlias.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package flexUnitTests.reflection
 {
-    import flexunit.framework.Assert;
+    import org.apache.royale.test.asserts.*;
     
     import flexUnitTests.reflection.support.*;
     
@@ -75,19 +75,19 @@ package flexUnitTests.reflection
         public function testBasicAlias():void
         {
             //no initial alias
-            Assert.assertNull(getAliasByClass(TestClass2));
+            assertNull(getAliasByClass(TestClass2));
             registerClassAlias("fjsTest", TestClass2);
             //alias is registered
-            Assert.assertEquals("unexpected Alias value", "fjsTest", getAliasByClass(TestClass2));
+            assertEquals( "fjsTest", getAliasByClass(TestClass2), "unexpected Alias value");
             //register same alias for another class
             registerClassAlias("fjsTest", TestClass3);
             //original alias mapping is deregistered
-            Assert.assertNull(getAliasByClass(TestClass2));
+            assertNull(getAliasByClass(TestClass2));
             //alias is registered for new class
-            Assert.assertEquals("unexpected Alias value", "fjsTest", getAliasByClass(TestClass3));
+            assertEquals( "fjsTest", getAliasByClass(TestClass3), "unexpected Alias value");
             
             //class is retrievable by alias
-            Assert.assertEquals("unexpected Class value", TestClass3, getClassByAlias("fjsTest"));
+            assertEquals( TestClass3, getClassByAlias("fjsTest"), "unexpected Class value");
             
             
         }
diff --git a/manualtests/UnitTests/src/main/royale/flexUnitTests/reflection/ReflectionTesterTestDynamic.as b/manualtests/UnitTests/src/main/royale/flexUnitTests/reflection/ReflectionTesterTestDynamic.as
index 9d51353..777af15 100644
--- a/manualtests/UnitTests/src/main/royale/flexUnitTests/reflection/ReflectionTesterTestDynamic.as
+++ b/manualtests/UnitTests/src/main/royale/flexUnitTests/reflection/ReflectionTesterTestDynamic.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package flexUnitTests.reflection
 {
-    import flexunit.framework.Assert;
+    import org.apache.royale.test.asserts.*;
     
     import flexUnitTests.reflection.support.*;
     
@@ -80,29 +80,29 @@ package flexUnitTests.reflection
         {
             //class
             
-            Assert.assertTrue("class should be dynamic", isDynamicObject(Object));
+            assertTrue( isDynamicObject(Object), "class should be dynamic");
             
-            Assert.assertTrue("class should be dynamic", isDynamicObject(TestClass1));
+            assertTrue( isDynamicObject(TestClass1), "class should be dynamic");
             //interface is dynamic (even if it doesn't make much sense)
-            Assert.assertTrue("interface should be dynamic", true, isDynamicObject(ITestInterface));
+            assertTrue( isDynamicObject(ITestInterface), "interface should be dynamic");
             //instance
-            Assert.assertTrue("generic object should be dynamic", isDynamicObject({}));
+            assertTrue( isDynamicObject({}), "generic object should be dynamic");
             
-            Assert.assertFalse("sealed class instance should not be dynamic", isDynamicObject(new TestClass1()));
+            assertFalse( isDynamicObject(new TestClass1()), "sealed class instance should not be dynamic");
             
-            Assert.assertTrue("dynamic class instance should be dynamic", isDynamicObject(new DynamicTestClass()));
+            assertTrue( isDynamicObject(new DynamicTestClass()), "dynamic class instance should be dynamic");
             
             
-            Assert.assertFalse("String instance should not be dynamic", isDynamicObject("String"));
-            Assert.assertFalse("int instance should not be dynamic", isDynamicObject(99));
-            Assert.assertFalse("Number instance should not be dynamic", isDynamicObject(99.99));
-            Assert.assertFalse("Boolean instance should not be dynamic", isDynamicObject(true));
+            assertFalse( isDynamicObject("String"), "String instance should not be dynamic");
+            assertFalse( isDynamicObject(99), "int instance should not be dynamic");
+            assertFalse( isDynamicObject(99.99), "Number instance should not be dynamic");
+            assertFalse( isDynamicObject(true), "Boolean instance should not be dynamic");
             
             
-            Assert.assertTrue("function instance should be dynamic", isDynamicObject(function ():void
+            assertTrue( isDynamicObject(function ():void
             {
-            }));
-            Assert.assertTrue("Array instance should be dynamic", isDynamicObject([]));
+            }), "function instance should be dynamic");
+            assertTrue( isDynamicObject([]), "Array instance should be dynamic");
         }
         
         
@@ -113,60 +113,60 @@ package flexUnitTests.reflection
             
             const emptyArray:Array = [];
             const singleDynField:Array = ['test'];
-            Assert.assertTrue("dynamic fields should match reference list", contentStringsMatch(getDynamicFields(Object), emptyArray));
+            assertTrue( contentStringsMatch(getDynamicFields(Object), emptyArray), "dynamic fields should match reference list");
             Object['test'] = true;
-            Assert.assertTrue("dynamic fields should match reference list", contentStringsMatch(getDynamicFields(Object), singleDynField));
+            assertTrue( contentStringsMatch(getDynamicFields(Object), singleDynField), "dynamic fields should match reference list");
             delete Object['test'];
             
-            Assert.assertTrue("dynamic fields should match reference list", contentStringsMatch(getDynamicFields(TestClass1), emptyArray));
+            assertTrue( contentStringsMatch(getDynamicFields(TestClass1), emptyArray), "dynamic fields should match reference list");
             TestClass1['test'] = true;
-            Assert.assertTrue("dynamic fields should match reference list", contentStringsMatch(getDynamicFields(TestClass1), singleDynField));
+            assertTrue( contentStringsMatch(getDynamicFields(TestClass1), singleDynField), "dynamic fields should match reference list");
             delete TestClass1['test'];
             
             //interface is dynamic (even if it doesn't make much sense)
-            Assert.assertTrue("dynamic fields should match reference list", contentStringsMatch(getDynamicFields(ITestInterface), emptyArray));
+            assertTrue( contentStringsMatch(getDynamicFields(ITestInterface), emptyArray), "dynamic fields should match reference list");
             ITestInterface['test'] = true;
-            Assert.assertTrue("dynamic fields should match reference list", contentStringsMatch(getDynamicFields(ITestInterface), singleDynField));
+            assertTrue( contentStringsMatch(getDynamicFields(ITestInterface), singleDynField), "dynamic fields should match reference list");
             delete ITestInterface['test'];
             
             //instance
-            Assert.assertTrue("dynamic fields should match reference list", contentStringsMatch(getDynamicFields({}), emptyArray));
-            Assert.assertTrue("dynamic fields should match reference list", contentStringsMatch(getDynamicFields({test: true}), singleDynField));
+            assertTrue( contentStringsMatch(getDynamicFields({}), emptyArray), "dynamic fields should match reference list");
+            assertTrue( contentStringsMatch(getDynamicFields({test: true}), singleDynField), "dynamic fields should match reference list");
             
-            Assert.assertTrue("dynamic fields should match reference list", contentStringsMatch(getDynamicFields(new TestClass1()), emptyArray));
+            assertTrue( contentStringsMatch(getDynamicFields(new TestClass1()), emptyArray), "dynamic fields should match reference list");
             
             const dynInstance:DynamicTestClass = new DynamicTestClass();
             dynInstance.test = true;
-            Assert.assertTrue("dynamic fields should match reference list", contentStringsMatch(getDynamicFields(dynInstance), singleDynField));
+            assertTrue( contentStringsMatch(getDynamicFields(dynInstance), singleDynField), "dynamic fields should match reference list");
             
             
-            Assert.assertTrue("dynamic fields should match reference list", contentStringsMatch(getDynamicFields("String"), emptyArray));
-            Assert.assertTrue("dynamic fields should match reference list", contentStringsMatch(getDynamicFields(99), emptyArray));
-            Assert.assertTrue("dynamic fields should match reference list", contentStringsMatch(getDynamicFields(99.99), emptyArray));
-            Assert.assertTrue("dynamic fields should match reference list", contentStringsMatch(getDynamicFields(true), emptyArray));
+            assertTrue( contentStringsMatch(getDynamicFields("String"), emptyArray), "dynamic fields should match reference list");
+            assertTrue( contentStringsMatch(getDynamicFields(99), emptyArray), "dynamic fields should match reference list");
+            assertTrue( contentStringsMatch(getDynamicFields(99.99), emptyArray), "dynamic fields should match reference list");
+            assertTrue( contentStringsMatch(getDynamicFields(true), emptyArray), "dynamic fields should match reference list");
             
-            Assert.assertTrue("dynamic fields should match reference list", contentStringsMatch(getDynamicFields(function ():void
+            assertTrue( contentStringsMatch(getDynamicFields(function ():void
             {
-            }), emptyArray));
+            }), emptyArray), "dynamic fields should match reference list");
             
             const numericFields:Array = ["0", "1", "2", "3"];
             var arr:Array = [1, 2, 3, 4];
-            Assert.assertTrue("dynamic fields should match reference list", contentStringsMatch(getDynamicFields(arr), numericFields));
+            assertTrue( contentStringsMatch(getDynamicFields(arr), numericFields), "dynamic fields should match reference list");
             numericFields.push('test');
             arr['test'] = true;
-            Assert.assertTrue("dynamic fields should match reference list", contentStringsMatch(getDynamicFields(arr), numericFields));
+            assertTrue( contentStringsMatch(getDynamicFields(arr), numericFields), "dynamic fields should match reference list");
             
             
             var testclass2:DynamicTestClass2 = new DynamicTestClass2();
             testclass2.test = true;
             testclass2.something = '*something*';
-            Assert.assertTrue("dynamic fields should match reference list", contentStringsMatch(getDynamicFields(testclass2), singleDynField));
+            assertTrue( contentStringsMatch(getDynamicFields(testclass2), singleDynField), "dynamic fields should match reference list");
             
             
             testclass2.test = 'test';
             testclass2.something = '*something else*';
             
-            Assert.assertTrue("dynamic fields should match reference list", contentStringsMatch(getDynamicFields(testclass2), singleDynField));
+            assertTrue( contentStringsMatch(getDynamicFields(testclass2), singleDynField), "dynamic fields should match reference list");
             var testClass3:DynamicTestClass3 = new DynamicTestClass3();
             var swapAssertion:Boolean;
             COMPILE::JS{
@@ -180,10 +180,10 @@ package flexUnitTests.reflection
             
             if (!swapAssertion)
             {
-                Assert.assertTrue("dynamic fields should match reference list", contentStringsMatch(getDynamicFields(testClass3), emptyArray));
+                assertTrue( contentStringsMatch(getDynamicFields(testClass3), emptyArray), "dynamic fields should match reference list");
             } else
             {
-                Assert.assertFalse("dynamic fields should match reference list", contentStringsMatch(getDynamicFields(testClass3), emptyArray));
+                assertFalse( contentStringsMatch(getDynamicFields(testClass3), emptyArray), "dynamic fields should match reference list");
                 trace('[WARN] Variance: a test is technically wrong in javascript, but is expected to be wrong, because the compilation settings do not support it throughout the inheritance chain');
             }
             testClass3.test = 'true';
@@ -193,10 +193,10 @@ package flexUnitTests.reflection
             
             if (!swapAssertion)
             {
-                Assert.assertTrue("dynamic fields should match reference list", contentStringsMatch(getDynamicFields(testClass3), singleDynField));
+                assertTrue( contentStringsMatch(getDynamicFields(testClass3), singleDynField), "dynamic fields should match reference list");
             } else
             {
-                Assert.assertFalse("dynamic fields should not match reference list", contentStringsMatch(getDynamicFields(testClass3), singleDynField));
+                assertFalse( contentStringsMatch(getDynamicFields(testClass3), singleDynField), "dynamic fields should not match reference list");
                 trace('[WARN] Variance: a test is technically wrong in javascript, but is expected to be wrong, because the compilation settings do not support it throughout the inheritance chain');
             }
             
@@ -215,7 +215,7 @@ package flexUnitTests.reflection
             {
                 return prop && prop.charAt(0) != '_';
             };
-            Assert.assertTrue("dynamic fields should match reference list", contentStringsMatch(getDynamicFields(test, excludeUnderscores), withoutUnderscores));
+            assertTrue( contentStringsMatch(getDynamicFields(test, excludeUnderscores), withoutUnderscores), "dynamic fields should match reference list");
             
         }
         
diff --git a/manualtests/UnitTests/src/main/royale/flexUnitTests/reflection/ReflectionTesterTestUseCache.as b/manualtests/UnitTests/src/main/royale/flexUnitTests/reflection/ReflectionTesterTestUseCache.as
index 096612e..ff5b36c 100644
--- a/manualtests/UnitTests/src/main/royale/flexUnitTests/reflection/ReflectionTesterTestUseCache.as
+++ b/manualtests/UnitTests/src/main/royale/flexUnitTests/reflection/ReflectionTesterTestUseCache.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package flexUnitTests.reflection
 {
-    import flexunit.framework.Assert;
+    import org.apache.royale.test.asserts.*;
     
     import flexUnitTests.reflection.support.*;
     
@@ -96,7 +96,7 @@ package flexUnitTests.reflection
             
             var def2:TypeDefinition = describeType(TestClass2);
             
-            Assert.assertEquals("cache not working", def, def2);
+            assertEquals( def, def2, "cache not working");
             
         }
         
diff --git a/manualtests/UnitTests/src/main/royale/flexUnitTests/xml/XMLListTesterGeneralTest.as b/manualtests/UnitTests/src/main/royale/flexUnitTests/xml/XMLListTesterGeneralTest.as
index 779052a..27c2409 100644
--- a/manualtests/UnitTests/src/main/royale/flexUnitTests/xml/XMLListTesterGeneralTest.as
+++ b/manualtests/UnitTests/src/main/royale/flexUnitTests/xml/XMLListTesterGeneralTest.as
@@ -20,7 +20,7 @@ package flexUnitTests.xml
 {
     
     
-    import flexunit.framework.Assert;
+    import org.apache.royale.test.asserts.*;
     
     import testshim.RoyaleUnitTestRunner;
     
@@ -72,14 +72,14 @@ package flexUnitTests.xml
         {
             
             var xmllist:XMLList = XMLList(true);
-            Assert.assertTrue('XMLList length was unexpected', xmllist.length() == 1);
-            Assert.assertTrue('XMLList content was unexpected', xmllist[0].nodeKind() == 'text');
-            Assert.assertTrue('XMLList content was unexpected', xmllist.toString() == 'true');
+            assertTrue( xmllist.length() == 1, 'XMLList length was unexpected');
+            assertTrue( xmllist[0].nodeKind() == 'text', 'XMLList content was unexpected');
+            assertTrue( xmllist.toString() == 'true', 'XMLList content was unexpected');
     
             xmllist = XMLList(false);
-            Assert.assertTrue('XMLList length was unexpected', xmllist.length() == 1);
-            Assert.assertTrue('XMLList content was unexpected', xmllist[0].nodeKind() == 'text');
-            Assert.assertTrue('XMLList content was unexpected', xmllist.toString() == 'false');
+            assertTrue( xmllist.length() == 1, 'XMLList length was unexpected');
+            assertTrue( xmllist[0].nodeKind() == 'text', 'XMLList content was unexpected');
+            assertTrue( xmllist.toString() == 'false', 'XMLList content was unexpected');
         }
     
     
@@ -94,8 +94,8 @@ package flexUnitTests.xml
                 caughtError = true;
             }
             //as3 docs say this is an error, but it is not (in AVM)
-            Assert.assertFalse('XMLList error status was unexpected', caughtError);
-            Assert.assertTrue('XMLList length was unexpected', xmllist.length() == 0);
+            assertFalse( caughtError, 'XMLList error status was unexpected');
+            assertTrue( xmllist.length() == 0, 'XMLList length was unexpected');
 
         }
     
@@ -103,9 +103,9 @@ package flexUnitTests.xml
         public function testXMLListNumber():void
         {
             var xmllist:XMLList = XMLList(99.9);
-            Assert.assertTrue('XMLList length was unexpected', xmllist.length() == 1);
-            Assert.assertTrue('XMLList content was unexpected', xmllist[0].nodeKind() == 'text');
-            Assert.assertTrue('XMLList content was unexpected', xmllist.toString() == '99.9');
+            assertTrue( xmllist.length() == 1, 'XMLList length was unexpected');
+            assertTrue( xmllist[0].nodeKind() == 'text', 'XMLList content was unexpected');
+            assertTrue( xmllist.toString() == '99.9', 'XMLList content was unexpected');
             
         }
     
@@ -113,12 +113,12 @@ package flexUnitTests.xml
         public function testXMLListString():void
         {
             var xmllist:XMLList = XMLList('test');
-            Assert.assertTrue('XMLList length was unexpected', xmllist.length() == 1);
-            Assert.assertTrue('XMLList content was unexpected', xmllist[0].nodeKind() == 'text');
-            Assert.assertTrue('XMLList content was unexpected', xmllist.toString() == 'test');
+            assertTrue( xmllist.length() == 1, 'XMLList length was unexpected');
+            assertTrue( xmllist[0].nodeKind() == 'text', 'XMLList content was unexpected');
+            assertTrue( xmllist.toString() == 'test', 'XMLList content was unexpected');
             
             xmllist = XMLList('');
-            Assert.assertTrue('XMLList length was unexpected', xmllist.length() == 0);
+            assertTrue( xmllist.length() == 0, 'XMLList length was unexpected');
         }
     
         [Test]
@@ -133,8 +133,8 @@ package flexUnitTests.xml
             }
     
             //as3 docs say this is an error, but it is not (in AVM)
-            Assert.assertFalse('XMLList error status was unexpected', caughtError);
-            Assert.assertTrue('XMLList length was unexpected', xmllist.length() == 0);
+            assertFalse( caughtError, 'XMLList error status was unexpected');
+            assertTrue( xmllist.length() == 0, 'XMLList length was unexpected');
         
         }
     
@@ -145,9 +145,9 @@ package flexUnitTests.xml
             var xmllist:XMLList  = XMLList({});
     
             //as3 docs say this is an error, but it is not (in AVM)
-            Assert.assertTrue('XMLList length was unexpected', xmllist.length() == 1);
-            Assert.assertTrue('XMLList content was unexpected', xmllist[0].nodeKind() == 'text');
-            Assert.assertTrue('XMLList content was unexpected', xmllist.toString() == '[object Object]');
+            assertTrue( xmllist.length() == 1, 'XMLList length was unexpected');
+            assertTrue( xmllist[0].nodeKind() == 'text', 'XMLList content was unexpected');
+            assertTrue( xmllist.toString() == '[object Object]', 'XMLList content was unexpected');
         
         }
     
@@ -185,9 +185,9 @@ package flexUnitTests.xml
             var xmllist:XMLList  = XMLList(contentString);
         
 
-            Assert.assertTrue('XMLList length was unexpected', xmllist.length() == 6);
+            assertTrue( xmllist.length() == 6, 'XMLList length was unexpected');
             //use length here to account for variation in attribute/namespace sequence outputs
-            Assert.assertTrue('XMLList length was unexpected', xmllist.toXMLString().length == 1431);
+            assertTrue( xmllist.toXMLString().length == 1431, 'XMLList length was unexpected');
         }
         
         
diff --git a/manualtests/UnitTests/src/main/royale/flexUnitTests/xml/XMLTesterGeneralTest.as b/manualtests/UnitTests/src/main/royale/flexUnitTests/xml/XMLTesterGeneralTest.as
index bc25077..db92479 100644
--- a/manualtests/UnitTests/src/main/royale/flexUnitTests/xml/XMLTesterGeneralTest.as
+++ b/manualtests/UnitTests/src/main/royale/flexUnitTests/xml/XMLTesterGeneralTest.as
@@ -20,7 +20,7 @@ package flexUnitTests.xml
 {
     
     
-    import flexunit.framework.Assert;
+    import org.apache.royale.test.asserts.*;
     
     import testshim.RoyaleUnitTestRunner;
     
@@ -136,22 +136,22 @@ package flexUnitTests.xml
         {
             
             var xml1:XML = <foo baz="true"/>;
-            Assert.assertTrue('<foo baz="true"/> should have attribute @baz', xml1.hasOwnProperty("@baz"));
-            Assert.assertFalse('<foo baz="true"/> should not have attribute @foo', xml1.hasOwnProperty("@foo"));
-            Assert.assertFalse('<foo baz="true"/> should not have attribute baz', xml1.hasOwnProperty("baz"));
-            Assert.assertTrue('<foo baz="true"/> toXMLString should be <foo baz="true"/>', xml1.toXMLString() == '<foo baz="true"/>');
+            assertTrue( xml1.hasOwnProperty("@baz"), '<foo baz="true"/> should have attribute @baz');
+            assertFalse( xml1.hasOwnProperty("@foo"), '<foo baz="true"/> should not have attribute @foo');
+            assertFalse( xml1.hasOwnProperty("baz"), '<foo baz="true"/> should not have attribute baz');
+            assertTrue( xml1.toXMLString() == '<foo baz="true"/>', '<foo baz="true"/> toXMLString should be <foo baz="true"/>');
             
-            Assert.assertTrue('xml1.@baz.toString() should be "true"', xml1.@baz.toString() == 'true');
+            assertTrue( xml1.@baz.toString() == 'true', 'xml1.@baz.toString() should be "true"');
     
             var baz:XMLList = xml1.@baz;
-            Assert.assertTrue('baz.toString() should be "true"', baz.toString() == 'true');
-            Assert.assertEquals('baz.length() should be 1', baz.length(),1);
+            assertTrue( baz.toString() == 'true', 'baz.toString() should be "true"');
+            assertEquals( baz.length(),1, 'baz.length() should be 1');
             var xml3:XML = <root/>;
             xml3.bar.baz = "baz";
             xml3.foo.@boo = "boo";
     
-            Assert.assertEquals('xml3.bar.baz should be "baz"', xml3.bar.baz,'baz');
-            Assert.assertEquals('xml3.foo.@boo should be "boo"', xml3.foo.@boo,'boo');
+            assertEquals( xml3.bar.baz,'baz', 'xml3.bar.baz should be "baz"');
+            assertEquals( xml3.foo.@boo,'boo', 'xml3.foo.@boo should be "boo"');
 
         }
         
@@ -163,30 +163,32 @@ package flexUnitTests.xml
         {
             var xml1:XML = <foo baz="true"/>;
             
-            Assert.assertTrue('toString value should be "true" ', xml1.@baz.toString() == "true");
+            assertTrue( xml1.@baz.toString() == "true", 'toString value should be "true" ');
             var xml3:XML = <root/>;
             xml3.bar.baz = "baz";
             xml3.foo.@boo = "boo";
 
-            Assert.assertEquals('toString value should be "baz" ', xml3.bar.baz.toString(), "baz");
-            Assert.assertEquals('toString value should be "boo" ', xml3.foo.@boo.toString(), "boo");
+            assertEquals( xml3.bar.baz.toString(), "baz", 'toString value should be "baz" ');
+            assertEquals( xml3.foo.@boo.toString(), "boo", 'toString value should be "boo" ');
             
             var newContent:XML = <Content/>;
             newContent.Properties.Leading.@type = "string";
             newContent.Properties.Leading = 36;
             
-            Assert.assertEquals("Leading should be @type=string", newContent.Properties.Leading.@type, "string");
-            Assert.assertStrictlyEquals("Leading should be 36", newContent.Properties.Leading.toString(), "36");
-            Assert.assertStrictlyEquals("unexpected toXMLString() value",
+            assertEquals( newContent.Properties.Leading.@type, "string", "Leading should be @type=string");
+            assertStrictlyEquals(newContent.Properties.Leading.toString(), "36", "Leading should be 36");
+            assertStrictlyEquals(
                     newContent.toXMLString(),
                     "<Content>\n" +
                     "  <Properties>\n" +
                     "    <Leading type=\"string\">36</Leading>\n" +
                     "  </Properties>\n" +
-                    "</Content>");
+                    "</Content>",
+                    "unexpected toXMLString() value"
+            );
 
             newContent.Properties.Leading = 72;
-            Assert.assertStrictlyEquals("Leading should be 72", newContent.Properties.Leading.toString(), "72");
+            assertStrictlyEquals(newContent.Properties.Leading.toString(), "72", "Leading should be 72");
             
         }
         
@@ -200,8 +202,8 @@ package flexUnitTests.xml
             child = <pop><child name="George"/></pop>;
             xml1.appendChild(child);
             
-            Assert.assertTrue('unexpected child result', xml1.pop[0].child.@name.toString() == 'Sam');
-            Assert.assertTrue('unexpected child result', xml1.pop[1].child.@name.toString() == 'George');
+            assertTrue( xml1.pop[0].child.@name.toString() == 'Sam', 'unexpected child result');
+            assertTrue( xml1.pop[1].child.@name.toString() == 'George', 'unexpected child result');
             
         }
 
@@ -220,16 +222,16 @@ package flexUnitTests.xml
                         <child name="George"/>
                     </pop>;
             xml1.appendChild(child);
-            Assert.assertEquals('unexpected output with xml1.pop[0].toString()',
+            assertEquals(
                     xml1.pop[0].toString(),
                     '<pop>\n' +
                     '  <child name="Sam"/>\n' +
-                    '</pop>');
-            Assert.assertEquals('unexpected output with xml1.pop[1].toString()',
+                    '</pop>', 'unexpected output with xml1.pop[0].toString()');
+            assertEquals(
                     xml1.pop[1].toString(),
                     '<pop>\n' +
                     '  <child name="George"/>\n' +
-                    '</pop>');
+                    '</pop>', 'unexpected output with xml1.pop[1].toString()');
             
 
             var pop:XMLList = xml1.pop;
@@ -237,7 +239,7 @@ package flexUnitTests.xml
                                     <child name="Fred"/>
                                 </pop>;
 
-            Assert.assertEquals('unexpected output with pop.toString()',
+            assertEquals(
                     pop.toString(),
                     '<pop>\n' +
                     '  <child name="Sam"/>\n' +
@@ -247,9 +249,9 @@ package flexUnitTests.xml
                     '</pop>\n' +
                     '<pop>\n' +
                     '  <child name="Fred"/>\n' +
-                    '</pop>');
+                    '</pop>', 'unexpected output with pop.toString()');
     
-            Assert.assertEquals('unexpected output with xml1.toString()',
+            assertEquals(
                     xml1.toString(),
                     '<foo baz="true">\n' +
                     '  <pop>\n' +
@@ -261,14 +263,14 @@ package flexUnitTests.xml
                     '  <pop>\n' +
                     '    <child name="Fred"/>\n' +
                     '  </pop>\n' +
-                    '</foo>');
+                    '</foo>', 'unexpected output with xml1.toString()');
             
             
             pop[0] =    <pop>
                             <child name="Fred"/>
                         </pop>;
     
-            Assert.assertEquals('unexpected output with pop.toString()',
+            assertEquals(
                     pop.toString(),
                     '<pop>\n' +
                     '  <child name="Fred"/>\n' +
@@ -278,9 +280,9 @@ package flexUnitTests.xml
                     '</pop>\n' +
                     '<pop>\n' +
                     '  <child name="Fred"/>\n' +
-                    '</pop>');
+                    '</pop>', 'unexpected output with pop.toString()');
     
-            Assert.assertEquals('unexpected output with xml1.toString()',
+            assertEquals(
                     xml1.toString(),
                     '<foo baz="true">\n' +
                     '  <pop>\n' +
@@ -292,7 +294,7 @@ package flexUnitTests.xml
                     '  <pop>\n' +
                     '    <child name="Fred"/>\n' +
                     '  </pop>\n' +
-                    '</foo>');
+                    '</foo>', 'unexpected output with xml1.toString()');
             
             //toLocaleString
             //VARIANCE
@@ -311,9 +313,9 @@ package flexUnitTests.xml
                     '</foo>' //js
                     : '[object XML]';// swf
             
-            Assert.assertEquals('unexpected output with xml1.toLocaleString()',
+            assertEquals(
                     xml1.toLocaleString(),
-                    expected);
+                    expected, 'unexpected output with xml1.toLocaleString()');
             
             expected = isJS
                 ?   '<pop>\n' +
@@ -327,20 +329,20 @@ package flexUnitTests.xml
                     '</pop>' //js
                     : '[object XMLList]';//swf
     
-            Assert.assertEquals('unexpected output with xml1.pop.toLocaleString()',
+            assertEquals(
                     xml1.pop.toLocaleString(),
-                    expected);
+                    expected, 'unexpected output with xml1.pop.toLocaleString()');
 
             
             var parentXML:XML = <parent/>;
             var childXML:XML = <child/>;
             parentXML.appendChild(childXML);
-            Assert.assertTrue('child/parent relationship was unexpected', (childXML.parent() == parentXML));
-            Assert.assertEquals('unexpected output following re-parenting',
+            assertTrue( (childXML.parent() == parentXML), 'child/parent relationship was unexpected');
+            assertEquals(
                     parentXML.toXMLString(),
                     '<parent>\n' +
                     '  <child/>\n' +
-                    '</parent>');
+                    '</parent>', 'unexpected output following re-parenting');
             
             var newParent:XML = <newparent/>;
             newParent.appendChild(childXML);
@@ -355,35 +357,35 @@ package flexUnitTests.xml
                 expected = '<parent/>';
             }
     
-            Assert.assertEquals('unexpected output following re-parenting',
+            assertEquals(
                     parentXML.toXMLString(),
-                    expected);
+                    expected, 'unexpected output following re-parenting');
     
-            Assert.assertEquals('unexpected output following re-parenting',
+            assertEquals(
                     newParent.toXMLString(),
                     '<newparent>\n' +
                     '  <child/>\n' +
-                    '</newparent>');
+                    '</newparent>', 'unexpected output following re-parenting');
             
-            Assert.assertFalse('child/parent relationship was unexpected', (childXML.parent() == parentXML));
+            assertFalse( (childXML.parent() == parentXML), 'child/parent relationship was unexpected');
             
             var expectedLength:uint = getSwfVersion() < 21 ? 1 : 0;
             //another bug in old swf version, some 'remnant' of the old 'child' is still present in the'old' parent
-            Assert.assertTrue('child/parent relationship was unexpected', (parentXML.children().length() == expectedLength));
-            Assert.assertTrue('child/parent relationship was unexpected', (childXML.parent() == newParent));
+            assertTrue( (parentXML.children().length() == expectedLength), 'child/parent relationship was unexpected');
+            assertTrue( (childXML.parent() == newParent), 'child/parent relationship was unexpected');
             
             childXML = <Content>• <?ACE 7?>Some amazing content</Content>;
             var childXMLStr:String = childXML.text();
 
-            Assert.assertEquals(" (should be) •Some amazing content", childXMLStr, '•Some amazing content');
+            assertEquals( childXMLStr, '•Some amazing content', " (should be) •Some amazing content");
         }
         [Test]
         public function testInvalidAppendChild():void{
             var root:XML = new XML('test');
             root.appendChild('test');
     
-            Assert.assertEquals('testInvalidAppendChild 1 result is bad',root.toString(), 'test');
-            Assert.assertEquals('testInvalidAppendChild 2 result is bad',root.toXMLString(), 'test');
+            assertEquals(root.toString(), 'test', 'testInvalidAppendChild 1 result is bad');
+            assertEquals(root.toXMLString(), 'test', 'testInvalidAppendChild 2 result is bad');
         }
     
         [Test]
@@ -391,29 +393,29 @@ package flexUnitTests.xml
             var root:XML = <root/>;
             root.appendChild('test');
     
-            Assert.assertEquals('testAppendNonXMLChild 1 result is bad',root.toString(), 'test');
-            Assert.assertEquals('testAppendNonXMLChild 2 result is bad',root.toXMLString(), '<root>test</root>');
+            assertEquals(root.toString(), 'test', 'testAppendNonXMLChild 1 result is bad');
+            assertEquals(root.toXMLString(), '<root>test</root>', 'testAppendNonXMLChild 2 result is bad');
             
             root = <root><test><something/></test></root>;
             root.appendChild('test');
     
-            Assert.assertEquals('testAppendNonXMLChild 3 result is bad',
+            assertEquals(
                     root.toString(),
                     '<root>\n' +
                     '  <test>\n' +
                     '    <something/>\n' +
                     '  </test>\n' +
                     '  <test>test</test>\n' +
-                    '</root>');
+                    '</root>', 'testAppendNonXMLChild 3 result is bad');
             
-            Assert.assertEquals('testAppendNonXMLChild 4 result is bad',
+            assertEquals(
                     root.toXMLString(),
                     '<root>\n' +
                     '  <test>\n' +
                     '    <something/>\n' +
                     '  </test>\n' +
                     '  <test>test</test>\n' +
-                    '</root>');
+                    '</root>', 'testAppendNonXMLChild 4 result is bad');
             
         }
         
@@ -428,7 +430,7 @@ package flexUnitTests.xml
             xml.appendChild("test4");
             
     
-            Assert.assertEquals('testXMLNormalize 1 result is bad',
+            assertEquals(
                     xml.toString(),
                     '<root>\n' +
                     '  test1\n' +
@@ -436,9 +438,9 @@ package flexUnitTests.xml
                     '  <element/>\n' +
                     '  <element>test3</element>\n' +
                     '  <element>test4</element>\n' +
-                    '</root>');
+                    '</root>', 'testXMLNormalize 1 result is bad');
     
-            Assert.assertEquals('testXMLNormalize 2 result is bad',
+            assertEquals(
                     xml.toXMLString(),
                     '<root>\n' +
                     '  test1\n' +
@@ -446,28 +448,28 @@ package flexUnitTests.xml
                     '  <element/>\n' +
                     '  <element>test3</element>\n' +
                     '  <element>test4</element>\n' +
-                    '</root>');
+                    '</root>', 'testXMLNormalize 2 result is bad');
             
    
             xml.normalize();
     
-            Assert.assertEquals('testXMLNormalize 3 result is bad',
+            assertEquals(
                     xml.toString(),
                     '<root>\n' +
                     '  test1test2\n' +
                     '  <element/>\n' +
                     '  <element>test3</element>\n' +
                     '  <element>test4</element>\n' +
-                    '</root>');
+                    '</root>', 'testXMLNormalize 3 result is bad');
     
-            Assert.assertEquals('testXMLNormalize 4 result is bad',
+            assertEquals(
                     xml.toXMLString(),
                     '<root>\n' +
                     '  test1test2\n' +
                     '  <element/>\n' +
                     '  <element>test3</element>\n' +
                     '  <element>test4</element>\n' +
-                    '</root>');
+                    '</root>', 'testXMLNormalize 4 result is bad');
 
             
         }
@@ -496,7 +498,7 @@ package flexUnitTests.xml
                     + '<rect id="3" height="100px"/>' + '\n'
                     + '<rect id="4"/>';
             
-            Assert.assertTrue('string output was unexpected', rects.toXMLString() == expected);
+            assertTrue( rects.toXMLString() == expected, 'string output was unexpected');
         }
     
     
@@ -509,16 +511,16 @@ package flexUnitTests.xml
     
             //var list:XMLList = xml.child('*')
     
-            Assert.assertEquals('Error in list length', 4, list.length());
+            assertEquals( 4, list.length(), 'Error in list length');
             //trace(list.length());
             list = xml.element;
-            Assert.assertEquals('Error in list length', 1, list.length());
+            assertEquals( 1, list.length(), 'Error in list length');
             //list = xml.child('element')
     
            // trace(list.length())
             list = xml.otherElement;
             //list = xml.child('otherElement')
-            Assert.assertEquals('Error in list length', 1, list.length());
+            assertEquals( 1, list.length(), 'Error in list length');
         
         }
     
@@ -531,8 +533,8 @@ package flexUnitTests.xml
             </Document>;
         
             var namespace:Namespace = content.children()[0].namespace();
-            Assert.assertEquals('Error in namespace prefix', namespace.prefix, 'x');
-            Assert.assertEquals('Error in namespace uri', namespace.uri, 'adobe:ns:meta/');
+            assertEquals( namespace.prefix, 'x', 'Error in namespace prefix');
+            assertEquals( namespace.uri, 'adobe:ns:meta/', 'Error in namespace uri');
         
         }
     
@@ -553,7 +555,7 @@ package flexUnitTests.xml
             if (isJS) {
                 caughtError = !caughtError;
             }
-            Assert.assertFalse('Unexpected Error state with duplicate namespace declarations', caughtError);
+            assertFalse( caughtError, 'Unexpected Error state with duplicate namespace declarations');
         
         }
     
@@ -566,7 +568,7 @@ package flexUnitTests.xml
                 caughtError = true;
             }
         
-            Assert.assertTrue('Unexpected Error state with duplicate attribute declarations', caughtError);
+            assertTrue( caughtError, 'Unexpected Error state with duplicate attribute declarations');
         
         }
     
@@ -576,23 +578,23 @@ package flexUnitTests.xml
             XML.ignoreWhitespace = true;
             var script:XML = <script>   <![CDATA[private function onStylesLoaded(ev:Event):void {currentState = "normal";facade = ApplicationFacade.getInstance();facade.notifyObservers(new Notification(ApplicationFacade.CMD_STARTUP, this));}  ]]>  </script>;
     
-            Assert.assertEquals('unexpected children number after parsing',1, script.children().length());
-            Assert.assertEquals('unexpected toString value after parsing',
+            assertEquals(1, script.children().length(), 'unexpected children number after parsing');
+            assertEquals(
                     '<script><![CDATA[private function onStylesLoaded(ev:Event):void {currentState = "normal";facade = ApplicationFacade.getInstance();facade.notifyObservers(new Notification(ApplicationFacade.CMD_STARTUP, this));}  ]]></script>', 
-                    script.toXMLString());
+                    script.toXMLString(), 'unexpected toString value after parsing');
 
             XML.ignoreWhitespace = false;
             script = <script>   <![CDATA[private function onStylesLoaded(ev:Event):void {currentState = "normal";facade = ApplicationFacade.getInstance();facade.notifyObservers(new Notification(ApplicationFacade.CMD_STARTUP, this));}  ]]>  </script>;
-            Assert.assertEquals('unexpected children number after parsing',3, script.children().length());
+            assertEquals(3, script.children().length(), 'unexpected children number after parsing');
             
 
-            Assert.assertEquals('unexpected toString value after parsing',
+            assertEquals(
                     '<script>\n' +
                     '  \n' +
                     '  <![CDATA[private function onStylesLoaded(ev:Event):void {currentState = "normal";facade = ApplicationFacade.getInstance();facade.notifyObservers(new Notification(ApplicationFacade.CMD_STARTUP, this));}  ]]>\n' +
                     '  \n' +
                     '</script>',
-                    script.toXMLString());
+                    script.toXMLString(), 'unexpected toString value after parsing');
             XML.ignoreWhitespace = originalSetting;
         }
         [Test]
@@ -600,12 +602,12 @@ package flexUnitTests.xml
             var original:Boolean = XML.ignoreProcessingInstructions;
             XML.ignoreProcessingInstructions = true;
             var xml:XML = new XML('<?bar foo?>');
-            Assert.assertEquals('unexpected nodeKind with XML.ignoreProcessingInstructions = true', 'text', xml.nodeKind());
-            Assert.assertEquals('unexpected toXMLString with XML.ignoreProcessingInstructions = true', '', xml.toXMLString());
+            assertEquals( 'text', xml.nodeKind(), 'unexpected nodeKind with XML.ignoreProcessingInstructions = true');
+            assertEquals( '', xml.toXMLString(), 'unexpected toXMLString with XML.ignoreProcessingInstructions = true');
             XML.ignoreProcessingInstructions = false;
             xml = new XML('<?bar foo?>');
-            Assert.assertEquals('unexpected nodeKind with XML.ignoreProcessingInstructions = false', 'processing-instruction', xml.nodeKind());
-            Assert.assertEquals('unexpected toXMLString with XML.ignoreProcessingInstructions = false', '<?bar foo?>', xml.toXMLString());
+            assertEquals( 'processing-instruction', xml.nodeKind(), 'unexpected nodeKind with XML.ignoreProcessingInstructions = false');
+            assertEquals( '<?bar foo?>', xml.toXMLString(), 'unexpected toXMLString with XML.ignoreProcessingInstructions = false');
     
             XML.ignoreProcessingInstructions = original;
         }
@@ -616,9 +618,9 @@ package flexUnitTests.xml
             var original:Boolean = XML.ignoreWhitespace;
             XML.ignoreWhitespace = true;
             var xml:XML = new XML('   <![CDATA[ my cdata ]]>   ');
-            Assert.assertEquals('unexpected cdata result with XML.ignoreWhitespace = true', 'text', xml.nodeKind());
-            Assert.assertEquals('unexpected toXMLString with XML.ignoreWhitespace = true', '<![CDATA[ my cdata ]]>', xml.toXMLString());
-            Assert.assertNull('unexpected name value with CDATA', xml.name());
+            assertEquals( 'text', xml.nodeKind(), 'unexpected cdata result with XML.ignoreWhitespace = true');
+            assertEquals( '<![CDATA[ my cdata ]]>', xml.toXMLString(), 'unexpected toXMLString with XML.ignoreWhitespace = true');
+            assertNull( xml.name(), 'unexpected name value with CDATA');
             XML.ignoreWhitespace = false;
             var caughtError:Boolean = false;
             try {
@@ -627,7 +629,7 @@ package flexUnitTests.xml
                 caughtError = true;
             }
             
-            Assert.assertTrue('unexpected error status for single cdata string parsing with XML.ignoreWhitespace = false', caughtError);
+            assertTrue( caughtError, 'unexpected error status for single cdata string parsing with XML.ignoreWhitespace = false');
         
             XML.ignoreWhitespace = original;
         }
@@ -638,9 +640,9 @@ package flexUnitTests.xml
             var original:Boolean = XML.ignoreWhitespace;
             XML.ignoreWhitespace = true;
             var xml:XML = new XML('   my text   ');
-            Assert.assertEquals('unexpected text result with XML.ignoreWhitespace = true', 'text', xml.nodeKind());
-            Assert.assertEquals('unexpected toXMLString with XML.ignoreWhitespace = true', 'my text', xml.toXMLString());
-            Assert.assertNull('unexpected name value with text', xml.name());
+            assertEquals( 'text', xml.nodeKind(), 'unexpected text result with XML.ignoreWhitespace = true');
+            assertEquals( 'my text', xml.toXMLString(), 'unexpected toXMLString with XML.ignoreWhitespace = true');
+            assertNull( xml.name(), 'unexpected name value with text');
             XML.ignoreWhitespace = false;
             var caughtError:Boolean = false;
             try {
@@ -649,9 +651,9 @@ package flexUnitTests.xml
                 caughtError = true;
             }
         
-            Assert.assertFalse('unexpected error status for text string parsing with XML.ignoreWhitespace = false', caughtError);
-            Assert.assertEquals('unexpected text result with XML.ignoreWhitespace = true', 'text', xml.nodeKind());
-            Assert.assertEquals('unexpected toXMLString with XML.ignoreWhitespace = true', '   my text   ', xml.valueOf());
+            assertFalse( caughtError, 'unexpected error status for text string parsing with XML.ignoreWhitespace = false');
+            assertEquals( 'text', xml.nodeKind(), 'unexpected text result with XML.ignoreWhitespace = true');
+            assertEquals( '   my text   ', xml.valueOf(), 'unexpected toXMLString with XML.ignoreWhitespace = true');
             XML.ignoreWhitespace = original;
         }
     
@@ -662,9 +664,9 @@ package flexUnitTests.xml
             XML.ignoreWhitespace = true;
             XML.ignoreComments = false;
             var xml:XML = new XML('  <!-- my test comment -->  ');
-            Assert.assertEquals('unexpected comment result with XML.ignoreWhitespace = true', 'comment', xml.nodeKind());
-            Assert.assertEquals('unexpected toXMLString with XML.ignoreWhitespace = true', '<!-- my test comment -->', xml.toXMLString());
-            Assert.assertNull('unexpected name value with text', xml.name());
+            assertEquals( 'comment', xml.nodeKind(), 'unexpected comment result with XML.ignoreWhitespace = true');
+            assertEquals( '<!-- my test comment -->', xml.toXMLString(), 'unexpected toXMLString with XML.ignoreWhitespace = true');
+            assertNull( xml.name(), 'unexpected name value with text');
             XML.ignoreWhitespace = false;
             var caughtError:Boolean = false;
             try {
@@ -673,19 +675,19 @@ package flexUnitTests.xml
                 caughtError = true;
             }
         
-            Assert.assertTrue('unexpected error status for comment parsing with XML.ignoreWhitespace = false', caughtError);
+            assertTrue( caughtError, 'unexpected error status for comment parsing with XML.ignoreWhitespace = false');
     
             xml = new XML('<!-- my test comment -->');
-            Assert.assertNull('unexpected name value with comment', xml.name());
+            assertNull( xml.name(), 'unexpected name value with comment');
             
-            Assert.assertEquals('unexpected comment result with XML.ignoreWhitespace = true', 'comment', xml.nodeKind());
-            Assert.assertEquals('unexpected toXMLString with XML.ignoreWhitespace = true', '<!-- my test comment -->', xml.toXMLString());
+            assertEquals( 'comment', xml.nodeKind(), 'unexpected comment result with XML.ignoreWhitespace = true');
+            assertEquals( '<!-- my test comment -->', xml.toXMLString(), 'unexpected toXMLString with XML.ignoreWhitespace = true');
             XML.ignoreComments = true;
             xml = new XML('<!-- my test comment -->');
-            Assert.assertNull('unexpected name value with text', xml.name());
+            assertNull( xml.name(), 'unexpected name value with text');
     
-            Assert.assertEquals('unexpected comment result with XML.ignoreComments = true', 'text', xml.nodeKind());
-            Assert.assertEquals('unexpected toXMLString with XML.ignoreComments = true', '', xml.toXMLString());
+            assertEquals( 'text', xml.nodeKind(), 'unexpected comment result with XML.ignoreComments = true');
+            assertEquals( '', xml.toXMLString(), 'unexpected toXMLString with XML.ignoreComments = true');
             
             
             XML.ignoreWhitespace = original;
@@ -699,18 +701,18 @@ package flexUnitTests.xml
             XML.ignoreWhitespace = true;
             XML.ignoreComments = false;
             var xml:XML = new XML('<root><!-- my test comment --></root>');
-            Assert.assertEquals('unexpected comment result with XML.ignoreComments = false', 1, xml.children().length());
+            assertEquals( 1, xml.children().length(), 'unexpected comment result with XML.ignoreComments = false');
 
-            Assert.assertEquals('unexpected toXMLString with XML.ignoreComments = false',
+            assertEquals(
                     '<root>\n' +
                     '  <!-- my test comment -->\n' +
                     '</root>',
-                    xml.toXMLString());
-            Assert.assertNull('unexpected name value with comment', xml.children()[0].name());
+                    xml.toXMLString(), 'unexpected toXMLString with XML.ignoreComments = false');
+            assertNull( xml.children()[0].name(), 'unexpected name value with comment');
             XML.ignoreComments = true;
             xml = new XML('<root><!-- my test comment --></root>');
-            Assert.assertEquals('unexpected comment result with XML.ignoreComments = true', 0, xml.children().length());
-            Assert.assertEquals('unexpected toXMLString with XML.ignoreComments = true', '<root/>', xml.toXMLString());
+            assertEquals( 0, xml.children().length(), 'unexpected comment result with XML.ignoreComments = true');
+            assertEquals( '<root/>', xml.toXMLString(), 'unexpected toXMLString with XML.ignoreComments = true');
     
             XML.ignoreWhitespace = original;
             XML.ignoreComments = originalComments;
@@ -809,7 +811,7 @@ package flexUnitTests.xml
             
             //IE and MS Edge: inlcude alternate output check
             //account for variation in output order of attributes and namespace declarations (from native DOMParser)
-            Assert.assertTrue('unexpected complex stringify results',  xmlString.length == 2060);
+            assertTrue(  xmlString.length == 2060, 'unexpected complex stringify results');
         }
         
         
@@ -823,8 +825,8 @@ package flexUnitTests.xml
             var xml:XML = new XML(xmlSource);
             
             
-            Assert.assertTrue('unexpected toSting result', xml.toString() == '');
-            Assert.assertTrue('unexpected nodeKind result', xml.nodeKind() == 'text');
+            assertTrue( xml.toString() == '', 'unexpected toSting result');
+            assertTrue( xml.nodeKind() == 'text', 'unexpected nodeKind result');
            
     
             XML.ignoreProcessingInstructions = false;
@@ -837,7 +839,7 @@ package flexUnitTests.xml
                 caughtError = true;
             }
             //RoyaleUnitTestRunner.consoleOut('testTopLevelProcessingInstructions '+xml.nodeKind());
-            Assert.assertTrue('error was expected', caughtError)
+            assertTrue( caughtError, 'error was expected');
         }
     
     
@@ -851,15 +853,15 @@ package flexUnitTests.xml
             var xml:XML = new XML(xmlSource);
         
         
-            Assert.assertTrue('unexpected toSting result', xml.toString() == 'test');
-            Assert.assertTrue('unexpected nodeKind result', xml.nodeKind() == 'element');
+            assertTrue( xml.toString() == 'test', 'unexpected toSting result');
+            assertTrue( xml.nodeKind() == 'element', 'unexpected nodeKind result');
         
         
             XML.ignoreWhitespace = false;
             xml = new XML(xmlSource);
 
-            Assert.assertTrue('unexpected toSting result', xml.toString() == 'test');
-            Assert.assertTrue('unexpected nodeKind result', xml.nodeKind() == 'element');
+            assertTrue( xml.toString() == 'test', 'unexpected toSting result');
+            assertTrue( xml.nodeKind() == 'element', 'unexpected nodeKind result');
     
             XML.ignoreWhitespace = original;
         }
@@ -877,8 +879,8 @@ package flexUnitTests.xml
             var xml:XML = new XML(xmlSource);
         
         
-            Assert.assertTrue('unexpected toSting result', xml.toString() == 'test');
-            Assert.assertTrue('unexpected nodeKind result', xml.nodeKind() == 'element');
+            assertTrue( xml.toString() == 'test', 'unexpected toSting result');
+            assertTrue( xml.nodeKind() == 'element', 'unexpected nodeKind result');
     
             xmlSource = '<?xml version="1.0" encoding="UTF-8"?>\n'
                     +' <?test1 ?>  <!-- my test comment1 -->   <?test2 ?>  <!-- my test comment2 --> ';
@@ -890,9 +892,9 @@ package flexUnitTests.xml
             {
                 caughtError = true;
             }
-            Assert.assertTrue('unexpected error status', caughtError);
-            Assert.assertTrue('unexpected toSting result', xml.toString() == 'test');
-            Assert.assertTrue('unexpected nodeKind result', xml.nodeKind() == 'element');
+            assertTrue( caughtError, 'unexpected error status');
+            assertTrue( xml.toString() == 'test', 'unexpected toSting result');
+            assertTrue( xml.nodeKind() == 'element', 'unexpected nodeKind result');
             
             XML.setSettings(original)
         }
@@ -917,7 +919,7 @@ package flexUnitTests.xml
                 caughtError = true;
             }
     
-            Assert.assertTrue('unexpected error statust', caughtError);
+            assertTrue( caughtError, 'unexpected error statust');
             //repeat with all settings toggled (must remain an error)
             XML.ignoreComments = true;
             XML.ignoreProcessingInstructions = true;
@@ -929,7 +931,7 @@ package flexUnitTests.xml
                 caughtError = true;
             }
     
-            Assert.assertTrue('unexpected error statust', caughtError);
+            assertTrue( caughtError, 'unexpected error statust');
             //restore settings
             XML.ignoreComments = false;
             XML.ignoreProcessingInstructions = false;
@@ -944,7 +946,7 @@ package flexUnitTests.xml
             } catch(e:Error) {
                 caughtError = true;
             }
-            Assert.assertTrue('unexpected error status', caughtError);
+            assertTrue( caughtError, 'unexpected error status');
     
             //repeat with whiteSpace toggled (must remain an error)
             XML.ignoreWhitespace = true;
@@ -954,7 +956,7 @@ package flexUnitTests.xml
             } catch(e:Error) {
                 caughtError = true;
             }
-            Assert.assertTrue('unexpected error status', caughtError);
+            assertTrue( caughtError, 'unexpected error status');
             XML.ignoreWhitespace = false;
             //repeat with ignoreProcessingInstructions toggled
             XML.ignoreProcessingInstructions = true;
@@ -964,7 +966,7 @@ package flexUnitTests.xml
             } catch(e:Error) {
                 caughtError = true;
             }
-            Assert.assertTrue('unexpected error status', caughtError);
+            assertTrue( caughtError, 'unexpected error status');
             XML.ignoreProcessingInstructions = false;
             //repeat with ignoreComments toggled
             XML.ignoreComments = true;
@@ -974,7 +976,7 @@ package flexUnitTests.xml
             } catch(e:Error) {
                 caughtError = true;
             }
-            Assert.assertTrue('unexpected error status', caughtError);
+            assertTrue( caughtError, 'unexpected error status');
             XML.ignoreComments = false;
             
             
@@ -988,8 +990,8 @@ package flexUnitTests.xml
             } catch(e:Error) {
                 caughtError = true;
             }
-            Assert.assertFalse('unexpected error status', caughtError);
-            Assert.assertTrue('unexpected toSting result', xml.toString() == '');
+            assertFalse( caughtError, 'unexpected error status');
+            assertTrue( xml.toString() == '', 'unexpected toSting result');
             XML.ignoreComments = false;
             XML.ignoreProcessingInstructions = false;
             XML.ignoreWhitespace = false;
@@ -1003,7 +1005,7 @@ package flexUnitTests.xml
             } catch(e:Error) {
                 caughtError = true;
             }
-            Assert.assertTrue('unexpected error status', caughtError);
+            assertTrue( caughtError, 'unexpected error status');
             //repeat with all settings toggled
             XML.ignoreComments = true;
             XML.ignoreProcessingInstructions = true;
@@ -1014,9 +1016,9 @@ package flexUnitTests.xml
             } catch(e:Error) {
                 caughtError = true;
             }
-            Assert.assertFalse('unexpected error status', caughtError);
-            Assert.assertTrue('unexpected toSting result', xml.toString() == ' -<something>-  ');
-            Assert.assertTrue('unexpected toXMLString result', xml.toXMLString() == '<![CDATA[ -<something>-  ]]>');
+            assertFalse( caughtError, 'unexpected error status');
+            assertTrue( xml.toString() == ' -<something>-  ', 'unexpected toSting result');
+            assertTrue( xml.toXMLString() == '<![CDATA[ -<something>-  ]]>', 'unexpected toXMLString result');
             XML.ignoreComments = false;
             XML.ignoreProcessingInstructions = false;
             XML.ignoreWhitespace = false;
@@ -1033,47 +1035,47 @@ package flexUnitTests.xml
             var localXml:XML;
     
             localXml = XML(true);
-            Assert.assertTrue('XML content was unexpected', localXml.nodeKind() == 'text');
-            Assert.assertTrue('XML content was unexpected', localXml.toString() == 'true');
+            assertTrue( localXml.nodeKind() == 'text', 'XML content was unexpected');
+            assertTrue( localXml.toString() == 'true', 'XML content was unexpected');
     
     
             localXml = XML(false);
-            Assert.assertTrue('XML content was unexpected', localXml.nodeKind() == 'text');
-            Assert.assertTrue('XML content was unexpected', localXml.toString() == 'false');
+            assertTrue( localXml.nodeKind() == 'text', 'XML content was unexpected');
+            assertTrue( localXml.toString() == 'false', 'XML content was unexpected');
     
     
             localXml = XML('string');
-            Assert.assertTrue('XMLList content was unexpected', localXml.nodeKind() == 'text');
-            Assert.assertTrue('XMLList content was unexpected', localXml.toString() == 'string');
+            assertTrue( localXml.nodeKind() == 'text', 'XMLList content was unexpected');
+            assertTrue( localXml.toString() == 'string', 'XMLList content was unexpected');
     
             localXml = XML(99.9);
-            Assert.assertTrue('XML content was unexpected', localXml.nodeKind() == 'text');
-            Assert.assertTrue('XML content was unexpected', localXml.toString() == '99.9');
+            assertTrue( localXml.nodeKind() == 'text', 'XML content was unexpected');
+            assertTrue( localXml.toString() == '99.9', 'XML content was unexpected');
     
             
             //as3 docs say this is an error, but it is not (in AVM)
             localXml = XML(null);
-            Assert.assertTrue('XML content was unexpected', localXml.nodeKind() == 'text');
-            Assert.assertTrue('XML content was unexpected', localXml.toString() == '');
+            assertTrue( localXml.nodeKind() == 'text', 'XML content was unexpected');
+            assertTrue( localXml.toString() == '', 'XML content was unexpected');
     
             //as3 docs say this is an error, but it is not (in AVM)
             localXml = XML(undefined);
-            Assert.assertTrue('XML content was unexpected', localXml.nodeKind() == 'text');
-            Assert.assertTrue('XML content was unexpected', localXml.toString() == '');
+            assertTrue( localXml.nodeKind() == 'text', 'XML content was unexpected');
+            assertTrue( localXml.toString() == '', 'XML content was unexpected');
     
             //as3 docs say this is an error, but it is not (in AVM)
             localXml = XML({});
-            Assert.assertTrue('XML content was unexpected', localXml.nodeKind() == 'text');
-            Assert.assertTrue('XML content was unexpected', localXml.toString() == '[object Object]');
+            assertTrue( localXml.nodeKind() == 'text', 'XML content was unexpected');
+            assertTrue( localXml.toString() == '[object Object]', 'XML content was unexpected');
             
             var xmlContent:XML = xml;
             localXml = XML(xmlContent);
-            Assert.assertTrue('XML content was unexpected', localXml == xml);
+            assertTrue( localXml == xml, 'XML content was unexpected');
             
             var sizes:XMLList = localXml..size.(@description == 'Small');
-            Assert.assertTrue('XML content was unexpected', sizes.length() == 1);
+            assertTrue( sizes.length() == 1, 'XML content was unexpected');
             localXml = XML(sizes);
-            Assert.assertTrue('XML content was unexpected', localXml == sizes[0]);
+            assertTrue( localXml == sizes[0], 'XML content was unexpected');
             
         }
     }
diff --git a/manualtests/UnitTests/src/main/royale/flexUnitTests/xml/XMLTesterStringifyTest.as b/manualtests/UnitTests/src/main/royale/flexUnitTests/xml/XMLTesterStringifyTest.as
index 269d683..d9dc75f 100644
--- a/manualtests/UnitTests/src/main/royale/flexUnitTests/xml/XMLTesterStringifyTest.as
+++ b/manualtests/UnitTests/src/main/royale/flexUnitTests/xml/XMLTesterStringifyTest.as
@@ -20,7 +20,7 @@ package flexUnitTests.xml
 {
     
     
-    import flexunit.framework.Assert;
+    import org.apache.royale.test.asserts.*;
     
     import testshim.RoyaleUnitTestRunner;
     
@@ -66,11 +66,11 @@ package flexUnitTests.xml
             XML.prettyPrinting = true;
             var xml:XML = <xml><item/></xml>;
             
-            Assert.assertEquals('Error in pretty Printing', xml.toXMLString(), '<xml>\n  <item/>\n</xml>');
+            assertEquals( xml.toXMLString(), '<xml>\n  <item/>\n</xml>', 'Error in pretty Printing');
             XML.prettyIndent = 4;
-            Assert.assertEquals('Error in pretty Printing', xml.toXMLString(), '<xml>\n    <item/>\n</xml>');
+            assertEquals( xml.toXMLString(), '<xml>\n    <item/>\n</xml>', 'Error in pretty Printing');
             XML.prettyIndent = 0;
-            Assert.assertEquals('Error in pretty Printing', xml.toXMLString(), '<xml>\n<item/>\n</xml>');
+            assertEquals( xml.toXMLString(), '<xml>\n<item/>\n</xml>', 'Error in pretty Printing');
     
             XML.prettyIndent = originalIndent;
             XML.prettyPrinting = originalPretty;
@@ -81,10 +81,10 @@ package flexUnitTests.xml
         public function testToStringVariants():void{
             var ampXML:XML = new XML("<Content>Bat & Ball</Content>");
             var amp2XML:XML = new XML("<Content>Bat &amp; Ball</Content>");
-            Assert.assertEquals('ampersand entities are output with toXMLString', ampXML.toXMLString(),'<Content>Bat &amp; Ball</Content>');
-            Assert.assertEquals('ampersand entities are output with toXMLString', amp2XML.toXMLString(),'<Content>Bat &amp; Ball</Content>');
-            Assert.assertEquals('ampersand entities are not output with toString', ampXML.toString(),'Bat & Ball');
-            Assert.assertEquals('ampersand entities are not output with toString', amp2XML.toString(),'Bat & Ball');
+            assertEquals( ampXML.toXMLString(),'<Content>Bat &amp; Ball</Content>', 'ampersand entities are output with toXMLString');
+            assertEquals(amp2XML.toXMLString(),'<Content>Bat &amp; Ball</Content>', 'ampersand entities are output with toXMLString');
+            assertEquals( ampXML.toString(),'Bat & Ball', 'ampersand entities are not output with toString');
+            assertEquals( amp2XML.toString(),'Bat & Ball', 'ampersand entities are not output with toString');
         
         }
         
@@ -107,10 +107,10 @@ package flexUnitTests.xml
             var contentStr:String = content.toXMLString();
             var correctStr:String = '<root><content><![CDATA[<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?><x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.3-c011 66.145661, 2012/02/06-14:56:27        ">   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">      <rdf:Description rdf:about=""/>   </rdf:RDF></x:xmpmeta><?xpacket end="r"?>]'+']></content></root>';
     
-            Assert.assertEquals('testStringifyAdvanced 1:content.toXMLString() was incorrect',correctStr, contentStr);
+            assertEquals(correctStr, contentStr, 'testStringifyAdvanced 1:content.toXMLString() was incorrect');
     
     
-            Assert.assertEquals('testStringifyAdvanced 1:content.toXMLString() was incorrect',correctStr, content.toXMLString());
+            assertEquals(correctStr, content.toXMLString(), 'testStringifyAdvanced 1:content.toXMLString() was incorrect');
             
             content = <Document>
                 <?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
@@ -147,8 +147,8 @@ package flexUnitTests.xml
             //IE and Edge:
             var alternate:String = '<Document><x:xmpmeta x:xmptk="Adobe XMP Core 5.3-c011 66.145661, 2012/02/06-14:56:27        " xmlns:x="adobe:ns:meta/"><rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"><rdf:Description rdf:about="" xmlns:dc="http://purl.org/dc/elements/1.1/"><dc:format>application/x-indesign</dc:format></rdf:Description><rdf:Description rdf:about="" xmlns:xmpGImg="http://ns.adobe.com/xap/1.0/g/img/" xmlns:xmp="http://ns.adobe.com/xap/1.0/"><xmp:CreatorT [...]
             
-            Assert.assertTrue('testStringifyAdvanced 1:content.toXMLString() was incorrect',
-                    (contentStr == expected) || (contentStr == alternate));
+            assertTrue(
+                    (contentStr == expected) || (contentStr == alternate), 'testStringifyAdvanced 1:content.toXMLString() was incorrect');
     
 
         }
@@ -227,7 +227,7 @@ package flexUnitTests.xml
             //RoyaleUnitTestRunner.consoleOut('stringifyAdvanced2:\n' + outString );
             
             //the order of toString output can be quite different for some browsers, but the length should be identical
-            Assert.assertTrue('unexpected toString result', outString.length == expected.length);
+            assertTrue( outString.length == expected.length, 'unexpected toString result');
         }
     
         [Test]
@@ -304,7 +304,7 @@ package flexUnitTests.xml
             //RoyaleUnitTestRunner.consoleOut('stringifyAdvanced3:\n' + outString);
     
             //the order of toString output can be quite different for some browsers, but the length should be identical
-            Assert.assertTrue('unexpected toString result', outString.length == expected.length);
+            assertTrue( outString.length == expected.length, 'unexpected toString result');
         }
         
         
@@ -312,9 +312,9 @@ package flexUnitTests.xml
         public function testCDATA():void{
             var script:XML = <script>   <![CDATA[private function onStylesLoaded(ev:Event):void {currentState = "normal";facade = ApplicationFacade.getInstance();facade.notifyObservers(new Notification(ApplicationFacade.CMD_STARTUP, this));}  ]]>  </script>;
 
-            Assert.assertEquals('unexpected toXMLString with child CDATA',
+            assertEquals(
                     '<script><![CDATA[private function onStylesLoaded(ev:Event):void {currentState = "normal";facade = ApplicationFacade.getInstance();facade.notifyObservers(new Notification(ApplicationFacade.CMD_STARTUP, this));}  ]]></script>',
-                    script.toXMLString())
+                    script.toXMLString(), 'unexpected toXMLString with child CDATA')
         }
         
 


[royale-asjs] 01/04: Aligning Language tests between manualtests project and RoyaleUnit

Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

gregdove pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git

commit 3b82478c52cde2979054ba6562cda5b66ab163a0
Author: greg-dove <gr...@gmail.com>
AuthorDate: Wed Aug 7 09:29:36 2019 +1200

    Aligning Language tests between manualtests project and RoyaleUnit
---
 .../language/LanguageTesterIntUint.as              | 22 +++++++++++++++
 .../flexUnitTests/language/LanguageTesterTestIs.as | 31 ++++++++++++++++++++++
 .../language/LanguageTesterTestVector.as           | 24 ++++++++++++++++-
 .../language/LanguageTesterIntUint.as              | 12 +++------
 .../language/LanguageTesterTestClass.as            | 10 +++----
 .../flexUnitTests/language/LanguageTesterTestIs.as | 12 +++------
 .../language/LanguageTesterTestVector.as           | 10 +++----
 7 files changed, 90 insertions(+), 31 deletions(-)

diff --git a/frameworks/projects/Core/src/test/royale/flexUnitTests/language/LanguageTesterIntUint.as b/frameworks/projects/Core/src/test/royale/flexUnitTests/language/LanguageTesterIntUint.as
index 4d5d1cc..da3c82d 100644
--- a/frameworks/projects/Core/src/test/royale/flexUnitTests/language/LanguageTesterIntUint.as
+++ b/frameworks/projects/Core/src/test/royale/flexUnitTests/language/LanguageTesterIntUint.as
@@ -159,6 +159,28 @@ package flexUnitTests.language
             assertTrue( untyped === 31.5,'Unexpected Number check');
             
         }
+    
+    
+        [Test]
+        //[TestVariance(variance="JS", description="Variance in js implementation with @royalesuppressresolveuncertain, strict equality can fail")]
+        /**
+         * @royalesuppressresolveuncertain c
+         */
+        public function testNoResolveUncertain():void
+        {
+
+            var c:Class = int;
+            var untyped:* = new c(30);
+            var expected:Boolean = isJS ? false : true;
+            assertEquals(  expected, untyped === 30,'Unexpected int check');
+            // b does not have suppression, only c does above (via @royalesuppressresolveuncertain c)
+            expected = true;
+            var b:Class = String;
+           // c = String;
+            untyped = new b(30);
+            assertEquals(expected, untyped === '30', 'Unexpected String check');
+        
+        }
         
     }
 }
diff --git a/frameworks/projects/Core/src/test/royale/flexUnitTests/language/LanguageTesterTestIs.as b/frameworks/projects/Core/src/test/royale/flexUnitTests/language/LanguageTesterTestIs.as
index f17203e..4e5b82d 100644
--- a/frameworks/projects/Core/src/test/royale/flexUnitTests/language/LanguageTesterTestIs.as
+++ b/frameworks/projects/Core/src/test/royale/flexUnitTests/language/LanguageTesterTestIs.as
@@ -220,6 +220,37 @@ package flexUnitTests.language
             assertTrue( caughtError,'Unexpected coercion check');
             assertTrue( testClass3 == null,'Unexpected coercion check');
         }
+    
+    
+        [Test]
+        //[TestVariance(variance="JS",description="Variance in js implementation with @royalesuppresscompleximplicitcoercion, outcome can be wrong")]
+        /**
+         * @royalesuppresscompleximplicitcoercion true
+         */
+        public function testImplicitCoercionAvoided():void
+        {
+            var testclass2Class:Class = TestClass2;
+            var testClass3:TestClass3;
+            var something:* = new testclass2Class();
+            var caughtError:Boolean;
+            try
+            {
+                caughtError = false;
+                testClass3 = something;
+            } catch (e:Error)
+            {
+                caughtError = e is TypeError
+            }
+        
+            if (isJS) {
+                assertFalse( caughtError, 'Unexpected coercion check');
+                assertFalse(testClass3 == null, 'Unexpected coercion check');
+            } else {
+                assertTrue(caughtError, 'Unexpected coercion check');
+                assertTrue(testClass3 == null, 'Unexpected coercion check');
+            }
+        
+        }
         
         [Test]
         public function testNullUndefined():void
diff --git a/frameworks/projects/Core/src/test/royale/flexUnitTests/language/LanguageTesterTestVector.as b/frameworks/projects/Core/src/test/royale/flexUnitTests/language/LanguageTesterTestVector.as
index 62d3990..933f173 100644
--- a/frameworks/projects/Core/src/test/royale/flexUnitTests/language/LanguageTesterTestVector.as
+++ b/frameworks/projects/Core/src/test/royale/flexUnitTests/language/LanguageTesterTestVector.as
@@ -819,6 +819,28 @@ package flexUnitTests.language
             const expected:Class = isJS ? Vector.<String> : Vector.<*>;
             assertTrue( vs['constructor'] === expected,'Unexpected Vector check');
         }
+    
+        [Test]
+        public function testVectorRemoveAtType():void{
+            if (hasInsertAtRemoveAt()) {
+                var customClasses:Array = [null, new TestClass2(), undefined, new TestClass1()];
+    
+                var vcustom:Vector.<TestClass1> = Vector.<TestClass1>(customClasses);
+    
+                COMPILE::SWF{
+                    var tc1:TestClass1 = vcustom['removeAt'](1);
+                }
+                COMPILE::JS{
+                    var tc1:TestClass1 = vcustom.removeAt(1);
+                }
+                assertTrue(tc1 != null, 'Unexpected Vector check');
+                assertTrue(tc1 is TestClass1, 'Unexpected Vector check');
+                assertTrue(tc1 is TestClass2, 'Unexpected Vector check');
+            } else {
+                assertTrue(true);
+            }
+           
+        }
         
         
         private var _viTest:Vector.<int>;
@@ -1397,10 +1419,10 @@ package flexUnitTests.language
         
         }
         
-        
     }
 }
 
+
 class PrivateClass {
     
     public function PrivateClass(){
diff --git a/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterIntUint.as b/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterIntUint.as
index 61e1375..3ef7135 100644
--- a/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterIntUint.as
+++ b/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterIntUint.as
@@ -29,17 +29,13 @@ package flexUnitTests.language
      */
     public class LanguageTesterIntUint
     {
-        
-        public static var isJS:Boolean;
-        
+    
+        public static var isJS:Boolean = COMPILE::JS;
+    
+    
         [BeforeClass]
         public static function setUpBeforeClass():void
         {
-            var js:Boolean;
-            COMPILE::JS {
-                js = true;
-            }
-            isJS = js;
         }
         
         [AfterClass]
diff --git a/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterTestClass.as b/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterTestClass.as
index 6d046a1..7714092 100644
--- a/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterTestClass.as
+++ b/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterTestClass.as
@@ -29,17 +29,13 @@ package flexUnitTests.language
      */
     public class LanguageTesterTestClass
     {
-        
-        public static var isJS:Boolean;
+    
+        public static var isJS:Boolean = COMPILE::JS;
         
         [BeforeClass]
         public static function setUpBeforeClass():void
         {
-            var js:Boolean;
-            COMPILE::JS {
-                js = true;
-            }
-            isJS = js;
+
         }
         
         [AfterClass]
diff --git a/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterTestIs.as b/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterTestIs.as
index ab0c287..dec5d85 100644
--- a/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterTestIs.as
+++ b/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterTestIs.as
@@ -29,17 +29,13 @@ package flexUnitTests.language
      */
     public class LanguageTesterTestIs
     {
-        
-        public static var isJS:Boolean;
+    
+        public static var isJS:Boolean = COMPILE::JS;
         
         [BeforeClass]
         public static function setUpBeforeClass():void
         {
-            var js:Boolean;
-            COMPILE::JS {
-                js = true;
-            }
-            isJS = js;
+
         }
         
         [AfterClass]
@@ -253,7 +249,7 @@ package flexUnitTests.language
                 Assert.assertTrue('Unexpected coercion check', caughtError);
                 Assert.assertTrue('Unexpected coercion check', testClass3 == null);
             }
-            
+        
         }
         
         [Test]
diff --git a/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterTestVector.as b/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterTestVector.as
index 52c6d4c..aa53c61 100644
--- a/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterTestVector.as
+++ b/manualtests/UnitTests/src/main/royale/flexUnitTests/language/LanguageTesterTestVector.as
@@ -29,8 +29,8 @@ package flexUnitTests.language
      */
     public class LanguageTesterTestVector
     {
-        
-        public static var isJS:Boolean;
+    
+        public static var isJS:Boolean = COMPILE::JS;
     
     
         public static function hasInsertAtRemoveAt():Boolean{
@@ -49,11 +49,6 @@ package flexUnitTests.language
         [BeforeClass]
         public static function setUpBeforeClass():void
         {
-            var js:Boolean;
-            COMPILE::JS {
-                js = true;
-            }
-            isJS = js;
         }
         
         [AfterClass]
@@ -1411,6 +1406,7 @@ package flexUnitTests.language
             Assert.assertTrue('Unexpected Vector check', v[0] is PrivateClass);
             
         }
+        
     }
 }
 


[royale-asjs] 02/04: Adding a compatibility package to manualtests/UnitTests to permit greater alignment of test code assertions with RoyaleUnit

Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

gregdove pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git

commit 722be262cc6768fa0dc389a1514444ac8b4e920f
Author: greg-dove <gr...@gmail.com>
AuthorDate: Wed Aug 7 09:32:25 2019 +1200

    Adding a compatibility package to manualtests/UnitTests to permit greater alignment of test code assertions with RoyaleUnit
---
 .../src/main/royale/flexunit/framework/Assert.as   | 53 ++++++++++++++++++++++
 .../org/apache/royale/test/asserts/assertEquals.as | 33 ++++++++++++++
 .../org/apache/royale/test/asserts/assertFalse.as  | 33 ++++++++++++++
 .../apache/royale/test/asserts/assertNotEquals.as  | 33 ++++++++++++++
 .../apache/royale/test/asserts/assertNotNull.as    | 33 ++++++++++++++
 .../royale/test/asserts/assertNotStrictlyEquals.as | 33 ++++++++++++++
 .../org/apache/royale/test/asserts/assertNull.as   | 33 ++++++++++++++
 .../royale/test/asserts/assertStrictlyEquals.as    | 33 ++++++++++++++
 .../org/apache/royale/test/asserts/assertTrue.as   | 33 ++++++++++++++
 .../royale/org/apache/royale/test/asserts/fail.as  | 31 +++++++++++++
 10 files changed, 348 insertions(+)

diff --git a/manualtests/UnitTests/src/main/royale/flexunit/framework/Assert.as b/manualtests/UnitTests/src/main/royale/flexunit/framework/Assert.as
index 6702f62..8c9d258 100644
--- a/manualtests/UnitTests/src/main/royale/flexunit/framework/Assert.as
+++ b/manualtests/UnitTests/src/main/royale/flexunit/framework/Assert.as
@@ -82,6 +82,20 @@ package flexunit.framework
 			else
 				failNotEquals( "", rest[0], rest[1] );
 		}
+		
+		/**
+		 * Asserts that the provided values are not loosely equal (equivalent to
+		 * the <code>!=</code> operator).
+		 */
+		public static function assertNotEquals(... rest):void
+		{
+			_assertCount++;
+			if ( rest.length == 3 )
+				failEquals( rest[0], rest[1], rest[2] );
+			else
+				failEquals( "", rest[0], rest[1] );
+		}
+		
 	
         /**
          * @private
@@ -91,6 +105,19 @@ package flexunit.framework
 			if ( expected != actual )
 			   failWithUserMessage( message, "expected:<" + expected + "> but was:<" + actual + ">" );
 		}
+		
+		
+		/**
+		 * Fails if the values are loosely equal.
+		 * @private
+		 */
+		public static function failEquals(message:String, expected:Object, actual:Object):void
+		{
+			if(actual == expected)
+			{
+				failWithUserMessage(message,"expected: <" + expected + "> not to be equal to <" + actual + ">");
+			}
+		}
 	
 		/**
 		 * /**
@@ -114,6 +141,32 @@ package flexunit.framework
 			else
 				failNotStrictlyEquals( "", rest[0], rest[1] );
 		}
+		
+		/**
+		 * Asserts that the provided values are not strictly equal (equivalent
+		 * to the <code>!==</code> operator).
+		 */
+		public static function assertNotStrictlyEquals(... rest):void
+		{
+			_assertCount++;
+			if ( rest.length == 3 )
+				failStrictlyEquals( rest[0], rest[1], rest[2] );
+			else
+				failStrictlyEquals( "", rest[0], rest[1] );
+			
+		}
+		
+		
+		/**
+		 * Fails if the values are strictly equal.
+		 */
+		public static function failStrictlyEquals(message:String, expected:Object, actual:Object):void
+		{
+			if(actual === expected)
+			{
+				failWithUserMessage(message,"expected: <" + expected + "> not to be strictly equal to <" + actual + ">");
+			}
+		}
 	
         /**
          * @private
diff --git a/manualtests/UnitTests/src/main/royale/org/apache/royale/test/asserts/assertEquals.as b/manualtests/UnitTests/src/main/royale/org/apache/royale/test/asserts/assertEquals.as
new file mode 100644
index 0000000..76f3f63
--- /dev/null
+++ b/manualtests/UnitTests/src/main/royale/org/apache/royale/test/asserts/assertEquals.as
@@ -0,0 +1,33 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.royale.test.asserts
+{
+	import flexunit.framework.Assert;
+
+	/**
+	 * RoyaleUnit compatibility
+	 * Alias for flexunit.framework.Assert assertEquals method
+	 */
+	public function assertEquals(actual:*, expected:*, message:String = null):void
+	{
+		if (message)
+			Assert.assertEquals(message,actual, expected);
+		else Assert.assertEquals(actual, expected);
+	}
+}
diff --git a/manualtests/UnitTests/src/main/royale/org/apache/royale/test/asserts/assertFalse.as b/manualtests/UnitTests/src/main/royale/org/apache/royale/test/asserts/assertFalse.as
new file mode 100644
index 0000000..9518425
--- /dev/null
+++ b/manualtests/UnitTests/src/main/royale/org/apache/royale/test/asserts/assertFalse.as
@@ -0,0 +1,33 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.royale.test.asserts
+{
+	import flexunit.framework.Assert;
+
+	/**
+	 * RoyaleUnit compatibility
+	 * Alias for flexunit.framework.Assert assertFalse method
+	 */
+	public function assertFalse(condition:*, message:String = null):void
+	{
+		if (message)
+			Assert.assertFalse(message, condition);
+		else Assert.assertFalse(condition);
+	}
+}
diff --git a/manualtests/UnitTests/src/main/royale/org/apache/royale/test/asserts/assertNotEquals.as b/manualtests/UnitTests/src/main/royale/org/apache/royale/test/asserts/assertNotEquals.as
new file mode 100644
index 0000000..a026bb4
--- /dev/null
+++ b/manualtests/UnitTests/src/main/royale/org/apache/royale/test/asserts/assertNotEquals.as
@@ -0,0 +1,33 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.royale.test.asserts
+{
+	import flexunit.framework.Assert;
+
+	/**
+	 * RoyaleUnit compatibility
+	 * Alias for org.apache.royale.test.Assert assertNotEquals method
+	 */
+	public function assertNotEquals(actual:*, expected:*, message:String = null):void
+	{
+		if (message)
+			Assert.assertNotEquals(message,actual, expected);
+		else Assert.assertNotEquals(actual, expected);
+	}
+}
diff --git a/manualtests/UnitTests/src/main/royale/org/apache/royale/test/asserts/assertNotNull.as b/manualtests/UnitTests/src/main/royale/org/apache/royale/test/asserts/assertNotNull.as
new file mode 100644
index 0000000..b1d884e
--- /dev/null
+++ b/manualtests/UnitTests/src/main/royale/org/apache/royale/test/asserts/assertNotNull.as
@@ -0,0 +1,33 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.royale.test.asserts
+{
+	import flexunit.framework.Assert;
+
+	/**
+	 * RoyaleUnit compatibility
+	 * Alias for flexunit.framework.Assert assertNotNull method
+	 */
+	public function assertNotNull(value:*, message:String = null):void
+	{
+		if (message)
+			Assert.assertNotNull(message, value);
+		else Assert.assertNotNull(value);
+	}
+}
diff --git a/manualtests/UnitTests/src/main/royale/org/apache/royale/test/asserts/assertNotStrictlyEquals.as b/manualtests/UnitTests/src/main/royale/org/apache/royale/test/asserts/assertNotStrictlyEquals.as
new file mode 100644
index 0000000..e644ef1
--- /dev/null
+++ b/manualtests/UnitTests/src/main/royale/org/apache/royale/test/asserts/assertNotStrictlyEquals.as
@@ -0,0 +1,33 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.royale.test.asserts
+{
+	import flexunit.framework.Assert;
+	
+	/**
+	 * RoyaleUnit compatibility
+	 * Alias for flexunit.framework.Assert assertNotStrictlyEquals method
+	 */
+	public function assertNotStrictlyEquals(actual:*, expected:*, message:String = null):void
+	{
+		if (message)
+			Assert.assertNotStrictlyEquals(message, actual, expected);
+		else Assert.assertNotStrictlyEquals(actual, expected);
+	}
+}
diff --git a/manualtests/UnitTests/src/main/royale/org/apache/royale/test/asserts/assertNull.as b/manualtests/UnitTests/src/main/royale/org/apache/royale/test/asserts/assertNull.as
new file mode 100644
index 0000000..7e4907e
--- /dev/null
+++ b/manualtests/UnitTests/src/main/royale/org/apache/royale/test/asserts/assertNull.as
@@ -0,0 +1,33 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.royale.test.asserts
+{
+	import flexunit.framework.Assert;
+	
+	/**
+	 * RoyaleUnit compatibility
+	 * Alias for flexunit.framework.Assert  assertNull method
+	 */
+	public function assertNull(value:*, message:String = null):void
+	{
+		if (message)
+			Assert.assertNull(message, value);
+		else Assert.assertNull(value);
+	}
+}
diff --git a/manualtests/UnitTests/src/main/royale/org/apache/royale/test/asserts/assertStrictlyEquals.as b/manualtests/UnitTests/src/main/royale/org/apache/royale/test/asserts/assertStrictlyEquals.as
new file mode 100644
index 0000000..6c85574
--- /dev/null
+++ b/manualtests/UnitTests/src/main/royale/org/apache/royale/test/asserts/assertStrictlyEquals.as
@@ -0,0 +1,33 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.royale.test.asserts
+{
+	import flexunit.framework.Assert;
+	
+	/**
+	 * RoyaleUnit compatibility
+	 * Alias for flexunit.framework.Assert assertStrictlyEquals method
+	 */
+	public function assertStrictlyEquals(actual:*, expected:*, message:String = null):void
+	{
+		if (message)
+			Assert.assertStrictlyEquals(message, actual, expected);
+		else Assert.assertStrictlyEquals(actual, expected);
+	}
+}
diff --git a/manualtests/UnitTests/src/main/royale/org/apache/royale/test/asserts/assertTrue.as b/manualtests/UnitTests/src/main/royale/org/apache/royale/test/asserts/assertTrue.as
new file mode 100644
index 0000000..80b563d
--- /dev/null
+++ b/manualtests/UnitTests/src/main/royale/org/apache/royale/test/asserts/assertTrue.as
@@ -0,0 +1,33 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.royale.test.asserts
+{
+	import flexunit.framework.Assert;
+	
+	/**
+	 * RoyaleUnit compatibility
+	 * Alias for flexunit.framework.Assert assertTrue method
+	 */
+	public function assertTrue(condition:*, message:String = null):void
+	{
+		if (message)
+			Assert.assertTrue(message, condition);
+		else Assert.assertTrue(condition);
+	}
+}
diff --git a/manualtests/UnitTests/src/main/royale/org/apache/royale/test/asserts/fail.as b/manualtests/UnitTests/src/main/royale/org/apache/royale/test/asserts/fail.as
new file mode 100644
index 0000000..7c7b93d
--- /dev/null
+++ b/manualtests/UnitTests/src/main/royale/org/apache/royale/test/asserts/fail.as
@@ -0,0 +1,31 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.royale.test.asserts
+{
+	import flexunit.framework.Assert;
+	
+	/**
+	 * RoyaleUnit compatibility
+	 * Alias for flexunit.framework.Assert fail method
+	 */
+	public function fail(message:String = null):void
+	{
+		Assert.fail(message);
+	}
+}