[131764] Fix for failing XSD JUnit test.
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xsd.validation.tests/META-INF/MANIFEST.MF index faa7811..80ff3cd 100644 --- a/tests/org.eclipse.wst.xsd.validation.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.wst.xsd.validation.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: XSD Validation Tests Plug-in Bundle-SymbolicName: org.eclipse.wst.xsd.validation.tests -Bundle-Version: 1.0.0 +Bundle-Version: 1.0.2 Bundle-ClassPath: validatexsdtests.jar Bundle-Activator: org.eclipse.wst.xsd.validation.tests.internal.XSDValidationTestsPlugin Bundle-Vendor: Eclipse
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/build.properties b/tests/org.eclipse.wst.xsd.validation.tests/build.properties index d584972..4f4bed0 100644 --- a/tests/org.eclipse.wst.xsd.validation.tests/build.properties +++ b/tests/org.eclipse.wst.xsd.validation.tests/build.properties
@@ -1,15 +1,9 @@ -bin.includes = plugin.xml,\ - *.jar,\ - validatexsdtests.jar,\ +bin.includes = validatexsdtests.jar,\ test.xml,\ testresources/,\ META-INF/,\ about.html -source.validatexsdtests.jar = src/ -src.includes = plugin.xml,\ - build.xml,\ - .options,\ - build.properties +source.validatexsdtests.jar = src/ bin.excludes = testresources/.cvsignore,\ testresources/generatedResults/
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/BugFixesTest.java b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/BugFixesTest.java index 1dfea8b..cb36f14 100644 --- a/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/BugFixesTest.java +++ b/tests/org.eclipse.wst.xsd.validation.tests/src/org/eclipse/wst/xsd/validation/tests/internal/BugFixesTest.java
@@ -146,4 +146,17 @@ runTest(testfile, loglocation, idealloglocation); } + + /** + * Test /BugFixes/ImportWithIncorrectSlash/A.xsd + */ + public void testImportWithIncorrectSlash() + { + String testname = "A"; + String testfile = FILE_PROTOCOL + PLUGIN_ABSOLUTE_PATH + SAMPLES_DIR + BUGFIXES_DIR + "ImportWithIncorrectSlash/" + testname + ".xsd"; + String loglocation = PLUGIN_ABSOLUTE_PATH + GENERATED_RESULTS_DIR + BUGFIXES_DIR + "ImportWithIncorrectSlash/" + testname + ".xsd-log"; + String idealloglocation = PLUGIN_ABSOLUTE_PATH + IDEAL_RESULTS_DIR + BUGFIXES_DIR + "ImportWithIncorrectSlash/" + testname + ".xsd-log"; + + runTest(testfile, loglocation, idealloglocation); + } } \ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportInvalidLocation/ImportInvalidLocation.xsd-log b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportInvalidLocation/ImportInvalidLocation.xsd-log index 46e0eaa..faffcef 100644 --- a/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportInvalidLocation/ImportInvalidLocation.xsd-log +++ b/tests/org.eclipse.wst.xsd.validation.tests/testresources/idealResults/BugFixes/ImportInvalidLocation/ImportInvalidLocation.xsd-log
@@ -4,5 +4,5 @@ ------------error list------------------------------------------- (none) ------------warning list----------------------------------------- -schema_reference.4: Failed to read schema document 'testresources/samples/BugFixes/ImportInvalidLocation/subdir/importing.xsda', because 1) could not find the document; 2) the document could not be read; 3) the root element of the document is not <xsd:schema>. [3, 98] +schema_reference.4: Failed to read schema document 'subdir/importing.xsda', because 1) could not find the document; 2) the document could not be read; 3) the root element of the document is not <xsd:schema>. [3, 98] -----------------------------------------------------------------