Skip to content

Commit ab491e1

Browse files
committed
[GR-21025] Test for HereDocument.
PullRequest: js/1360
2 parents 9e012c3 + 0aca734 commit ab491e1

File tree

5 files changed

+72
-15
lines changed

5 files changed

+72
-15
lines changed

graal-js/src/com.oracle.truffle.js.test.external/src/com/oracle/truffle/js/test/external/nashorn/TestNashorn.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,6 @@ public TestRunnable createTestRunnable(TestFile file) {
9191
return new TestNashornRunnable(this, file);
9292
}
9393

94-
@Override
95-
protected void setupTestFile(TestFile testFile) {
96-
}
97-
9894
@Override
9995
protected File getTestsConfigFile() {
10096
return Paths.get(getConfig().getSuiteConfigLoc(), TESTS_CONFIG_FILE).toFile();

graal-js/src/com.oracle.truffle.js.test.external/src/com/oracle/truffle/js/test/external/suite/TestSuite.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,6 @@ public Engine getSharedEngine() {
151151

152152
protected abstract TestRunnable createTestRunnable(TestFile file);
153153

154-
protected abstract void setupTestFile(TestFile testFile);
155-
156154
protected abstract File getTestsConfigFile();
157155

158156
protected abstract File getUnexpectedlyFailedTestsFile();
@@ -348,7 +346,6 @@ private TestFile createTestFile(File file) {
348346
TestFile testFile = new TestFile(relativizeTestPath(file));
349347
testFile.setStatus(TestFile.Status.PASS);
350348
testFile.setRunInIsolation(false);
351-
setupTestFile(testFile);
352349
// possibly merge with config
353350
final String filePath = testFile.getFilePath();
354351
TestFile configuredTestFile = testsConfig.get(filePath);

graal-js/src/com.oracle.truffle.js.test.external/src/com/oracle/truffle/js/test/external/test262/Test262.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,6 @@ public TestRunnable createTestRunnable(TestFile file) {
140140
return new Test262Runnable(this, file);
141141
}
142142

143-
@Override
144-
protected void setupTestFile(TestFile testFile) {
145-
}
146-
147143
@Override
148144
protected File getTestsConfigFile() {
149145
return Paths.get(getConfig().getSuiteConfigLoc(), TESTS_CONFIG_FILE).toFile();

graal-js/src/com.oracle.truffle.js.test.external/src/com/oracle/truffle/js/test/external/testv8/TestV8.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,6 @@ public TestRunnable createTestRunnable(TestFile file) {
128128
return new TestV8Runnable(this, file);
129129
}
130130

131-
@Override
132-
protected void setupTestFile(TestFile testFile) {
133-
}
134-
135131
@Override
136132
protected File getTestsConfigFile() {
137133
return Paths.get(getConfig().getSuiteConfigLoc(), TESTS_CONFIG_FILE).toFile();
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
/*
2+
* Copyright (c) 2020, 2020, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* The Universal Permissive License (UPL), Version 1.0
6+
*
7+
* Subject to the condition set forth below, permission is hereby granted to any
8+
* person obtaining a copy of this software, associated documentation and/or
9+
* data (collectively the "Software"), free of charge and under any and all
10+
* copyright rights in the Software, and any and all patent rights owned or
11+
* freely licensable by each licensor hereunder covering either (i) the
12+
* unmodified Software as contributed to or provided by such licensor, or (ii)
13+
* the Larger Works (as defined below), to deal in both
14+
*
15+
* (a) the Software, and
16+
*
17+
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
18+
* one is included with the Software each a "Larger Work" to which the Software
19+
* is contributed by such licensors),
20+
*
21+
* without restriction, including without limitation the rights to copy, create
22+
* derivative works of, display, perform, and distribute the Software and make,
23+
* use, sell, offer for sale, import, export, have made, and have sold the
24+
* Software and the Larger Work(s), and to sublicense the foregoing rights on
25+
* either these or other terms.
26+
*
27+
* This license is subject to the following condition:
28+
*
29+
* The above copyright notice and either this complete permission notice or at a
30+
* minimum a reference to the UPL must be included in all copies or substantial
31+
* portions of the Software.
32+
*
33+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
34+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
35+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
36+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
37+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
38+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
39+
* SOFTWARE.
40+
*/
41+
package com.oracle.truffle.js.test.nashorn;
42+
43+
import org.graalvm.polyglot.Context;
44+
import org.graalvm.polyglot.Source;
45+
import org.graalvm.polyglot.Value;
46+
import org.junit.Assert;
47+
import org.junit.Test;
48+
49+
import com.oracle.truffle.js.lang.JavaScriptLanguage;
50+
import com.oracle.truffle.js.runtime.JSContextOptions;
51+
import com.oracle.truffle.js.test.JSTest;
52+
53+
public class HereDocumentTest {
54+
private static String testIntl(String sourceText) {
55+
try (Context context = JSTest.newContextBuilder().option(JSContextOptions.NASHORN_COMPATIBILITY_MODE_NAME, "true").option(JSContextOptions.SCRIPTING_NAME, "true").build()) {
56+
Value result = context.eval(Source.newBuilder(JavaScriptLanguage.ID, sourceText, "here-document-test").buildLiteral());
57+
Assert.assertTrue(result.isString());
58+
return result.asString();
59+
}
60+
}
61+
62+
@Test
63+
public void hereDocumentTest() {
64+
String sourceCode = "var str = <<EOD\n" +
65+
"line1\n" +
66+
" line2\n" +
67+
" line3\n" +
68+
"EOD\n" +
69+
"str;";
70+
Assert.assertEquals("line1\n line2\n line3", testIntl(sourceCode));
71+
}
72+
}

0 commit comments

Comments
 (0)