azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KJS: switch to using Nashorn instead of Rhino for JS backend tests

Browse Source
This commit is contained in:
Zalim Bashorov
2017-04-21 16:39:39 +03:00
parent a39a0abb2a
commit 76fa6ad5c2
18 changed files with 542 additions and 747 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/testData/box/native/nestedElements.js
Vendored
+6 -6
View File
@@ -1,9 +1,9 @@
var Object = createTestObject("Object", 23);
extend(Object, {
Object: extend(createTestObject("Object.Object", 123), { AnotherClass : createTestClass("Object.Object.Class", 42, 142) }),
Class: createTestClass("Object.Class", 42, 142),
Trait : createTestObject("Object.Trait", 324),
a: createTestObject("Object.a", 34)
var MyObject = createTestObject("MyObject", 23);
extend(MyObject, {
Object: extend(createTestObject("MyObject.Object", 123), { AnotherClass : createTestClass("MyObject.Object.Class", 42, 142) }),
Class: createTestClass("MyObject.Class", 42, 142),
Trait : createTestObject("MyObject.Trait", 324),
a: createTestObject("MyObject.a", 34)
});
var SomeClass = function () {};
js/js.translator/testData/box/native/nestedElements.kt
Vendored
+21 -21
View File
@@ -3,29 +3,29 @@ package foo
fun box(): String {
// in object
assertEquals("Object.Object.a", Object.Object.a)
assertEquals("Object.Object.b", Object.Object.b)
assertEquals(123, Object.Object.test())
assertEquals("MyObject.Object.a", MyObject.Object.a)
assertEquals("MyObject.Object.b", MyObject.Object.b)
assertEquals(123, MyObject.Object.test())
assertEquals("Object.Object.Class().a", Object.Object.Class("Object.Object.Class().a").a)
assertEquals("Object.Object.Class().b", Object.Object.Class("something").b)
assertEquals(42, Object.Object.Class("something").test())
assertEquals("Object.Object.Class.a", Object.Object.Class.a)
assertEquals("Object.Object.Class.b", Object.Object.Class.b)
assertEquals(142, Object.Object.Class.test())
assertEquals("MyObject.Object.Class().a", MyObject.Object.Class("MyObject.Object.Class().a").a)
assertEquals("MyObject.Object.Class().b", MyObject.Object.Class("something").b)
assertEquals(42, MyObject.Object.Class("something").test())
assertEquals("MyObject.Object.Class.a", MyObject.Object.Class.a)
assertEquals("MyObject.Object.Class.b", MyObject.Object.Class.b)
assertEquals(142, MyObject.Object.Class.test())
assertEquals("Object.Class().a", Object.Class("Object.Class().a").a)
assertEquals("Object.Class().b", Object.Class("something").b)
assertEquals(42, Object.Class("something").test())
assertEquals("Object.Class.a", Object.Class.a)
assertEquals("Object.Class.b", Object.Class.b)
assertEquals(142, Object.Class.test())
assertEquals("MyObject.Class().a", MyObject.Class("MyObject.Class().a").a)
assertEquals("MyObject.Class().b", MyObject.Class("something").b)
assertEquals(42, MyObject.Class("something").test())
assertEquals("MyObject.Class.a", MyObject.Class.a)
assertEquals("MyObject.Class.b", MyObject.Class.b)
assertEquals(142, MyObject.Class.test())
assertEquals("Object.a.a", Object.a.a)
assertEquals("Object.a.b", Object.a.b)
assertEquals(34, Object.a.test())
assertEquals("Object.b", Object.b)
assertEquals(23, Object.test())
assertEquals("MyObject.a.a", MyObject.a.a)
assertEquals("MyObject.a.b", MyObject.a.b)
assertEquals(34, MyObject.a.test())
assertEquals("MyObject.b", MyObject.b)
assertEquals(23, MyObject.test())
// in class
@@ -49,7 +49,7 @@ fun box(): String {
return "OK";
}
external object Object {
external object MyObject {
object Object {
val a: String = definedExternally
var b: String = definedExternally
js/js.translator/testData/rhino-polyfills.js → js/js.translator/testData/nashorn-polyfills.js
Vendored
-12
View File
@@ -37,16 +37,4 @@
});
}
}
// Patch apply to work with TypedArrays if needed.
try {
(function() {}).apply(null, new Int32Array(0))
} catch (e) {
var apply = Function.prototype.apply;
Object.defineProperty(Function.prototype, 'apply', {
value: function(self, array) {
return apply.call(this, self, [].slice.call(array));
}
});
}
})();
js/js.translator/testData/webDemoExamples2/bottles2.out
Vendored
-2
View File
@@ -8,5 +8,3 @@ Take one down, pass it around, no more bottles of beer on the wall.
No more bottles of beer on the wall, no more bottles of beer.
Go to the store and buy some more, 2 bottles of beer on the wall.
js/js.translator/testData/webDemoExamples2/builder.out
Vendored
+37 -36
View File
@@ -1,37 +1,38 @@
<html>
<head>
<title>
XML encoding with Kotlin
</title>
</head>
<body>
<h1>
XML encoding with Kotlin
</h1>
<p>
this format can be used as an alternative markup to XML
</p>
<a href="http://jetbrains.com/kotlin">
Kotlin
</a>
<p>
This is some
<b>
mixed
</b>
text. For more see the
<a href="http://jetbrains.com/kotlin">
Kotlin
</a>
project
</p>
<p>
some text
</p>
<p>
Command line arguments were:
<ul>
</ul>
</p>
</body>
</html>
<head>
<title>
XML encoding with Kotlin
</title>
</head>
<body>
<h1>
XML encoding with Kotlin
</h1>
<p>
this format can be used as an alternative markup to XML
</p>
<a href="http://jetbrains.com/kotlin">
Kotlin
</a>
<p>
This is some
<b>
mixed
</b>
text. For more see the
<a href="http://jetbrains.com/kotlin">
Kotlin
</a>
project
</p>
<p>
some text
</p>
<p>
Command line arguments were:
<ul>
</ul>
</p>
</body>
</html>
js/js.translator/testData/webDemoExamples2/builder1.out
Vendored
+39 -38
View File
@@ -1,40 +1,41 @@
<html>
<head>
<title>
XML encoding with Kotlin
</title>
</head>
<body>
<h1>
XML encoding with Kotlin
</h1>
<p>
this format can be used as an alternative markup to XML
</p>
<a href="http://jetbrains.com/kotlin">
Kotlin
</a>
<p>
This is some
<b>
mixed
</b>
text. For more see the
<a href="http://jetbrains.com/kotlin">
Kotlin
</a>
project
</p>
<p>
some text
</p>
<p>
Command line arguments were:
<ul>
<li>
over9000
</li>
</ul>
</p>
</body>
<head>
<title>
XML encoding with Kotlin
</title>
</head>
<body>
<h1>
XML encoding with Kotlin
</h1>
<p>
this format can be used as an alternative markup to XML
</p>
<a href="http://jetbrains.com/kotlin">
Kotlin
</a>
<p>
This is some
<b>
mixed
</b>
text. For more see the
<a href="http://jetbrains.com/kotlin">
Kotlin
</a>
project
</p>
<p>
some text
</p>
<p>
Command line arguments were:
<ul>
<li>
over9000
</li>
</ul>
</p>
</body>
</html>
js/js.translator/testData/webDemoExamples2/life.out
Vendored
+288 -287
View File
@@ -1,323 +1,324 @@
Step: 1
***
Step: 2
*
*
Step: 3
Step: 1
*
***
*
*
***
*
Step: 2
***
* *
***
***
* *
***
Step: 3
*
* *
* *
* *
*
*
* *
* *
* *
*
Step: 4
*
***
** **
***
*
*
***
** **
***
*
Step: 5
***
* *
* *
* *
***
***
* *
* *
* *
***
Step: 6
***
* * *
*** **
* * *
***
***
* * *
*** **
* * *
***
Step: 7
***
* *
* *
* *
***
***
* *
* *
* *
***
Step: 8
**
* * *
*** **
* * *
**
**
* * *
*** **
* * *
**
Step: 9
***
* * *
* * *
* * *
***
***
* * *
* * *
* * *
***
Step: 10
***
* *
** * *
* *
***
***
* *
** * *
* *
***
Step: 1
*
* *
*
*
* *
*
Step: 2
*
* *
*
*
* *
*
Step: 3
*
* *
*
*
* *
*
Step: 1
**
**
**
**
**
**
Step: 2
**
* *
**
**
* *
**
Step: 3
**
* *
**
**
* *
**
Step: 1
**
**
**
**
**
**
**
**
Step: 2
**
*
*
**
**
*
*
**
Step: 3
**
**
**
**
**
**
**
**
Step: 4
**
*
*
**
**
*
*
**
Step: 5
**
**
**
**
**
**
**
**
Step: 6
**
*
*
**
**
*
*
**
Step: 1
*** ***
* * * *
* * * *
* * * *
*** ***
*** ***
* * * *
* * * *
* * * *
*** ***
*** ***
* * * *
* * * *
* * * *
*** ***
*** ***
* * * *
* * * *
* * * *
*** ***
Step: 2
* *
* *
** **
*** ** ** ***
* * * * * *
** **
** **
* * * * * *
*** ** ** ***
** **
* *
* *
* *
* *
** **
*** ** ** ***
* * * * * *
** **
** **
* * * * * *
*** ** ** ***
** **
* *
* *
Step: 3
** **
** **
* * * * * *
*** ** ** ***
* * * * * *
*** ***
*** ***
* * * * * *
*** ** ** ***
* * * * * *
** **
** **
** **
** **
* * * * * *
*** ** ** ***
* * * * * *
*** ***
*** ***
* * * * * *
*** ** ** ***
* * * * * *
** **
** **
Step: 4
*** ***
* * * *
* * * *
* * * *
*** ***
*** ***
* * * *
* * * *
* * * *
*** ***
*** ***
* * * *
* * * *
* * * *
*** ***
*** ***
* * * *
* * * *
* * * *
*** ***
Step: 5
* *
* *
** **
*** ** ** ***
* * * * * *
** **
** **
* * * * * *
*** ** ** ***
** **
* *
* *
* *
* *
** **
*** ** ** ***
* * * * * *
** **
** **
* * * * * *
*** ** ** ***
** **
* *
* *
Step: 6
** **
** **
* * * * * *
*** ** ** ***
* * * * * *
*** ***
*** ***
* * * * * *
*** ** ** ***
* * * * * *
** **
** **
** **
** **
* * * * * *
*** ** ** ***
* * * * * *
*** ***
*** ***
* * * * * *
*** ** ** ***
* * * * * *
** **
** **
Step: 7
*** ***
* * * *
* * * *
* * * *
*** ***
*** ***
* * * *
* * * *
* * * *
*** ***
*** ***
* * * *
* * * *
* * * *
*** ***
*** ***
* * * *
* * * *
* * * *
*** ***
Step: 8
* *
* *
** **
*** ** ** ***
* * * * * *
** **
** **
* * * * * *
*** ** ** ***
** **
* *
* *
* *
* *
** **
*** ** ** ***
* * * * * *
** **
** **
* * * * * *
*** ** ** ***
** **
* *
* *
Step: 9
** **
** **
* * * * * *
*** ** ** ***
* * * * * *
*** ***
*** ***
* * * * * *
*** ** ** ***
* * * * * *
** **
** **
** **
** **
* * * * * *
*** ** ** ***
* * * * * *
*** ***
*** ***
* * * * * *
*** ** ** ***
* * * * * *
** **
** **
Step: 10
*** ***
* * * *
* * * *
* * * *
*** ***
*** ***
* * * *
* * * *
* * * *
*** ***
*** ***
* * * *
* * * *
* * * *
*** ***
*** ***
* * * *
* * * *
* * * *
*** ***