Changed the tests for the proper emission of JSDoc annotations for the interface members.
Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/58352859 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/58352859 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/58352859 Branch: refs/heads/maven Commit: 583528598d3079c5d7e1242b119db6c9d8f43f7d Parents: 17ccd49 Author: Erik de Bruin <e...@ixsoftware.nl> Authored: Fri Dec 6 11:19:37 2013 +0100 Committer: Erik de Bruin <e...@ixsoftware.nl> Committed: Fri Dec 6 11:19:37 2013 +0100 ---------------------------------------------------------------------- .../internal/codegen/js/flexjs/TestFlexJSInterface.java | 6 +++--- .../compiler/internal/codegen/js/goog/TestGoogProject.java | 2 ++ .../flexjs/projects/interfaces/interfaces/IE_result.js | 6 ++++++ 3 files changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/58352859/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSInterface.java ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSInterface.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSInterface.java index eff48c5..1bc10f4 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSInterface.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSInterface.java @@ -43,7 +43,7 @@ public class TestFlexJSInterface extends TestGoogInterface + "function get foo1():Object;" + "function set foo1(value:Object):void;}"); asBlockWalker.visitInterface(node); - assertOut("/**\n * @interface\n */\nIA = function() {\n};\n\n\nIA.prototype.get_foo1 = function() {};\n\n\nIA.prototype.set_foo1 = function(value) {};"); + assertOut("/**\n * @interface\n */\nIA = function() {\n};\n\n\n/**\n * @return {Object}\n */\nIA.prototype.get_foo1 = function() {};\n\n\n/**\n * @param {Object} value\n */\nIA.prototype.set_foo1 = function(value) {};"); } @Override @@ -54,7 +54,7 @@ public class TestFlexJSInterface extends TestGoogInterface + "function baz1():Object;" + "function baz2(value:Object):void;}"); asBlockWalker.visitInterface(node); - assertOut("/**\n * @interface\n */\nIA = function() {\n};\n\n\nIA.prototype.baz1 = function() {};\n\n\nIA.prototype.baz2 = function(value) {};"); + assertOut("/**\n * @interface\n */\nIA = function() {\n};\n\n\n/**\n * @return {Object}\n */\nIA.prototype.baz1 = function() {};\n\n\n/**\n * @param {Object} value\n */\nIA.prototype.baz2 = function(value) {};"); } @Override @@ -67,7 +67,7 @@ public class TestFlexJSInterface extends TestGoogInterface + "function baz1():Object;" + "function baz2(value:Object):void;}"); asBlockWalker.visitInterface(node); - assertOut("/**\n * @interface\n */\nIA = function() {\n};\n\n\nIA.prototype.get_foo1 = function() {};\n\n\nIA.prototype.set_foo1 = function(value) {};\n\n\nIA.prototype.baz1 = function() {};\n\n\nIA.prototype.baz2 = function(value) {};"); + assertOut("/**\n * @interface\n */\nIA = function() {\n};\n\n\n/**\n * @return {Object}\n */\nIA.prototype.get_foo1 = function() {};\n\n\n/**\n * @param {Object} value\n */\nIA.prototype.set_foo1 = function(value) {};\n\n\n/**\n * @return {Object}\n */\nIA.prototype.baz1 = function() {};\n\n\n/**\n * @param {Object} value\n */\nIA.prototype.baz2 = function(value) {};"); } protected IBackend createBackend() http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/58352859/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogProject.java ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogProject.java b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogProject.java index df4e612..c41f820 100644 --- a/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogProject.java +++ b/compiler.jx.tests/src/org/apache/flex/compiler/internal/codegen/js/goog/TestGoogProject.java @@ -80,6 +80,8 @@ public class TestGoogProject extends ASTestBase + backend.getOutputExtension(); String compiledResult = readCodeFile(new File(compiledFilePath)); + System.out.println(compiledResult); + String expectedFilePath = new File("test-files").getAbsolutePath() + File.separator + testDirPath + File.separator + compiledFileName + "_result" + "." http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/58352859/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IE_result.js ---------------------------------------------------------------------- diff --git a/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IE_result.js b/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IE_result.js index d1443d7..4ca2e21 100644 --- a/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IE_result.js +++ b/compiler.jx.tests/test-files/flexjs/projects/interfaces/interfaces/IE_result.js @@ -20,9 +20,15 @@ interfaces.IE = function() { interfaces.IE.prototype.myMethod = function() {}; +/** + * @return {string} + */ interfaces.IE.prototype.get_myProp = function() {}; +/** + * @param {string} value + */ interfaces.IE.prototype.set_myProp = function(value) {};
