Return-Path: X-Original-To: apmail-flex-commits-archive@www.apache.org Delivered-To: apmail-flex-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6290018389 for ; Thu, 17 Dec 2015 06:49:50 +0000 (UTC) Received: (qmail 44448 invoked by uid 500); 17 Dec 2015 06:49:45 -0000 Delivered-To: apmail-flex-commits-archive@flex.apache.org Received: (qmail 44421 invoked by uid 500); 17 Dec 2015 06:49:45 -0000 Mailing-List: contact commits-help@flex.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flex.apache.org Delivered-To: mailing list commits@flex.apache.org Received: (qmail 44413 invoked by uid 99); 17 Dec 2015 06:49:45 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Dec 2015 06:49:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 33582DFFF4; Thu, 17 Dec 2015 06:49:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aharui@apache.org To: commits@flex.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: [flex-falcon] [refs/heads/develop] - fix tests after upgrading to new externs Date: Thu, 17 Dec 2015 06:49:45 +0000 (UTC) Repository: flex-falcon Updated Branches: refs/heads/develop ce2d38a89 -> b5776589d fix tests after upgrading to new externs Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/b5776589 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/b5776589 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/b5776589 Branch: refs/heads/develop Commit: b5776589dcd593dfffdaf8196fd24024d0b98ff1 Parents: ce2d38a Author: Alex Harui Authored: Wed Dec 16 22:49:39 2015 -0800 Committer: Alex Harui Committed: Wed Dec 16 22:49:39 2015 -0800 ---------------------------------------------------------------------- .../codegen/externals/ExternalsTestUtils.java | 68 ++++++++++---------- .../codegen/externals/TestExternChrome.java | 2 +- .../codegen/externals/TestExternES3.java | 3 +- 3 files changed, 37 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b5776589/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/ExternalsTestUtils.java ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/ExternalsTestUtils.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/ExternalsTestUtils.java index a601eea..2c27ee7 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/ExternalsTestUtils.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/ExternalsTestUtils.java @@ -119,51 +119,51 @@ public class ExternalsTestUtils config.addExternal(coreRoot + "/es5.js"); config.addExternal(coreRoot + "/es6.js"); - config.addExternal(coreRoot + "/w3c_anim_timing.js"); - config.addExternal(coreRoot + "/w3c_audio.js"); - config.addExternal(coreRoot + "/w3c_batterystatus.js"); - config.addExternal(coreRoot + "/w3c_css.js"); - config.addExternal(coreRoot + "/w3c_css3d.js"); - config.addExternal(coreRoot + "/w3c_device_sensor_event.js"); - config.addExternal(coreRoot + "/w3c_dom1.js"); - config.addExternal(coreRoot + "/w3c_dom2.js"); - config.addExternal(coreRoot + "/w3c_dom3.js"); - config.addExternal(coreRoot + "/w3c_elementtraversal.js"); - config.addExternal(coreRoot + "/w3c_encoding.js"); - config.addExternal(coreRoot + "/w3c_event.js"); - config.addExternal(coreRoot + "/w3c_event3.js"); - config.addExternal(coreRoot + "/w3c_geolocation.js"); - config.addExternal(coreRoot + "/w3c_indexeddb.js"); - config.addExternal(coreRoot + "/w3c_navigation_timing.js"); - config.addExternal(coreRoot + "/w3c_range.js"); - config.addExternal(coreRoot + "/w3c_rtc.js"); - config.addExternal(coreRoot + "/w3c_selectors.js"); + config.addExternal(coreRoot + "/browser/w3c_anim_timing.js"); + config.addExternal(coreRoot + "/browser/w3c_audio.js"); + config.addExternal(coreRoot + "/browser/w3c_batterystatus.js"); + config.addExternal(coreRoot + "/browser/w3c_css.js"); + config.addExternal(coreRoot + "/browser/w3c_css3d.js"); + config.addExternal(coreRoot + "/browser/w3c_device_sensor_event.js"); + config.addExternal(coreRoot + "/browser/w3c_dom1.js"); + config.addExternal(coreRoot + "/browser/w3c_dom2.js"); + config.addExternal(coreRoot + "/browser/w3c_dom3.js"); + config.addExternal(coreRoot + "/browser/w3c_elementtraversal.js"); + config.addExternal(coreRoot + "/browser/w3c_encoding.js"); + config.addExternal(coreRoot + "/browser/w3c_event.js"); + config.addExternal(coreRoot + "/browser/w3c_event3.js"); + config.addExternal(coreRoot + "/browser/w3c_geolocation.js"); + config.addExternal(coreRoot + "/browser/w3c_indexeddb.js"); + config.addExternal(coreRoot + "/browser/w3c_navigation_timing.js"); + config.addExternal(coreRoot + "/browser/w3c_range.js"); + config.addExternal(coreRoot + "/browser/w3c_rtc.js"); + config.addExternal(coreRoot + "/browser/w3c_selectors.js"); //model.addExternal(coreRoot + "/w3c_serviceworker.js"); //model.addExternal(coreRoot + "/w3c_webcrypto.js"); - config.addExternal(coreRoot + "/w3c_xml.js"); + config.addExternal(coreRoot + "/browser/w3c_xml.js"); //model.addExternal(coreRoot + "/fetchapi"); - config.addExternal(coreRoot + "/window.js"); + config.addExternal(coreRoot + "/browser/window.js"); - config.addExternal(coreRoot + "/ie_dom.js"); - config.addExternal(coreRoot + "/gecko_dom.js"); + config.addExternal(coreRoot + "/browser/ie_dom.js"); + config.addExternal(coreRoot + "/browser/gecko_dom.js"); - config.addExternal(coreRoot + "/webkit_css.js"); - config.addExternal(coreRoot + "/webkit_dom.js"); - config.addExternal(coreRoot + "/webkit_event.js"); + config.addExternal(coreRoot + "/browser/webkit_css.js"); + config.addExternal(coreRoot + "/browser/webkit_dom.js"); + config.addExternal(coreRoot + "/browser/webkit_event.js"); //model.addExternal(coreRoot + "/webkit_notifications.js"); - config.addExternal(coreRoot + "/iphone.js"); - config.addExternal(coreRoot + "/chrome.js"); - config.addExternal(coreRoot + "/flash.js"); + config.addExternal(coreRoot + "/browser/iphone.js"); + config.addExternal(coreRoot + "/browser/chrome.js"); + config.addExternal(coreRoot + "/browser/flash.js"); - config.addExternal(coreRoot + "/page_visibility.js"); - config.addExternal(coreRoot + "/fileapi.js"); - config.addExternal(coreRoot + "/html5.js"); + config.addExternal(coreRoot + "/browser/page_visibility.js"); + config.addExternal(coreRoot + "/browser/fileapi.js"); + config.addExternal(coreRoot + "/browser/html5.js"); - config.addExternal(coreRoot + "/webgl.js"); - config.addExternal(coreRoot + "/webstorage.js"); + config.addExternal(coreRoot + "/browser/webgl.js"); + config.addExternal(coreRoot + "/browser/webstorage.js"); config.addExternal(coreRoot + "/svg.js"); } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b5776589/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 707510a..fa655c2 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 @@ -147,7 +147,7 @@ public class TestExternChrome extends ExternalsTestBase config.setASRoot(ExternalsTestUtils.AS_ROOT_DIR); String coreRoot = ExternalsTestUtils.EXTERNAL_JS_DIR.getAbsolutePath(); - config.addExternal(coreRoot + "/chrome.js"); + config.addExternal(coreRoot + "/browser/chrome.js"); } } http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b5776589/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestExternES3.java ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestExternES3.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestExternES3.java index 0d8ef89..29ac6fb 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestExternES3.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/externals/TestExternES3.java @@ -59,7 +59,8 @@ public class TestExternES3 extends ExternalsTestBase "URIError", "Math" }; - assertEquals(17, model.getClasses().size()); + // IObject and IArrayLike are two extras + assertEquals(19, model.getClasses().size()); for (String className : classes) { assertTrue(model.hasClass(className));