flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [6/7] git commit: [flex-falcon] [refs/heads/develop] - fixed compile errors with test classes
Date Wed, 06 Jan 2016 07:37:04 GMT
fixed compile errors with test classes


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

Branch: refs/heads/develop
Commit: d259345a8d89ab9ff4673dbabd8b2dc841e83835
Parents: 420ffe3
Author: Andy Dufilie <andrew.dufilie@iweave.com>
Authored: Tue Jan 5 16:17:16 2016 -0500
Committer: Alex Harui <aharui@apache.org>
Committed: Tue Jan 5 23:31:56 2016 -0800

----------------------------------------------------------------------
 .../internal/codegen/externals/TestAnnotationEnum.java  |  3 +--
 .../internal/codegen/externals/TestConstructor.java     |  2 +-
 .../internal/codegen/externals/TestExternChrome.java    | 12 ++++++------
 .../internal/codegen/externals/TestTypeExternals.java   |  8 ++++----
 .../internal/codegen/externals/TestTypeInheritence.java |  2 +-
 5 files changed, 13 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d259345a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestAnnotationEnum.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestAnnotationEnum.java
b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestAnnotationEnum.java
index 97286db..124e3ff 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestAnnotationEnum.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestAnnotationEnum.java
@@ -49,8 +49,7 @@ public class TestAnnotationEnum extends ExternalsTestBase
         assertTrue(FontFaceSetLoadStatus.hasStaticField("FOO_LOADED"));
         assertTrue(FontFaceSetLoadStatus.hasStaticField("FOO_LOADING"));
 
-        assertTrue(FontFaceLoadStatus.getField("ERROR").isStatic());
-        assertTrue(FontFaceLoadStatus.getField("ERROR").isConst());
+        assertTrue(FontFaceLoadStatus.getStaticField("ERROR").isConst());
 
         // TODO check values and value type IE String, Number
 

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d259345a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestConstructor.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestConstructor.java
b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestConstructor.java
index d76eb15..a766576 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestConstructor.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestConstructor.java
@@ -40,7 +40,7 @@ public class TestConstructor extends ExternalsTestBase
 
         assertTrue(model.hasClass("FinalClass"));
         //assertTrue(model.getClassReference("FinalClass").isFinal());
-        assertTrue(model.getClassReference("FinalClass").hasMethod("bar"));
+        assertTrue(model.getClassReference("FinalClass").hasStaticMethod("bar"));
         assertTrue(model.getClassReference("FinalClass").getStaticMethod("bar").isStatic());
     }
 

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d259345a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestExternChrome.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestExternChrome.java
b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestExternChrome.java
index fa655c2..51afce9 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestExternChrome.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestExternChrome.java
@@ -87,13 +87,13 @@ public class TestExternChrome extends ExternalsTestBase
         assertTrue(Port.hasInstanceMethod("postMessage"));
         assertTrue(Port.hasInstanceMethod("disconnect"));
 
-        assertEquals("string", Port.getField("name").toTypeAnnotationString());
+        assertEquals("string", Port.getInstanceField("name").toTypeAnnotationString());
         assertEquals("ChromeEvent",
-                Port.getField("onDisconnect").toTypeAnnotationString());
+                Port.getInstanceField("onDisconnect").toTypeAnnotationString());
         assertEquals("ChromeEvent",
-                Port.getField("onMessage").toTypeAnnotationString());
+                Port.getInstanceField("onMessage").toTypeAnnotationString());
         assertEquals("(MessageSender|undefined)",
-                Port.getField("sender").toTypeAnnotationString());
+                Port.getInstanceField("sender").toTypeAnnotationString());
 
         // chrome
         ClassReference chrome = model.getClassReference("chrome");
@@ -110,7 +110,7 @@ public class TestExternChrome extends ExternalsTestBase
         assertNotNull(chrome_app);
         assertTrue(chrome_app.hasStaticField("isInstalled"));
         assertEquals("boolean",
-                chrome_app.getField("isInstalled").toTypeAnnotationString());
+                chrome_app.getStaticField("isInstalled").toTypeAnnotationString());
 
         // chrome.runtime
         ClassReference chrome_runtime = model.getClassReference("chrome.runtime");
@@ -124,7 +124,7 @@ public class TestExternChrome extends ExternalsTestBase
         assertTrue(chrome_runtime_lastError.hasStaticField("message"));
         assertEquals(
                 "(string|undefined)",
-                chrome_runtime_lastError.getField("message").toTypeAnnotationString());
+                chrome_runtime_lastError.getStaticField("message").toTypeAnnotationString());
 
         // chrome.webstore
         ClassReference chrome_webstore = model.getClassReference("chrome.webstore");

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d259345a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestTypeExternals.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestTypeExternals.java
b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestTypeExternals.java
index e3709c5..514f7a9 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestTypeExternals.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestTypeExternals.java
@@ -43,10 +43,10 @@ public class TestTypeExternals extends ExternalsTestBase
         compile("constructor_members.js");
 
         ClassReference reference = model.getClassReference("Foo");
-        assertTrue(reference.hasField("bar"));
-        assertFalse(reference.hasField("foo"));
-        assertTrue(reference.hasMethod("method1"));
-        assertTrue(reference.hasMethod("method2"));
+        assertTrue(reference.hasInstanceField("bar"));
+        assertFalse(reference.hasInstanceField("foo"));
+        assertTrue(reference.hasInstanceMethod("method1"));
+        assertTrue(reference.hasInstanceMethod("method2"));
         assertTrue(model.hasConstant("bar"));
     }
 

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d259345a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestTypeInheritence.java
----------------------------------------------------------------------
diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestTypeInheritence.java
b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestTypeInheritence.java
index 0fb57bc..ee19443 100644
--- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestTypeInheritence.java
+++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestTypeInheritence.java
@@ -63,7 +63,7 @@ public class TestTypeInheritence extends ExternalsTestBase
         assertSame(Foo, superClasses.get(1));
         assertSame(Object, superClasses.get(2));
 
-        assertTrue(Foo.hasMethod("addEventListener"));
+        assertTrue(Foo.hasInstanceMethod("addEventListener"));
 
         // TODO (mschmalle) need to revisit interface method overload
         // XXX Since Foo implements EventTarget BUT changes it's signature, we have to


Mime
View raw message