You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by gr...@apache.org on 2017/07/08 05:17:43 UTC

[1/3] git commit: [flex-asjs] [refs/heads/develop] - fix ant build of Generic tests

Repository: flex-asjs
Updated Branches:
  refs/heads/develop 6e43cd2d6 -> 01a2a2823


fix ant build of Generic tests


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f1e9a408
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f1e9a408
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f1e9a408

Branch: refs/heads/develop
Commit: f1e9a4089e4fe8b253eabb4099d051ced59a56eb
Parents: 6e43cd2
Author: greg-dove <gr...@gmail.com>
Authored: Sat Jul 8 10:46:42 2017 +1200
Committer: greg-dove <gr...@gmail.com>
Committed: Sat Jul 8 10:46:42 2017 +1200

----------------------------------------------------------------------
 manualtests/GenericTests/build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f1e9a408/manualtests/GenericTests/build.xml
----------------------------------------------------------------------
diff --git a/manualtests/GenericTests/build.xml b/manualtests/GenericTests/build.xml
index 0ac8123..7213c68 100644
--- a/manualtests/GenericTests/build.xml
+++ b/manualtests/GenericTests/build.xml
@@ -22,7 +22,7 @@
 <project name="GenericTests" default="main" basedir=".">
     <property name="FLEXJS_HOME" location="../.."/>
     <property name="example" value="GenericTests" />
-    
+    <property name="swf.version" value="11" />
 
     <!-- adding flexuint style meta collection, and additional testing meta tags (Event,Bindable,TestMeta)-->
     <property name="theme_arg" value="-keep-as3-metadata+=Test,BeforeClass,AfterClass,Before,After,TestVariance,Event,Bindable,TestMeta" />


[3/3] git commit: [flex-asjs] [refs/heads/develop] - EventDispatcher got an extra method (toString) on the js side since original setup

Posted by gr...@apache.org.
EventDispatcher got an extra method (toString) on the js side since original setup


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/01a2a282
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/01a2a282
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/01a2a282

Branch: refs/heads/develop
Commit: 01a2a2823abe4a42506af0aed7fd0cb713a27d3b
Parents: ca399b1
Author: greg-dove <gr...@gmail.com>
Authored: Sat Jul 8 10:48:22 2017 +1200
Committer: greg-dove <gr...@gmail.com>
Committed: Sat Jul 8 10:48:22 2017 +1200

----------------------------------------------------------------------
 .../src/flexUnitTests/reflection/ReflectionTesterTest.as         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/01a2a282/manualtests/GenericTests/src/flexUnitTests/reflection/ReflectionTesterTest.as
----------------------------------------------------------------------
diff --git a/manualtests/GenericTests/src/flexUnitTests/reflection/ReflectionTesterTest.as b/manualtests/GenericTests/src/flexUnitTests/reflection/ReflectionTesterTest.as
index 951e782..9d39fc9 100644
--- a/manualtests/GenericTests/src/flexUnitTests/reflection/ReflectionTesterTest.as
+++ b/manualtests/GenericTests/src/flexUnitTests/reflection/ReflectionTesterTest.as
@@ -151,7 +151,7 @@ package flexUnitTests.reflection
             Assert.assertEquals("unexpected instance variables length",3,variables.length);
 
             //there is a difference based on the EventDispatcher inheritance chain differences between js and swf:
-            expected = isJS ? 3 : 7;
+            expected = isJS ? 4 : 7;
             var methods:Array = def.methods;
             Assert.assertEquals("unexpected instance methods length",expected,methods.length);
 
@@ -184,7 +184,7 @@ package flexUnitTests.reflection
             Assert.assertEquals("unexpected instance variables length",3,variables.length);
 
             //there is a difference based on the EventDispatcher inheritance chain differences between js and swf:
-            expected = isJS ? 3 : 7;
+            expected = isJS ? 4 : 7;
             var methods:Array = def.methods;
             Assert.assertEquals("unexpected instance methods length",expected,methods.length);
 


[2/3] git commit: [flex-asjs] [refs/heads/develop] - Fix layout of Generic tests

Posted by gr...@apache.org.
Fix layout of Generic tests


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ca399b19
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ca399b19
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ca399b19

Branch: refs/heads/develop
Commit: ca399b1991341e6ed4d0fd22a16db199cb0b63b5
Parents: f1e9a40
Author: greg-dove <gr...@gmail.com>
Authored: Sat Jul 8 10:47:22 2017 +1200
Committer: greg-dove <gr...@gmail.com>
Committed: Sat Jul 8 10:47:22 2017 +1200

----------------------------------------------------------------------
 manualtests/GenericTests/src/MyInitialView.mxml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ca399b19/manualtests/GenericTests/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/manualtests/GenericTests/src/MyInitialView.mxml b/manualtests/GenericTests/src/MyInitialView.mxml
index 2c8c966..af4aea7 100644
--- a/manualtests/GenericTests/src/MyInitialView.mxml
+++ b/manualtests/GenericTests/src/MyInitialView.mxml
@@ -179,15 +179,15 @@ limitations under the License.
 	<js:beads>
 		<js:ViewDataBinding/>
 	</js:beads>
-	<js:Container id="cont" height="50" className="body">
+	<js:Group id="cont" height="50" className="body">
 		<js:beads>
-			<js:VerticalLayout />
+			<js:VerticalFlexLayout />
 		</js:beads>
 		<js:Label text="{PLATFORM} Cross-compiled Unit Tests" className="title" />
-	</js:Container>
-	<js:Container id="output" height="700" y="50" className="body">
+	</js:Group>
+	<js:Group id="output" height="700" y="50" className="body">
 		<js:beads>
-			<js:VerticalLayout />
+			<js:VerticalFlexLayout />
 		</js:beads>
-	</js:Container>
+	</js:Group>
 </js:View>