From 99c710eac0dd1237ee16d4ef650fd0d91db5d030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sami=20M=C3=A4kinen?= Date: Wed, 30 Nov 2016 17:17:42 +0200 Subject: [PATCH] Removed references to pptx as support was removed earlier --- .../map/WebServiceMapProducerResourceTest.java | 16 ---------------- .../WebServiceMapProducerResourceTestRunner.java | 11 +---------- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/servlet-printout/src/test/java/fi/nls/oskari/printout/ws/jaxrs/map/WebServiceMapProducerResourceTest.java b/servlet-printout/src/test/java/fi/nls/oskari/printout/ws/jaxrs/map/WebServiceMapProducerResourceTest.java index cb76e6d4e8..a677f3c885 100755 --- a/servlet-printout/src/test/java/fi/nls/oskari/printout/ws/jaxrs/map/WebServiceMapProducerResourceTest.java +++ b/servlet-printout/src/test/java/fi/nls/oskari/printout/ws/jaxrs/map/WebServiceMapProducerResourceTest.java @@ -155,22 +155,6 @@ public void testGeojsPrintTestJsonAsPDF() throws FactoryConfigurationError, } - @Test - public void testGeojsPrintTestJsonAsPPTX() - throws NoSuchAuthorityCodeException, IOException, - GeoWebCacheException, FactoryException, ParseException, - XMLStreamException, FactoryConfigurationError, - RequestFilterException, TransformException, - com.vividsolutions.jts.io.ParseException, InterruptedException, - org.json.simple.parser.ParseException, URISyntaxException, - Exception { - runner.setResource(WebServiceMapProducerResourceTest.acquire()); - runner.run("geojsPrintTest-pptx", - WebServiceMapProducerResourceTestFileType.GEOJSON, - WebServiceMapProducerResourceTestFileType.PPTX); - - } - @Test public void testGeojsPrintTestJsonAsPNG() throws NoSuchAuthorityCodeException, IOException, diff --git a/servlet-printout/src/test/java/fi/nls/oskari/printout/ws/jaxrs/map/WebServiceMapProducerResourceTestRunner.java b/servlet-printout/src/test/java/fi/nls/oskari/printout/ws/jaxrs/map/WebServiceMapProducerResourceTestRunner.java index e46a128b07..dc686296b4 100755 --- a/servlet-printout/src/test/java/fi/nls/oskari/printout/ws/jaxrs/map/WebServiceMapProducerResourceTestRunner.java +++ b/servlet-printout/src/test/java/fi/nls/oskari/printout/ws/jaxrs/map/WebServiceMapProducerResourceTestRunner.java @@ -34,7 +34,7 @@ public WebServiceMapProducerResource getResource() { void run(final String testname, WebServiceMapProducerResourceTestFileType input, WebServiceMapProducerResourceTestFileType output) - throws NoSuchAuthorityCodeException, IOException, + throws IOException, GeoWebCacheException, FactoryException, com.vividsolutions.jts.io.ParseException, ParseException, XMLStreamException, FactoryConfigurationError, @@ -73,15 +73,6 @@ void run(final String testname, throw new IOException("Invalid args for PDF test"); } break; -// case PPTX: -// switch (input) { -// case GEOJSON: -// result = resource.getGeoJsonMapPPTX(inp, xClientInfo); -// break; -// default: -// throw new IOException("Invalid args for PPTX test"); -// } -// break; default: throw new IOException("Invalid args for test"); }