updates to do more path checks
diff --git a/tests/org.eclipse.e4.languages.javascript.junit.test/META-INF/MANIFEST.MF b/tests/org.eclipse.e4.languages.javascript.junit.test/META-INF/MANIFEST.MF
index a3b68ce..77f9eb1 100644
--- a/tests/org.eclipse.e4.languages.javascript.junit.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.e4.languages.javascript.junit.test/META-INF/MANIFEST.MF
@@ -4,5 +4,6 @@
Bundle-SymbolicName: org.eclipse.e4.languages.javascript.junit.test
Bundle-Version: 1.0.0.qualifier
Require-Bundle: org.junit,
- org.eclipse.e4.languages.javascript.junit;bundle-version="1.0.0"
+ org.eclipse.e4.languages.javascript.junit;bundle-version="1.0.0",
+ org.eclipse.equinox.common;bundle-version="3.6.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/org.eclipse.e4.languages.javascript.junit.test/src/org/eclipse/e4/languages/javascript/junit/test/BasicJavaScriptTest.java b/tests/org.eclipse.e4.languages.javascript.junit.test/src/org/eclipse/e4/languages/javascript/junit/test/BasicJavaScriptTest.java
index f2a455b..b17dcbb 100644
--- a/tests/org.eclipse.e4.languages.javascript.junit.test/src/org/eclipse/e4/languages/javascript/junit/test/BasicJavaScriptTest.java
+++ b/tests/org.eclipse.e4.languages.javascript.junit.test/src/org/eclipse/e4/languages/javascript/junit/test/BasicJavaScriptTest.java
@@ -8,6 +8,13 @@
*******************************************************************************/
package org.eclipse.e4.languages.javascript.junit.test;
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+import org.eclipse.core.runtime.FileLocator;
import org.eclipse.e4.languages.javascript.junit.JavaScriptTestCase;
public class BasicJavaScriptTest extends JavaScriptTestCase {
@@ -20,6 +27,8 @@
super(name, null);
useJavaTests();
}
+
+
public void testBasics() {
eval("var x = 7;");
@@ -27,4 +36,37 @@
eval("assertTrue('test', true);");
eval("assertTrue(true);");
}
+
+ public void testBasics2() throws URISyntaxException {
+ URL test2jsURL = getClass().getResource("test2.js");
+ eval(readContents(test2jsURL), test2jsURL.toURI().toString());
+ eval("assertEquals('farleysmoke',farleysmoke);");
+ }
+
+ public void testBasics3() throws URISyntaxException, IOException {
+ URL test2jsURL = getClass().getResource("test2.js");
+ File test2jsFile = new File(FileLocator.toFileURL(test2jsURL).toURI());
+ eval(readContents(test2jsURL), test2jsFile.getAbsolutePath());
+ eval("assertEquals('farleysmoke',farleysmoke);");
+ }
+
+ public void testBasics4() throws URISyntaxException, IOException {
+ URL test2jsURL = getClass().getResource("test2.js");
+ File test2jsFile = new File(FileLocator.toFileURL(test2jsURL).toURI());
+ eval(readContents(test2jsURL), test2jsFile.toURI().toString());
+ eval("assertEquals('farleysmoke',farleysmoke);");
+ }
+
+ public void testBasics5() throws URISyntaxException, IOException {
+ URL test2jsURL = getClass().getResource("test2.js");
+ eval(readContents(test2jsURL), "org.eclipse.e4.languages.javascript.junit.test/src/org/eclipse/e4/languages/javascript/junit/test/test2.js");
+ eval("assertEquals('farleysmoke',farleysmoke);");
+ }
+
+ public void testBasics6() throws URISyntaxException, IOException {
+ URL test2jsURL = getClass().getResource("test2.js");
+ File test2jsFile = new File("C:\\workspaces\\runtime-New_configuration\\org.eclipse.e4.languages.javascript.junit.test\\src\\org\\eclipse\\e4\\languages\\javascript\\junit\\test\\test2.js");
+ eval(readContents(test2jsURL), test2jsFile.toURI().toString());
+ eval("assertEquals('farleysmoke',farleysmoke);");
+ }
}
diff --git a/tests/org.eclipse.e4.languages.javascript.junit.test/src/org/eclipse/e4/languages/javascript/junit/test/test.js b/tests/org.eclipse.e4.languages.javascript.junit.test/src/org/eclipse/e4/languages/javascript/junit/test/test.js
index 636f94e..c9bd089 100644
--- a/tests/org.eclipse.e4.languages.javascript.junit.test/src/org/eclipse/e4/languages/javascript/junit/test/test.js
+++ b/tests/org.eclipse.e4.languages.javascript.junit.test/src/org/eclipse/e4/languages/javascript/junit/test/test.js
@@ -1,4 +1,4 @@
-var AssertTestCase = TestCase.extend("AssertTestCase");
+var AssertTestCase = TestCase.create("AssertTestCase");
AssertTestCase.prototype.testAssertTrue = function() {
assertTrue(true);
assertTrue("test", true);
@@ -23,7 +23,7 @@
assertTrue(true);
};
-var MyTestCase2 = TestCase.extend("MyTestCase2");
+var MyTestCase2 = TestCase.create("MyTestCase2");
MyTestCase2.prototype.testA = function() {
assertTrue(true);
assertNotUndefined(this.testSetup);
@@ -35,7 +35,7 @@
this.testSetup = true;
};
-var MyTestCase3 = TestCase.extend("MyTestCase3", {
+var MyTestCase3 = TestCase.create("MyTestCase3", {
testA: function() {
assertTrue(true);
assertNotUndefined(this.testSetup);
diff --git a/tests/org.eclipse.e4.languages.javascript.junit.test/src/org/eclipse/e4/languages/javascript/junit/test/test2.js b/tests/org.eclipse.e4.languages.javascript.junit.test/src/org/eclipse/e4/languages/javascript/junit/test/test2.js
new file mode 100644
index 0000000..78b25c1
--- /dev/null
+++ b/tests/org.eclipse.e4.languages.javascript.junit.test/src/org/eclipse/e4/languages/javascript/junit/test/test2.js
@@ -0,0 +1,9 @@
+var jump = 7;
+
+var farley = function(f) {
+ return "farley" + f;
+};
+
+var smoke = "smoke";
+
+var farleysmoke = farley(smoke);
