Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCurtis D'Entremont2006-11-09 19:25:11 +0000
committerCurtis D'Entremont2006-11-09 19:25:11 +0000
commitd8a5f4b7f039fb9781b94b26f7d716d5ccd2c315 (patch)
tree643bd1d0ac96c311f7680d1fc54f3a255e1b8626 /org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests
parent493bb0871612962a7e466e855eaef8169589a796 (diff)
downloadeclipse.platform.ua-d8a5f4b7f039fb9781b94b26f7d716d5ccd2c315.tar.gz
eclipse.platform.ua-d8a5f4b7f039fb9781b94b26f7d716d5ccd2c315.tar.xz
eclipse.platform.ua-d8a5f4b7f039fb9781b94b26f7d716d5ccd2c315.zip
163558 Dynamic content support for all UA
Diffstat (limited to 'org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests')
-rw-r--r--org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/parser/InvalidCheatsheet.java4
-rw-r--r--org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/parser/ParseFromString.java2
-rw-r--r--org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/parser/TolerateTest.java2
-rw-r--r--org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/parser/ValidTest.java2
-rw-r--r--org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/util/CheatSheetModelSerializerTest.java2
5 files changed, 6 insertions, 6 deletions
diff --git a/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/parser/InvalidCheatsheet.java b/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/parser/InvalidCheatsheet.java
index ccd217c44..f0525ad89 100644
--- a/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/parser/InvalidCheatsheet.java
+++ b/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/parser/InvalidCheatsheet.java
@@ -34,12 +34,12 @@ public class InvalidCheatsheet extends TestCase {
private ICheatSheet parseTestFile(String path) {
URL testURL = ResourceFinder.findFile(UserAssistanceTestPlugin.getDefault(),
INVALID_CHEATSHEET_FOLDER + path);
- return parser.parse(testURL, CheatSheetParser.SIMPLE_ONLY);
+ return parser.parse(testURL, UserAssistanceTestPlugin.getPluginId(), CheatSheetParser.SIMPLE_ONLY);
}
public void testBadURL() {
try {
- assertNull(parser.parse(new URL("file:/nonexistent"), CheatSheetParser.SIMPLE_ONLY));
+ assertNull(parser.parse(new URL("file:/nonexistent"), UserAssistanceTestPlugin.getPluginId(), CheatSheetParser.SIMPLE_ONLY));
} catch (MalformedURLException e) {
fail("Exception thrown");
}
diff --git a/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/parser/ParseFromString.java b/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/parser/ParseFromString.java
index e2196b4c6..198c12cc4 100644
--- a/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/parser/ParseFromString.java
+++ b/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/parser/ParseFromString.java
@@ -63,7 +63,7 @@ public class ParseFromString extends TestCase {
public void testUrlParserInput() {
URL testURL = ResourceFinder.findFile(UserAssistanceTestPlugin.getDefault(),
"data/cheatsheet/valid/HelloWorld.xml");
- ParserInput input = new ParserInput(testURL);
+ ParserInput input = new ParserInput(testURL, UserAssistanceTestPlugin.getPluginId());
assertNull(input.getXml());
assertTrue(testURL.equals(input.getUrl()));
}
diff --git a/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/parser/TolerateTest.java b/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/parser/TolerateTest.java
index 04009ecb9..afcab3306 100644
--- a/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/parser/TolerateTest.java
+++ b/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/parser/TolerateTest.java
@@ -44,7 +44,7 @@ public class TolerateTest extends TestCase {
Assert.assertTrue("Unable to find sample cheat sheets to test parser", urls.length > 0);
for (int i=0;i<urls.length;++i) {
CheatSheetParser parser = new CheatSheetParser();
- CheatSheet sheet = (CheatSheet)parser.parse(urls[i], CheatSheetParser.SIMPLE_ONLY);
+ CheatSheet sheet = (CheatSheet)parser.parse(urls[i], UserAssistanceTestPlugin.getPluginId(), CheatSheetParser.SIMPLE_ONLY);
Assert.assertEquals("Warning not generated: " + urls[i], IStatus.WARNING, parser.getStatus().getSeverity());
Assert.assertNotNull("Tried parsing a tolerable cheat sheet but parser returned null: " + urls[i], sheet);
}
diff --git a/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/parser/ValidTest.java b/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/parser/ValidTest.java
index 2979e5cb7..94ca1880b 100644
--- a/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/parser/ValidTest.java
+++ b/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/parser/ValidTest.java
@@ -45,7 +45,7 @@ public class ValidTest extends TestCase {
Assert.assertTrue("Unable to find sample cheat sheets to test parser", urls.length > 0);
for (int i=0;i<urls.length;++i) {
CheatSheetParser parser = new CheatSheetParser();
- CheatSheet sheet = (CheatSheet)parser.parse(urls[i], CheatSheetParser.ANY);
+ CheatSheet sheet = (CheatSheet)parser.parse(urls[i], UserAssistanceTestPlugin.getPluginId(), CheatSheetParser.ANY);
Assert.assertNotNull("Tried parsing a valid cheat sheet but parser returned null: " + urls[i], sheet);
String path = urls[i].toString().substring("file:".length());
diff --git a/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/util/CheatSheetModelSerializerTest.java b/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/util/CheatSheetModelSerializerTest.java
index 7e1f891d9..368c7c6ab 100644
--- a/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/util/CheatSheetModelSerializerTest.java
+++ b/org.eclipse.ua.tests/cheatsheet/org/eclipse/ua/tests/cheatsheet/util/CheatSheetModelSerializerTest.java
@@ -57,7 +57,7 @@ public class CheatSheetModelSerializerTest extends TestCase {
Assert.assertTrue("Unable to find sample cheat sheets to test parser", urls.length > 0);
for (int i=0;i<urls.length;++i) {
CheatSheetParser parser = new CheatSheetParser();
- CheatSheet sheet = (CheatSheet)parser.parse(urls[i], CheatSheetParser.ANY);
+ CheatSheet sheet = (CheatSheet)parser.parse(urls[i], UserAssistanceTestPlugin.getPluginId(), CheatSheetParser.ANY);
Assert.assertNotNull("Tried parsing a valid cheat sheet but parser returned null: " + urls[i], sheet);
PrintWriter out = new PrintWriter(new FileOutputStream(FileUtil.getResultFile(urls[i].toString().substring("file:/".length()))));

Back to the top