You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2015/01/06 00:20:33 UTC
[2/2] git commit: [flex-falcon] [refs/heads/develop] - update tests
now that attributes are output in order received
update tests now that attributes are output in order received
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/2591c553
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/2591c553
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/2591c553
Branch: refs/heads/develop
Commit: 2591c553cc670f6b4bde27d5bb156048bec3c1a0
Parents: 5cfc750
Author: Alex Harui <ah...@apache.org>
Authored: Mon Jan 5 15:20:16 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Jan 5 15:20:16 2015 -0800
----------------------------------------------------------------------
.../codegen/mxml/TestMXMLApplication.java | 2 +-
.../internal/codegen/mxml/TestMXMLNodes.java | 2 +-
.../flexjs/files/MyInitialView_result.js | 174 +++++++++----------
3 files changed, 89 insertions(+), 89 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2591c553/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/mxml/TestMXMLApplication.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/mxml/TestMXMLApplication.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/mxml/TestMXMLApplication.java
index c5c2a4e..68a3817 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/mxml/TestMXMLApplication.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/mxml/TestMXMLApplication.java
@@ -103,7 +103,7 @@ public class TestMXMLApplication extends MXMLTestBase
mxmlBlockWalker.visitFile(node);
- assertOut("<Application minHeight=\"600\" minWidth=\"955\">\n\t\n</Application>");
+ assertOut("<Application minWidth=\"955\" minHeight=\"600\">\n\t\n</Application>");
}
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2591c553/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/mxml/TestMXMLNodes.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/mxml/TestMXMLNodes.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/mxml/TestMXMLNodes.java
index 1e46f33..ba39c2b 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/mxml/TestMXMLNodes.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/mxml/TestMXMLNodes.java
@@ -106,7 +106,7 @@ public class TestMXMLNodes extends MXMLTestBase
mxmlBlockWalker.visitPropertySpecifier(node);
- assertOut("<Button visible=\"false\" color=\"16711680\" width=\"1.5\" label=\"Click me ;-)\" x=\"100\"></Button>");
+ assertOut("<Button visible=\"false\" x=\"100\" width=\"1.5\" label=\"Click me ;-)\" color=\"16711680\"></Button>");
}
@Test
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2591c553/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js b/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js
index f609b5d..c3cc35c 100644
--- a/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js
+++ b/compiler.jx.tests/test-files/flexjs/files/MyInitialView_result.js
@@ -520,14 +520,14 @@ org.apache.flex.html.Label,
'id',
true,
'lbl',
-'y',
-true,
-25,
'x',
true,
100,
+'y',
+true,
+25,
'beads',
-null, [org.apache.flex.binding.SimpleBinding, 5, '_id', true, '$ID0', 'sourceID', true, 'applicationModel', 'sourcePropertyName', true, 'labelText', 'eventName', true, 'labelTextChanged', 'destinationPropertyName', true, 'text', 0, 0, null],
+null, [org.apache.flex.binding.SimpleBinding, 5, '_id', true, '$ID0', 'eventName', true, 'labelTextChanged', 'sourceID', true, 'applicationModel', 'sourcePropertyName', true, 'labelText', 'destinationPropertyName', true, 'text', 0, 0, null],
0,
0,
null,
@@ -539,12 +539,12 @@ true,
'text',
true,
'Let\'s Start Timer',
-'y',
-true,
-75,
'x',
true,
100,
+'y',
+true,
+75,
0,
1,
'click',
@@ -558,10 +558,10 @@ true,
'text',
true,
'Stop Timer',
-'y',
+'x',
true,
100,
-'x',
+'y',
true,
100,
0,
@@ -574,12 +574,12 @@ org.apache.flex.html.Label,
'id',
true,
'timerLabel',
-'y',
-true,
-125,
'x',
true,
100,
+'y',
+true,
+125,
0,
0,
null,
@@ -588,18 +588,18 @@ org.apache.flex.html.List,
'id',
true,
'cityList',
-'height',
+'x',
+true,
+200,
+'y',
true,
75,
'width',
true,
100,
-'y',
+'height',
true,
75,
-'x',
-true,
-200,
'beads',
null, [org.apache.flex.binding.ConstantBinding, 4, '_id', true, '$ID3', 'sourceID', true, 'applicationModel', 'sourcePropertyName', true, 'cities', 'destinationPropertyName', true, 'dataProvider', 0, 0, null],
0,
@@ -612,20 +612,20 @@ org.apache.flex.html.TextArea,
'_id',
true,
'$ID5',
-'height',
-true,
-75,
-'width',
+'x',
true,
-150,
+320,
'y',
true,
25,
-'x',
+'width',
true,
-320,
+150,
+'height',
+true,
+75,
'beads',
-null, [org.apache.flex.binding.SimpleBinding, 5, '_id', true, '$ID4', 'sourceID', true, 'applicationModel', 'sourcePropertyName', true, 'labelText', 'eventName', true, 'labelTextChanged', 'destinationPropertyName', true, 'text', 0, 0, null],
+null, [org.apache.flex.binding.SimpleBinding, 5, '_id', true, '$ID4', 'eventName', true, 'labelTextChanged', 'sourceID', true, 'applicationModel', 'sourcePropertyName', true, 'labelText', 'destinationPropertyName', true, 'text', 0, 0, null],
0,
0,
null,
@@ -634,12 +634,12 @@ org.apache.flex.html.TextInput,
'id',
true,
'input',
-'y',
-true,
-110,
'x',
true,
320,
+'y',
+true,
+110,
0,
0,
null,
@@ -651,12 +651,12 @@ true,
'text',
true,
'Transfer',
-'y',
-true,
-138,
'x',
true,
320,
+'y',
+true,
+138,
0,
1,
'click',
@@ -667,15 +667,15 @@ org.apache.flex.html.CheckBox,
'id',
true,
'checkbox',
-'text',
+'x',
true,
-'Check Me',
+320,
'y',
true,
170,
-'x',
+'text',
true,
-320,
+'Check Me',
0,
0,
null,
@@ -684,21 +684,21 @@ org.apache.flex.html.RadioButton,
'_id',
true,
'$ID7',
-'text',
-true,
-'Apples',
'groupName',
true,
'group1',
+'text',
+true,
+'Apples',
'value',
true,
0,
-'y',
-true,
-150,
'x',
true,
100,
+'y',
+true,
+150,
0,
0,
null,
@@ -707,24 +707,24 @@ org.apache.flex.html.RadioButton,
'_id',
true,
'$ID8',
-'selected',
-true,
+'groupName',
true,
+'group1',
'text',
true,
'Oranges',
-'groupName',
-true,
-'group1',
'value',
true,
1,
+'x',
+true,
+100,
'y',
true,
170,
-'x',
+'selected',
+true,
true,
-100,
0,
0,
null,
@@ -733,21 +733,21 @@ org.apache.flex.html.RadioButton,
'_id',
true,
'$ID9',
-'text',
-true,
-'Grapes',
'groupName',
true,
'group1',
+'text',
+true,
+'Grapes',
'value',
true,
2,
-'y',
-true,
-190,
'x',
true,
100,
+'y',
+true,
+190,
0,
0,
null,
@@ -756,24 +756,24 @@ org.apache.flex.html.RadioButton,
'_id',
true,
'$ID10',
-'selected',
-true,
+'groupName',
true,
+'group2',
'text',
true,
'Red',
-'groupName',
-true,
-'group2',
'value',
true,
16711680,
+'x',
+true,
+100,
'y',
true,
250,
-'x',
+'selected',
+true,
true,
-100,
0,
0,
null,
@@ -782,21 +782,21 @@ org.apache.flex.html.RadioButton,
'_id',
true,
'$ID11',
-'text',
-true,
-'Green',
'groupName',
true,
'group2',
+'text',
+true,
+'Green',
'value',
true,
32768,
-'y',
-true,
-270,
'x',
true,
100,
+'y',
+true,
+270,
0,
0,
null,
@@ -805,21 +805,21 @@ org.apache.flex.html.RadioButton,
'_id',
true,
'$ID12',
-'text',
-true,
-'Blue',
'groupName',
true,
'group2',
+'text',
+true,
+'Blue',
'value',
true,
255,
-'y',
-true,
-290,
'x',
true,
100,
+'y',
+true,
+290,
0,
0,
null,
@@ -828,18 +828,18 @@ org.apache.flex.html.DropDownList,
'id',
true,
'list',
-'height',
-true,
-24,
-'width',
+'x',
true,
-100,
+200,
'y',
true,
200,
-'x',
+'width',
true,
-200,
+100,
+'height',
+true,
+24,
'beads',
null, [org.apache.flex.binding.ConstantBinding, 4, '_id', true, '$ID13', 'sourceID', true, 'applicationModel', 'sourcePropertyName', true, 'strings', 'destinationPropertyName', true, 'dataProvider', 0, 0, null],
0,
@@ -855,12 +855,12 @@ true,
'text',
true,
'OK',
-'y',
-true,
-230,
'x',
true,
200,
+'y',
+true,
+230,
0,
1,
'click',
@@ -871,15 +871,15 @@ org.apache.flex.html.ComboBox,
'id',
true,
'comboBox',
-'width',
+'x',
true,
-100,
+320,
'y',
true,
200,
-'x',
+'width',
true,
-320,
+100,
'beads',
null, [org.apache.flex.binding.ConstantBinding, 4, '_id', true, '$ID15', 'sourceID', true, 'applicationModel', 'sourcePropertyName', true, 'cities', 'destinationPropertyName', true, 'dataProvider', 0, 0, null],
0,