Repository: tika Updated Branches: refs/heads/master 559557aa3 -> c5b9cb778
clean up tests in server that used to rely on EvilParser (early name for MockParser)...discovered while working on 2.x branch TIKA-1 8 5 1. Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/c5b9cb77 Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/c5b9cb77 Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/c5b9cb77 Branch: refs/heads/master Commit: c5b9cb778acc26e65b908aaaaedc9696141eb2ce Parents: 559557a Author: tballison <[email protected]> Authored: Fri Feb 5 21:12:58 2016 -0500 Committer: tballison <[email protected]> Committed: Fri Feb 5 21:12:58 2016 -0500 ---------------------------------------------------------------------- .../org/apache/tika/server/StackTraceOffTest.java | 2 -- .../java/org/apache/tika/server/StackTraceTest.java | 2 -- .../META-INF/services/org.apache.tika.parser.Parser | 16 ---------------- 3 files changed, 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tika/blob/c5b9cb77/tika-server/src/test/java/org/apache/tika/server/StackTraceOffTest.java ---------------------------------------------------------------------- diff --git a/tika-server/src/test/java/org/apache/tika/server/StackTraceOffTest.java b/tika-server/src/test/java/org/apache/tika/server/StackTraceOffTest.java index bd5fefe..6c86437 100644 --- a/tika-server/src/test/java/org/apache/tika/server/StackTraceOffTest.java +++ b/tika-server/src/test/java/org/apache/tika/server/StackTraceOffTest.java @@ -122,8 +122,6 @@ public class StackTraceOffTest extends CXFTestBase { .create(endPoint + path) .type("blechdeblah/deblechdeblah") .accept("*/*") - .header("Content-Disposition", - "attachment; filename=null_pointer.evil") .put(ClassLoader.getSystemResourceAsStream(TEST_NULL)); assertNotNull("null response: " + path, response); assertEquals("bad type: " + path, 415, response.getStatus()); http://git-wip-us.apache.org/repos/asf/tika/blob/c5b9cb77/tika-server/src/test/java/org/apache/tika/server/StackTraceTest.java ---------------------------------------------------------------------- diff --git a/tika-server/src/test/java/org/apache/tika/server/StackTraceTest.java b/tika-server/src/test/java/org/apache/tika/server/StackTraceTest.java index 410824a..2b76f33 100644 --- a/tika-server/src/test/java/org/apache/tika/server/StackTraceTest.java +++ b/tika-server/src/test/java/org/apache/tika/server/StackTraceTest.java @@ -118,8 +118,6 @@ public class StackTraceTest extends CXFTestBase { .create(endPoint + path) .type("blechdeblah/deblechdeblah") .accept("*/*") - .header("Content-Disposition", - "attachment; filename=null_pointer.evil") .put(ClassLoader.getSystemResourceAsStream(TEST_NULL)); assertNotNull("null response: " + path, response); assertEquals("bad type: " + path, 415, response.getStatus()); http://git-wip-us.apache.org/repos/asf/tika/blob/c5b9cb77/tika-server/src/test/resources/META-INF/services/org.apache.tika.parser.Parser ---------------------------------------------------------------------- diff --git a/tika-server/src/test/resources/META-INF/services/org.apache.tika.parser.Parser b/tika-server/src/test/resources/META-INF/services/org.apache.tika.parser.Parser deleted file mode 100644 index d0462b1..0000000 --- a/tika-server/src/test/resources/META-INF/services/org.apache.tika.parser.Parser +++ /dev/null @@ -1,16 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -org.apache.tika.parser.evil.EvilParser \ No newline at end of file
