This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch feature/rename
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
The following commit(s) were added to refs/heads/feature/rename by this push:
new f0119cb fix more tests
f0119cb is described below
commit f0119cbe8669dc286ba26c919d426aa338e82247
Author: Alex Harui <aha...@apache.org>
AuthorDate: Sun Oct 15 21:38:55 2017 -0700
fix more tests
---
.../mxml/royale/TestRoyaleMXMLApplication.java | 12 ++++----
.../compiler/internal/test/RoyaleTestBase.java | 12 --------
.../royale/files/RoyaleTest_again_result.js | 36 +++++++++++-----------
.../royale/files/controllers/MyController.as | 6 ++--
.../files/controllers/MyController_result.js | 8 ++---
5 files changed, 31 insertions(+), 43 deletions(-)
diff --git
a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/royale/TestRoyaleMXMLApplication.java
b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/royale/TestRoyaleMXMLApplication.java
index e75ffcf..d983ea8 100644
---
a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/royale/TestRoyaleMXMLApplication.java
+++
b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/mxml/royale/TestRoyaleMXMLApplication.java
@@ -834,7 +834,7 @@ public class TestRoyaleMXMLApplication extends
RoyaleTestBase
args[1] = "-compiler.allow-subclass-overrides";
args[2] = "-remove-circulars";
args[3] = "-library-path=" + new
File(FilenameNormalization.normalize(env.ASJS + "/frameworks/libs")).getPath();
- args[4] = "-js-library-path=" + new
File(FilenameNormalization.normalize(env.ASJS +
"/frameworks/js/Royale/libs")).getPath();
+ args[4] = "-js-library-path=" + new
File(FilenameNormalization.normalize(env.ASJS +
"/frameworks/js/libs")).getPath();
args[5] = "-external-library-path+=" +
testAdapter.getPlayerglobal().getPath();
args[6] = "-js-external-library-path+=" + new
File(FilenameNormalization.normalize(env.ASJS + "/js/libs/js.swc")).getPath();
args[7] = "-output=" + new File(testAdapter.getTempDir(),
"bin-debug/RoyaleTest_again.swf").getPath();
@@ -869,11 +869,11 @@ public class TestRoyaleMXMLApplication extends
RoyaleTestBase
else
args[9] = "-define=COMPILE::temp,false";
args[10] = "-compiler.allow-subclass-overrides";
- args[11] = "-compiler.js-library-path=" + new
File(FilenameNormalization.normalize(env.ASJS +
"/frameworks/js/Royale/libs/CoreJS.swc")).getPath();
- args[12] = "-compiler.js-library-path+=" + new
File(FilenameNormalization.normalize(env.ASJS +
"/frameworks/js/Royale/libs/BindingJS.swc")).getPath();
- args[13] = "-compiler.js-library-path+=" + new
File(FilenameNormalization.normalize(env.ASJS +
"/frameworks/js/Royale/libs/NetworkJS.swc")).getPath();
- args[14] = "-compiler.js-library-path+=" + new
File(FilenameNormalization.normalize(env.ASJS +
"/frameworks/js/Royale/libs/CollectionsJS.swc")).getPath();
- args[15] = "-compiler.js-library-path+=" + new
File(FilenameNormalization.normalize(env.ASJS +
"/frameworks/js/Royale/libs/BasicJS.swc")).getPath();
+ args[11] = "-compiler.js-library-path=" + new
File(FilenameNormalization.normalize(env.ASJS +
"/frameworks/js/libs/CoreJS.swc")).getPath();
+ args[12] = "-compiler.js-library-path+=" + new
File(FilenameNormalization.normalize(env.ASJS +
"/frameworks/js/libs/BindingJS.swc")).getPath();
+ args[13] = "-compiler.js-library-path+=" + new
File(FilenameNormalization.normalize(env.ASJS +
"/frameworks/js/libs/NetworkJS.swc")).getPath();
+ args[14] = "-compiler.js-library-path+=" + new
File(FilenameNormalization.normalize(env.ASJS +
"/frameworks/js/libs/CollectionsJS.swc")).getPath();
+ args[15] = "-compiler.js-library-path+=" + new
File(FilenameNormalization.normalize(env.ASJS +
"/frameworks/js/libs/BasicJS.swc")).getPath();
args[16] = "-compiler.js-external-library-path=" + new
File(FilenameNormalization.normalize(env.ASJS + "/js/libs/js.swc")).getPath();
args[17] = new File(testAdapter.getUnitTestBaseDir(),
"royale/files/RoyaleTest_again_Flash.mxml").getPath();
diff --git
a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/RoyaleTestBase.java
b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/RoyaleTestBase.java
index 0e2b8d8..67ef4fb 100644
---
a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/RoyaleTestBase.java
+++
b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/RoyaleTestBase.java
@@ -72,18 +72,6 @@ public class RoyaleTestBase extends TestBase
}
@Override
- protected void addNamespaceMappings(List<IMXMLNamespaceMapping>
namespaceMappings)
- {
- namespaceMappings
- .add(new MXMLNamespaceMapping(
- "library://ns.apache.org/royale/basic", new File(
- env.ASJS + "/frameworks/as/basic-manifest.xml")
- .getAbsolutePath()));
-
- super.addNamespaceMappings(namespaceMappings);
- }
-
- @Override
protected void addSourcePaths(List<File> sourcePaths)
{
sourcePaths.add(new File(env.ASJS + "/examples/RoyaleTest_basic/src"));
diff --git
a/compiler-jx/src/test/resources/royale/files/RoyaleTest_again_result.js
b/compiler-jx/src/test/resources/royale/files/RoyaleTest_again_result.js
index 409b50b..a8664fa 100644
--- a/compiler-jx/src/test/resources/royale/files/RoyaleTest_again_result.js
+++ b/compiler-jx/src/test/resources/royale/files/RoyaleTest_again_result.js
@@ -12,14 +12,14 @@
* limitations under the License.
*/
/**
- * FlexJSTest_again
+ * RoyaleTest_again
*
* @fileoverview
*
* @suppress {checkTypes|accessControls}
*/
-goog.provide('FlexJSTest_again');
+goog.provide('RoyaleTest_again');
goog.require('org.apache.royale.core.Application');
goog.require('org.apache.royale.core.SimpleCSSValuesImpl');
@@ -38,8 +38,8 @@ goog.require('org.apache.royale.events.Event');
* @constructor
* @extends {org.apache.royale.core.Application}
*/
-FlexJSTest_again = function() {
- FlexJSTest_again.base(this, 'constructor');
+RoyaleTest_again = function() {
+ RoyaleTest_again.base(this, 'constructor');
/**
* @private
@@ -124,13 +124,13 @@ this.$EH0
]);
};
-goog.inherits(FlexJSTest_again, org.apache.royale.core.Application);
+goog.inherits(RoyaleTest_again, org.apache.royale.core.Application);
/**
* Prevent renaming of class. Needed for reflection.
*/
-goog.exportSymbol('FlexJSTest_again', FlexJSTest_again);
+goog.exportSymbol('RoyaleTest_again', RoyaleTest_again);
@@ -138,20 +138,20 @@ goog.exportSymbol('FlexJSTest_again', FlexJSTest_again);
* @export
* @param {org.apache.royale.events.Event} event
*/
-FlexJSTest_again.prototype.$EH0 = function(event)
+RoyaleTest_again.prototype.$EH0 = function(event)
{
org.apache.royale.utils.Language.as(this.model, models.MyModel,
true).labelText = 'Hello World';
};
-Object.defineProperties(FlexJSTest_again.prototype, /** @lends
{FlexJSTest_again.prototype} */ {
+Object.defineProperties(RoyaleTest_again.prototype, /** @lends
{RoyaleTest_again.prototype} */ {
/** @export */
service: {
- /** @this {FlexJSTest_again} */
+ /** @this {RoyaleTest_again} */
get: function() {
return this.service_;
},
- /** @this {FlexJSTest_again} */
+ /** @this {RoyaleTest_again} */
set: function(value) {
if (value != this.service_) {
this.service_ = value;
@@ -161,11 +161,11 @@ Object.defineProperties(FlexJSTest_again.prototype, /**
@lends {FlexJSTest_again
},
/** @export */
collection: {
- /** @this {FlexJSTest_again} */
+ /** @this {RoyaleTest_again} */
get: function() {
return this.collection_;
},
- /** @this {FlexJSTest_again} */
+ /** @this {RoyaleTest_again} */
set: function(value) {
if (value != this.collection_) {
this.collection_ = value;
@@ -179,7 +179,7 @@ Object.defineProperties(FlexJSTest_again.prototype, /**
@lends {FlexJSTest_again
*
* @type {Object.<string, Array.<Object>>}
*/
-FlexJSTest_again.prototype.ROYALE_CLASS_INFO = { names: [{ name:
'FlexJSTest_again', qName: 'FlexJSTest_again', kind: 'class' }] };
+RoyaleTest_again.prototype.ROYALE_CLASS_INFO = { names: [{ name:
'RoyaleTest_again', qName: 'RoyaleTest_again', kind: 'class' }] };
@@ -188,19 +188,19 @@ FlexJSTest_again.prototype.ROYALE_CLASS_INFO = { names:
[{ name: 'FlexJSTest_aga
*
* @return {Object.<string, Function>}
*/
-FlexJSTest_again.prototype.ROYALE_REFLECTION_INFO = function () {
+RoyaleTest_again.prototype.ROYALE_REFLECTION_INFO = function () {
return {
variables: function () {return {};},
accessors: function () {
return {
- 'service': { type: 'org.apache.royale.net.HTTPService', access:
'readwrite', declaredBy: 'FlexJSTest_again'},
- 'collection': { type: 'org.apache.royale.collections.LazyCollection',
access: 'readwrite', declaredBy: 'FlexJSTest_again'}
+ 'service': { type: 'org.apache.royale.net.HTTPService', access:
'readwrite', declaredBy: 'RoyaleTest_again'},
+ 'collection': { type: 'org.apache.royale.collections.LazyCollection',
access: 'readwrite', declaredBy: 'RoyaleTest_again'}
};
},
methods: function () {
return {
- 'FlexJSTest_again': { type: '', declaredBy: 'FlexJSTest_again'},
- '$EH0': { type: 'void', declaredBy: 'FlexJSTest_again'}
+ 'RoyaleTest_again': { type: '', declaredBy: 'RoyaleTest_again'},
+ '$EH0': { type: 'void', declaredBy: 'RoyaleTest_again'}
};
}
};
diff --git
a/compiler-jx/src/test/resources/royale/files/controllers/MyController.as
b/compiler-jx/src/test/resources/royale/files/controllers/MyController.as
index 72e52ce..b85567f 100644
--- a/compiler-jx/src/test/resources/royale/files/controllers/MyController.as
+++ b/compiler-jx/src/test/resources/royale/files/controllers/MyController.as
@@ -31,14 +31,14 @@ package controllers
{
if (app)
{
- this.app = app as FlexJSTest_again;
+ this.app = app as RoyaleTest_again;
app.addEventListener("viewChanged",
viewChangeHandler);
}
}
private var queryBegin:String =
"http://query.yahooapis.com/v1/public/yql?q=select%20*%20from%20yahoo.finance.quotes%20where%20symbol%20in%20(%22";
private var queryEnd:String =
"%22)%0A%09%09&env=http%3A%2F%2Fdatatables.org%2Falltables.env&format=json";
- private var app:FlexJSTest_again;
+ private var app:RoyaleTest_again;
private function viewChangeHandler(event:Event):void
{
@@ -84,7 +84,7 @@ package controllers
public function setDocument(document:Object, id:String =
null):void
{
- this.app = document as FlexJSTest_again;
+ this.app = document as RoyaleTest_again;
app.addEventListener("viewChanged", viewChangeHandler);
}
diff --git
a/compiler-jx/src/test/resources/royale/files/controllers/MyController_result.js
b/compiler-jx/src/test/resources/royale/files/controllers/MyController_result.js
index 857194f..e51daad 100644
---
a/compiler-jx/src/test/resources/royale/files/controllers/MyController_result.js
+++
b/compiler-jx/src/test/resources/royale/files/controllers/MyController_result.js
@@ -21,8 +21,8 @@
goog.provide('controllers.MyController');
-goog.require('FlexJSTest_again');
goog.require('MyInitialView');
+goog.require('RoyaleTest_again');
goog.require('models.MyModel');
goog.require('org.apache.royale.core.IDocument');
goog.require('org.apache.royale.utils.Language');
@@ -37,7 +37,7 @@ goog.require('org.apache.royale.utils.Language');
controllers.MyController = function(app) {
app = typeof app !== 'undefined' ? app : null;
if (app) {
- this.app = org.apache.royale.utils.Language.as(app, FlexJSTest_again);
+ this.app = org.apache.royale.utils.Language.as(app, RoyaleTest_again);
app.addEventListener("viewChanged",
org.apache.royale.utils.Language.closure(this.viewChangeHandler, this,
'viewChangeHandler'));
}
};
@@ -65,7 +65,7 @@ controllers.MyController.prototype.queryEnd =
"%22)%0A%09%09&env=http%3A%2F%2Fda
/**
* @private
- * @type {FlexJSTest_again}
+ * @type {RoyaleTest_again}
*/
controllers.MyController.prototype.app;
@@ -147,7 +147,7 @@ controllers.MyController.prototype.comboBoxChangeHandler =
function(event) {
*/
controllers.MyController.prototype.setDocument = function(document, id) {
id = typeof id !== 'undefined' ? id : null;
- this.app = org.apache.royale.utils.Language.as(document, FlexJSTest_again);
+ this.app = org.apache.royale.utils.Language.as(document, RoyaleTest_again);
this.app.addEventListener("viewChanged",
org.apache.royale.utils.Language.closure(this.viewChangeHandler, this,
'viewChangeHandler'));
};
--
To stop receiving notification emails like this one, please contact
['"commits@royale.apache.org" <commits@royale.apache.org>'].
