diff options
Diffstat (limited to 'org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/TocServiceTest.java')
-rw-r--r-- | org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/TocServiceTest.java | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/TocServiceTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/TocServiceTest.java index 87f2b8f8a..84458b2fd 100644 --- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/TocServiceTest.java +++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/webapp/service/TocServiceTest.java @@ -1,15 +1,17 @@ /******************************************************************************* - * Copyright (c) 2011, 2015 IBM Corporation and others. + * Copyright (c) 2011, 2016 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ package org.eclipse.ua.tests.help.webapp.service; +import static org.junit.Assert.assertEquals; + import java.io.InputStream; import java.net.URL; @@ -19,6 +21,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import org.eclipse.help.internal.entityresolver.LocalEntityResolver; import org.eclipse.help.internal.server.WebappManager; import org.eclipse.ua.tests.help.remote.TocServletTest; +import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.xml.sax.InputSource; @@ -43,7 +46,7 @@ public class TocServiceTest extends TocServletTest { /* * Disabled, see Bug 339274 - public void testTocServiceXMLSchema() + public void testTocServiceXMLSchema() throws Exception { int port = WebappManager.getPort(); URL url = new URL("http", "localhost", port, "/help/vs/service/toc?lang=en"); @@ -51,12 +54,12 @@ public class TocServiceTest extends TocServletTest { String schema = schemaUrl.toString(); String uri = url.toString(); String result = SchemaValidator.testXMLSchema(uri, schema); - + assertEquals("URL: \"" + uri + "\" is ", "valid", result); } */ - - public void testTocServiceJSONSchema() + @Test + public void testTocServiceJSONSchema() throws Exception { /*int port = WebappManager.getPort(); URL url = new URL("http", "localhost", port, "/help/vs/service/toc?lang=en"); @@ -64,7 +67,7 @@ public class TocServiceTest extends TocServletTest { String schema = schemaUrl.toString(); String uri = url.toString(); String result = SchemaValidator.testJSONSchema(uri, schema); - + assertEquals("URL: \"" + uri + "\" is ", "valid", result);*/ // fail("Not yet implemented."); } |