Bug 381931 - Dummy JSF JARs used for testing should be removed, along with tests that reference them
diff --git a/jsf/tests/org.eclipse.jst.jsf.core.tests/src/org/eclipse/jst/jsf/core/tests/facet/JsfLibraryValidatorTest.java b/jsf/tests/org.eclipse.jst.jsf.core.tests/src/org/eclipse/jst/jsf/core/tests/facet/JsfLibraryValidatorTest.java
index 1b58f51..5754f70 100644
--- a/jsf/tests/org.eclipse.jst.jsf.core.tests/src/org/eclipse/jst/jsf/core/tests/facet/JsfLibraryValidatorTest.java
+++ b/jsf/tests/org.eclipse.jst.jsf.core.tests/src/org/eclipse/jst/jsf/core/tests/facet/JsfLibraryValidatorTest.java
@@ -20,11 +20,12 @@
public class JsfLibraryValidatorTest extends LibraryValidatorTest
{
private static final String CLASS_NAME_IDENTIFYING_IMPLEMENTATION_JAR = "javax/faces/render/RenderKit.class"; //$NON-NLS-1$
+ /*
private static final String JARFILE = "testfiles/facet/jsflibrary-api-1.1.3.jar"; //$NON-NLS-1$
private static final String JARFILE_WITHOUT_IMPLEMENTATION_VERSION_ENTRY = "testfiles/facet/no-version-entry/jsflibrary-api-1.1.3.jar"; //$NON-NLS-1$
private static final String JARFILE_WITH_NONSTANDARD_IMPLEMENTATION_VERSION_ENTRY = "testfiles/facet/nonstandard_implementation_version/jsflibrary-api-1.1.3.jar"; //$NON-NLS-1$
private static final String EXPECTED_LIBRARY_VERSION = "1.1.3"; //$NON-NLS-1$
-
+ */
/**
* @param name
@@ -32,10 +33,12 @@
public JsfLibraryValidatorTest (final String name)
{
super(name,
- CLASS_NAME_IDENTIFYING_IMPLEMENTATION_JAR,
+ CLASS_NAME_IDENTIFYING_IMPLEMENTATION_JAR
+ /*
JARFILE,
JARFILE_WITHOUT_IMPLEMENTATION_VERSION_ENTRY,
JARFILE_WITH_NONSTANDARD_IMPLEMENTATION_VERSION_ENTRY,
- EXPECTED_LIBRARY_VERSION);
+ EXPECTED_LIBRARY_VERSION*/
+ );
}
}
\ No newline at end of file
diff --git a/jsf/tests/org.eclipse.jst.jsf.core.tests/src/org/eclipse/jst/jsf/core/tests/facet/LibraryValidatorTest.java b/jsf/tests/org.eclipse.jst.jsf.core.tests/src/org/eclipse/jst/jsf/core/tests/facet/LibraryValidatorTest.java
index ccd3c29..d18ef40 100644
--- a/jsf/tests/org.eclipse.jst.jsf.core.tests/src/org/eclipse/jst/jsf/core/tests/facet/LibraryValidatorTest.java
+++ b/jsf/tests/org.eclipse.jst.jsf.core.tests/src/org/eclipse/jst/jsf/core/tests/facet/LibraryValidatorTest.java
@@ -12,19 +12,9 @@
package org.eclipse.jst.jsf.core.tests.facet;
-import java.io.File;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.jar.JarFile;
-
import junit.framework.TestCase;
-import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jst.jsf.core.tests.TestsPlugin;
-import org.osgi.framework.Bundle;
/**
@@ -34,10 +24,12 @@
public abstract class LibraryValidatorTest extends TestCase
{
private String classNameIdentifyingJarToUse;
+ /*
private String jarPath;
private String jarPathWithoutImplementationVersionEntry;
private String jarPathWithNonstandardImplementationVersionEntry;
private String expectedLibraryVersion;
+ */
private UserLibraryVersionValidatorProxy validator;
@@ -51,19 +43,23 @@
public LibraryValidatorTest (final String name,
- final String classNameIdentifyingJarToUse,
+ final String classNameIdentifyingJarToUse
+ /*
final String jarPath,
final String jarPathWithoutImplementationVersionEntry,
final String jarPathWithNonstandardImplementationVersionEntry,
- final String expectedLibraryVersion)
+ final String expectedLibraryVersion*/
+ )
{
super(name);
this.classNameIdentifyingJarToUse = classNameIdentifyingJarToUse;
+ /*
this.jarPath = jarPath;
this.jarPathWithoutImplementationVersionEntry = jarPathWithoutImplementationVersionEntry;
this.jarPathWithNonstandardImplementationVersionEntry = jarPathWithNonstandardImplementationVersionEntry;
this.expectedLibraryVersion = expectedLibraryVersion;
+ */
this.validator = new UserLibraryVersionValidatorProxy(this.classNameIdentifyingJarToUse);
}
@@ -113,7 +109,7 @@
fail();
}
-
+ /*
protected File getFileFromPlugin (final String relativePathToFile,
final Plugin plugin)
throws IOException, URISyntaxException
@@ -128,23 +124,25 @@
assertTrue(file.exists());
return file;
}
+ */
-
+ /*
public void testReadLibraryVersionFromJarWithManifestEntry ()
throws IOException, URISyntaxException
{
final JarFile jarFile = new JarFile(getFileFromPlugin(jarPath, TestsPlugin.getDefault()));
assertEquals(expectedLibraryVersion, validator.getLibraryVersion(jarFile));
}
+ */
-
+ /*
public void testReadLibraryVersionFromJarWithoutManifestEntry ()
throws IOException, URISyntaxException
{
final JarFile jarFile = new JarFile(getFileFromPlugin(jarPathWithoutImplementationVersionEntry, TestsPlugin.getDefault()));
assertNull("Was expecting library-version string to be null", validator.getLibraryVersion(jarFile)); //$NON-NLS-1$
}
-
+ */
/**
* Regression test-case. This would fail earlier without the patch in
@@ -156,6 +154,7 @@
* @throws URISyntaxException
*
*/
+ /*
public void testReadLibraryVersionFromJarWithNonstandardImplementationVersion()
throws IOException, URISyntaxException
{
@@ -163,4 +162,5 @@
assertNotNull("Was expecting library-version string to be non-null", validator.getLibraryVersion(jarFile)); //$NON-NLS-1$
assertEquals(expectedLibraryVersion, validator.getLibraryVersion(jarFile));
}
+ */
}
diff --git a/jsf/tests/org.eclipse.jst.jsf.core.tests/testfiles/facet/jsflibrary-api-1.1.3.jar b/jsf/tests/org.eclipse.jst.jsf.core.tests/testfiles/facet/jsflibrary-api-1.1.3.jar
deleted file mode 100644
index f4fac81..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.core.tests/testfiles/facet/jsflibrary-api-1.1.3.jar
+++ /dev/null
Binary files differ
diff --git a/jsf/tests/org.eclipse.jst.jsf.core.tests/testfiles/facet/no-version-entry/jsflibrary-api-1.1.3.jar b/jsf/tests/org.eclipse.jst.jsf.core.tests/testfiles/facet/no-version-entry/jsflibrary-api-1.1.3.jar
deleted file mode 100644
index 5cff505..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.core.tests/testfiles/facet/no-version-entry/jsflibrary-api-1.1.3.jar
+++ /dev/null
Binary files differ
diff --git a/jsf/tests/org.eclipse.jst.jsf.core.tests/testfiles/facet/nonstandard_implementation_version/jsflibrary-api-1.1.3.jar b/jsf/tests/org.eclipse.jst.jsf.core.tests/testfiles/facet/nonstandard_implementation_version/jsflibrary-api-1.1.3.jar
deleted file mode 100644
index 4bc7917..0000000
--- a/jsf/tests/org.eclipse.jst.jsf.core.tests/testfiles/facet/nonstandard_implementation_version/jsflibrary-api-1.1.3.jar
+++ /dev/null
Binary files differ