1 files changed, 0 insertions, 140 deletions
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogReaderTest.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogReaderTest.java
deleted file mode 100644
index 079355e87..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogReaderTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package org.eclipse.wst.xml.catalog.tests.internal;
-
-import java.net.URL;
-import java.util.List;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xml.core.internal.catalog.Catalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-
-
-public class CatalogReaderTest extends AbstractCatalogTest {
-
-	protected void setUp() throws Exception {
-		super.setUp();
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	public CatalogReaderTest(String name) {
-		super(name);
-	}
-
-
-	/*
-	 * Class under test for void read(ICatalog, String)
-	 */
-	public void testReadCatalog()throws Exception {
-
-		//read catalog
-		String catalogFile = "/data/catalog1.xml";
-		URL catalogUrl = TestPlugin.getDefault().getBundle().getEntry(catalogFile);
-		assertNotNull(catalogUrl);
-		URL base = Platform.resolve(catalogUrl);
-
-		Catalog catalog = (Catalog)getCatalog("catalog1", base.toString());
-		//CatalogReader.read(catalog, catalogFilePath);
-		assertNotNull(catalog);
-		
-		// test main catalog - catalog1.xml
-		//assertEquals("cat1", catalog.getId());
-		assertEquals(3, catalog.getCatalogEntries().length);
-			
-		// test public entries
-		List entries = CatalogTest.getCatalogEntries(catalog, ICatalogEntry.ENTRY_TYPE_PUBLIC);
-		assertEquals(1, entries.size());
-		ICatalogEntry entry = (ICatalogEntry)entries.get(0);
-		//String resolvedURI = URIHelper.makeAbsolute(base, "./Invoice/Invoice.dtd");
-		
-		assertEquals("./Invoice/Invoice.dtd", entry.getURI());
-		assertEquals("InvoiceId_test", entry.getKey());
-		assertEquals("http://webURL", entry.getAttributeValue("webURL"));
-
-		
-		//  test system entries
-		entries = CatalogTest.getCatalogEntries(catalog, ICatalogEntry.ENTRY_TYPE_SYSTEM);
-		assertEquals(1, entries.size());
-		entry = (ICatalogEntry)entries.get(0);
-		assertEquals("./Invoice/Invoice.dtd", entry.getURI());
-		assertEquals("Invoice.dtd", entry.getKey());
-		assertEquals("yes", entry.getAttributeValue("chached"));
-		assertEquals("value1", entry.getAttributeValue("property"));
-
-
-		//  test uri entries
-		entries = CatalogTest.getCatalogEntries(catalog, ICatalogEntry.ENTRY_TYPE_URI);
-		assertEquals(1, entries.size());
-		entry = (ICatalogEntry)entries.get(0);
-		assertEquals("./Invoice/Invoice.dtd", entry.getURI());
-		assertEquals("http://www.test.com/Invoice.dtd", entry.getKey());
-		assertEquals("no", entry.getAttributeValue("chached"));
-		assertEquals("value2", entry.getAttributeValue("property"));
-		
-		//  test next catalog - catalog2.xml
-		INextCatalog[] nextCatalogEntries = catalog.getNextCatalogs();
-		assertEquals(1, nextCatalogEntries.length);
-	
-		INextCatalog nextCatalogEntry = (INextCatalog)nextCatalogEntries[0];
-		assertNotNull(nextCatalogEntry);
-		
-//		String catalogRefId = nextCatalogEntry.getCatalogRefId();
-//		assertEquals("nextCatalog1", catalogRefId);
-		//resolvedURI = URIHelper.makeAbsolute(base, "catalog2.xml");
-		assertEquals("catalog2.xml", nextCatalogEntry.getCatalogLocation());
-
-		ICatalog nextCatalog = nextCatalogEntry.getReferencedCatalog();
-
-		assertNotNull(nextCatalog);
-		assertEquals(4, nextCatalog.getCatalogEntries().length);
-		
-		// test public entries
-		entries = CatalogTest.getCatalogEntries(nextCatalog, ICatalogEntry.ENTRY_TYPE_PUBLIC);
-		assertEquals(2, entries.size());
-		entry = (ICatalogEntry)entries.get(0);
-		//resolvedURI = URIHelper.makeAbsolute(nextCatalog.getBase(), "./PublicationCatalog/Catalogue.xsd");
-		assertEquals("./PublicationCatalog/Catalogue.xsd", entry.getURI());
-		assertEquals("http://www.eclipse.org/webtools/Catalogue_001", entry.getKey());
-		
-		// test public entry from a group
-		entry = (ICatalogEntry)entries.get(1);
-		//resolvedURI = URIHelper.makeAbsolute(nextCatalog.getBase(), "./PublicationCatalog/Catalogue.xsd");
-		assertEquals("./PublicationCatalog/Catalogue.xsd", entry.getURI());
-		assertEquals("http://www.eclipse.org/webtools/Catalogue_002", entry.getKey());
-
-		//  test system entries
-		entries = CatalogTest.getCatalogEntries(nextCatalog, ICatalogEntry.ENTRY_TYPE_SYSTEM);
-		assertEquals(1, entries.size());
-		entry = (ICatalogEntry)entries.get(0);
-		assertEquals("./PublicationCatalog/Catalogue.xsd", entry.getURI());
-		assertEquals("Catalogue.xsd", entry.getKey());
-		//  test uri entries
-		entries = CatalogTest.getCatalogEntries(nextCatalog, ICatalogEntry.ENTRY_TYPE_URI);
-		assertEquals(1, entries.size());
-		entry = (ICatalogEntry)entries.get(0);
-		assertEquals("http://www.eclipse.org/webtools/Catalogue/Catalogue.xsd", entry.getURI());
-		assertEquals("http://www.eclipse.org/webtools/Catalogue.xsd", entry.getKey());
-		
-
-	}
-	
-	public void testCompatabilityReader() throws Exception {
-		//	read catalog
-		String catalogFile = "/data/compatabilityTest.xmlcatalog";
-		URL catalogUrl = TestPlugin.getDefault().getBundle().getEntry(catalogFile);
-		assertNotNull(catalogUrl);
-		URL base = Platform.resolve(catalogUrl);
-
-		Catalog catalog = (Catalog)getCatalog("compatabilityCatalog", base.toString());
-		//CatalogReader.read(catalog, catalogFilePath);
-		assertNotNull(catalog);
-		List entries = CatalogTest.getCatalogEntries(catalog, ICatalogEntry.ENTRY_TYPE_PUBLIC);
-		assertEquals(1, entries.size());
-		ICatalogEntry entry = (ICatalogEntry)entries.get(0);
-		assertEquals("platform:/resource/XMLExamples/Invoice2/Invoice.dtd", entry.getURI());
-		assertEquals("InvoiceId", entry.getKey());
-	}
-}