This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new e0665644f5 Revert "Refactor long running tests to improve parallelism"
e0665644f5 is described below
commit e0665644f519ca7a30993d1e5c8da3719d8ae207
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Dec 4 20:37:52 2023 +0000
Revert "Refactor long running tests to improve parallelism"
This reverts commit c766eefed99cb7004f29468d1e5546eef2a5eae8.
---
...aseTest.java => TestDefaultServletOptions.java} | 17 +++++++---
.../servlets/TestDefaultServletOptionsDELETE.java | 34 -------------------
.../servlets/TestDefaultServletOptionsGET.java | 34 -------------------
.../servlets/TestDefaultServletOptionsHEAD.java | 34 -------------------
.../servlets/TestDefaultServletOptionsPOST.java | 34 -------------------
.../servlets/TestDefaultServletOptionsPUT.java | 34 -------------------
.../servlets/TestDefaultServletOptionsTRACE.java | 34 -------------------
...java => TestWebdavServletOptionCollection.java} | 19 ++++++++---
.../TestWebdavServletOptionCollectionCOPY.java | 38 ----------------------
.../TestWebdavServletOptionCollectionDELETE.java | 38 ----------------------
.../TestWebdavServletOptionCollectionGET.java | 38 ----------------------
.../TestWebdavServletOptionCollectionHEAD.java | 38 ----------------------
.../TestWebdavServletOptionCollectionLOCK.java | 38 ----------------------
.../TestWebdavServletOptionCollectionMKCOL.java | 38 ----------------------
.../TestWebdavServletOptionCollectionMOVE.java | 38 ----------------------
.../TestWebdavServletOptionCollectionPOST.java | 38 ----------------------
.../TestWebdavServletOptionCollectionPROPFIND.java | 38 ----------------------
...TestWebdavServletOptionCollectionPROPPATCH.java | 38 ----------------------
.../TestWebdavServletOptionCollectionPUT.java | 38 ----------------------
.../TestWebdavServletOptionCollectionTRACE.java | 38 ----------------------
.../TestWebdavServletOptionCollectionUNLOCK.java | 38 ----------------------
...tion.java => TestWebdavServletOptionsFile.java} | 19 ++++++++---
.../servlets/TestWebdavServletOptionsFileCOPY.java | 38 ----------------------
.../TestWebdavServletOptionsFileDELETE.java | 38 ----------------------
.../servlets/TestWebdavServletOptionsFileGET.java | 38 ----------------------
.../servlets/TestWebdavServletOptionsFileHEAD.java | 38 ----------------------
.../servlets/TestWebdavServletOptionsFileLOCK.java | 38 ----------------------
.../TestWebdavServletOptionsFileMKCOL.java | 38 ----------------------
.../servlets/TestWebdavServletOptionsFileMOVE.java | 38 ----------------------
.../servlets/TestWebdavServletOptionsFilePOST.java | 38 ----------------------
.../TestWebdavServletOptionsFilePROPFIND.java | 38 ----------------------
.../TestWebdavServletOptionsFilePROPPATCH.java | 38 ----------------------
.../servlets/TestWebdavServletOptionsFilePUT.java | 38 ----------------------
.../TestWebdavServletOptionsFileTRACE.java | 38 ----------------------
.../TestWebdavServletOptionsFileUNLOCK.java | 38 ----------------------
...e.java => TestWebdavServletOptionsUnknown.java} | 19 ++++++++---
.../TestWebdavServletOptionsUnknownCOPY.java | 38 ----------------------
.../TestWebdavServletOptionsUnknownDELETE.java | 38 ----------------------
.../TestWebdavServletOptionsUnknownGET.java | 38 ----------------------
.../TestWebdavServletOptionsUnknownHEAD.java | 38 ----------------------
.../TestWebdavServletOptionsUnknownLOCK.java | 38 ----------------------
.../TestWebdavServletOptionsUnknownMKCOL.java | 38 ----------------------
.../TestWebdavServletOptionsUnknownMOVE.java | 38 ----------------------
.../TestWebdavServletOptionsUnknownPOST.java | 38 ----------------------
.../TestWebdavServletOptionsUnknownPROPFIND.java | 38 ----------------------
.../TestWebdavServletOptionsUnknownPROPPATCH.java | 38 ----------------------
.../TestWebdavServletOptionsUnknownPUT.java | 38 ----------------------
.../TestWebdavServletOptionsUnknownTRACE.java | 38 ----------------------
.../TestWebdavServletOptionsUnknownUNLOCK.java | 38 ----------------------
49 files changed, 54 insertions(+), 1706 deletions(-)
diff --git
a/test/org/apache/catalina/servlets/DefaultServletOptionsBaseTest.java
b/test/org/apache/catalina/servlets/TestDefaultServletOptions.java
similarity index 70%
rename from test/org/apache/catalina/servlets/DefaultServletOptionsBaseTest.java
rename to test/org/apache/catalina/servlets/TestDefaultServletOptions.java
index e5a92d97dc..b5fe61aaa9 100644
--- a/test/org/apache/catalina/servlets/DefaultServletOptionsBaseTest.java
+++ b/test/org/apache/catalina/servlets/TestDefaultServletOptions.java
@@ -22,13 +22,17 @@ import java.util.List;
import jakarta.servlet.Servlet;
-public abstract class DefaultServletOptionsBaseTest extends
ServletOptionsBaseTest {
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
- public static Collection<Object[]> inputs(Class<?> clazz) {
-
- String method =
clazz.getSimpleName().substring(clazz.getSuperclass().getSimpleName().length()
- 4);
+@RunWith(Parameterized.class)
+public class TestDefaultServletOptions extends ServletOptionsBaseTest {
+ @Parameters
+ public static Collection<Object[]> inputs() {
String[] urls = new String[] { COLLECTION_NAME, FILE_NAME,
UNKNOWN_NAME };
+ String[] methods = new String[] { "GET", "POST", "HEAD", "TRACE",
"PUT", "DELETE" };
List<Object[]> result = new ArrayList<>();
@@ -36,7 +40,10 @@ public abstract class DefaultServletOptionsBaseTest extends
ServletOptionsBaseTe
for (Boolean readOnlyValue : booleans) {
for (Boolean traceValue : booleans) {
for (String url : urls) {
- result.add(new Object[] { listingsValue,
readOnlyValue, traceValue, url, method });
+ for (String method : methods) {
+ result.add(new Object[] {
+ listingsValue, readOnlyValue, traceValue,
url, method } );
+ }
}
}
}
diff --git
a/test/org/apache/catalina/servlets/TestDefaultServletOptionsDELETE.java
b/test/org/apache/catalina/servlets/TestDefaultServletOptionsDELETE.java
deleted file mode 100644
index 43f6e43e63..0000000000
--- a/test/org/apache/catalina/servlets/TestDefaultServletOptionsDELETE.java
+++ /dev/null
@@ -1,34 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class TestDefaultServletOptionsDELETE extends
DefaultServletOptionsBaseTest {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestDefaultServletOptionsGET.java
b/test/org/apache/catalina/servlets/TestDefaultServletOptionsGET.java
deleted file mode 100644
index 61e94a5d45..0000000000
--- a/test/org/apache/catalina/servlets/TestDefaultServletOptionsGET.java
+++ /dev/null
@@ -1,34 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class TestDefaultServletOptionsGET extends
DefaultServletOptionsBaseTest {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestDefaultServletOptionsHEAD.java
b/test/org/apache/catalina/servlets/TestDefaultServletOptionsHEAD.java
deleted file mode 100644
index 33e44c2d1f..0000000000
--- a/test/org/apache/catalina/servlets/TestDefaultServletOptionsHEAD.java
+++ /dev/null
@@ -1,34 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class TestDefaultServletOptionsHEAD extends
DefaultServletOptionsBaseTest {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestDefaultServletOptionsPOST.java
b/test/org/apache/catalina/servlets/TestDefaultServletOptionsPOST.java
deleted file mode 100644
index 59a7c98a11..0000000000
--- a/test/org/apache/catalina/servlets/TestDefaultServletOptionsPOST.java
+++ /dev/null
@@ -1,34 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class TestDefaultServletOptionsPOST extends
DefaultServletOptionsBaseTest {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestDefaultServletOptionsPUT.java
b/test/org/apache/catalina/servlets/TestDefaultServletOptionsPUT.java
deleted file mode 100644
index 71f6412ea3..0000000000
--- a/test/org/apache/catalina/servlets/TestDefaultServletOptionsPUT.java
+++ /dev/null
@@ -1,34 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class TestDefaultServletOptionsPUT extends
DefaultServletOptionsBaseTest {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestDefaultServletOptionsTRACE.java
b/test/org/apache/catalina/servlets/TestDefaultServletOptionsTRACE.java
deleted file mode 100644
index 3a20bed6c2..0000000000
--- a/test/org/apache/catalina/servlets/TestDefaultServletOptionsTRACE.java
+++ /dev/null
@@ -1,34 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-@RunWith(Parameterized.class)
-public class TestDefaultServletOptionsTRACE extends
DefaultServletOptionsBaseTest {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/WebdavServletOptionsBaseTestUnknown.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionCollection.java
similarity index 67%
rename from
test/org/apache/catalina/servlets/WebdavServletOptionsBaseTestUnknown.java
rename to
test/org/apache/catalina/servlets/TestWebdavServletOptionCollection.java
index 23e6fe1e9e..c57408caca 100644
--- a/test/org/apache/catalina/servlets/WebdavServletOptionsBaseTestUnknown.java
+++ b/test/org/apache/catalina/servlets/TestWebdavServletOptionCollection.java
@@ -22,22 +22,31 @@ import java.util.List;
import jakarta.servlet.Servlet;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
/*
* Split into multiple tests as a single test takes so long it impacts the time
* of an entire test run.
*/
-public abstract class WebdavServletOptionsBaseTestUnknown extends
ServletOptionsBaseTest {
-
- public static Collection<Object[]> inputs(Class<?> clazz) {
+@RunWith(Parameterized.class)
+public class TestWebdavServletOptionCollection extends ServletOptionsBaseTest {
- String method =
clazz.getSimpleName().substring(clazz.getSuperclass().getSimpleName().length()
- 4);
+ @Parameters
+ public static Collection<Object[]> inputs() {
+ String[] methods = new String[] { "GET", "POST", "HEAD", "TRACE",
"PUT", "DELETE",
+ "MKCOL", "LOCK", "UNLOCK", "COPY", "MOVE", "PROPFIND",
"PROPPATCH" };
List<Object[]> result = new ArrayList<>();
for (Boolean listingsValue : booleans) {
for (Boolean readOnlyValue : booleans) {
for (Boolean traceValue : booleans) {
- result.add(new Object[] { listingsValue, readOnlyValue,
traceValue, UNKNOWN_NAME, method });
+ for (String method : methods) {
+ result.add(new Object[] {
+ listingsValue, readOnlyValue, traceValue,
COLLECTION_NAME, method } );
+ }
}
}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionCOPY.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionCOPY.java
deleted file mode 100644
index 15265dafb2..0000000000
---
a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionCOPY.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionCollectionCOPY extends
WebdavServletOptionBaseTestCollection {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionDELETE.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionDELETE.java
deleted file mode 100644
index eb1a7bd61a..0000000000
---
a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionDELETE.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionCollectionDELETE extends
WebdavServletOptionBaseTestCollection {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionGET.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionGET.java
deleted file mode 100644
index 9df9a0d873..0000000000
---
a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionGET.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionCollectionGET extends
WebdavServletOptionBaseTestCollection {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionHEAD.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionHEAD.java
deleted file mode 100644
index 812276879a..0000000000
---
a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionHEAD.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionCollectionHEAD extends
WebdavServletOptionBaseTestCollection {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionLOCK.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionLOCK.java
deleted file mode 100644
index 2157d1c891..0000000000
---
a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionLOCK.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionCollectionLOCK extends
WebdavServletOptionBaseTestCollection {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionMKCOL.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionMKCOL.java
deleted file mode 100644
index 475602a28e..0000000000
---
a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionMKCOL.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionCollectionMKCOL extends
WebdavServletOptionBaseTestCollection {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionMOVE.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionMOVE.java
deleted file mode 100644
index f2e21e76c4..0000000000
---
a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionMOVE.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionCollectionMOVE extends
WebdavServletOptionBaseTestCollection {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionPOST.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionPOST.java
deleted file mode 100644
index 6f564d1800..0000000000
---
a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionPOST.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionCollectionPOST extends
WebdavServletOptionBaseTestCollection {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionPROPFIND.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionPROPFIND.java
deleted file mode 100644
index e18959c66a..0000000000
---
a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionPROPFIND.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionCollectionPROPFIND extends
WebdavServletOptionBaseTestCollection {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionPROPPATCH.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionPROPPATCH.java
deleted file mode 100644
index 56e47315cf..0000000000
---
a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionPROPPATCH.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionCollectionPROPPATCH extends
WebdavServletOptionBaseTestCollection {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionPUT.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionPUT.java
deleted file mode 100644
index 04abe51e88..0000000000
---
a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionPUT.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionCollectionPUT extends
WebdavServletOptionBaseTestCollection {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionTRACE.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionTRACE.java
deleted file mode 100644
index 12b6583659..0000000000
---
a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionTRACE.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionCollectionTRACE extends
WebdavServletOptionBaseTestCollection {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionUNLOCK.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionUNLOCK.java
deleted file mode 100644
index 060a625c00..0000000000
---
a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollectionUNLOCK.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionCollectionUNLOCK extends
WebdavServletOptionBaseTestCollection {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/WebdavServletOptionBaseTestCollection.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsFile.java
similarity index 67%
rename from
test/org/apache/catalina/servlets/WebdavServletOptionBaseTestCollection.java
rename to test/org/apache/catalina/servlets/TestWebdavServletOptionsFile.java
index 7614dc02c9..7085c7bf7c 100644
---
a/test/org/apache/catalina/servlets/WebdavServletOptionBaseTestCollection.java
+++ b/test/org/apache/catalina/servlets/TestWebdavServletOptionsFile.java
@@ -22,22 +22,31 @@ import java.util.List;
import jakarta.servlet.Servlet;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
/*
* Split into multiple tests as a single test takes so long it impacts the time
* of an entire test run.
*/
-public abstract class WebdavServletOptionBaseTestCollection extends
ServletOptionsBaseTest {
-
- public static Collection<Object[]> inputs(Class<?> clazz) {
+@RunWith(Parameterized.class)
+public class TestWebdavServletOptionsFile extends ServletOptionsBaseTest {
- String method =
clazz.getSimpleName().substring(clazz.getSuperclass().getSimpleName().length()
- 4);
+ @Parameters
+ public static Collection<Object[]> inputs() {
+ String[] methods = new String[] { "GET", "POST", "HEAD", "TRACE",
"PUT", "DELETE",
+ "MKCOL", "LOCK", "UNLOCK", "COPY", "MOVE", "PROPFIND",
"PROPPATCH" };
List<Object[]> result = new ArrayList<>();
for (Boolean listingsValue : booleans) {
for (Boolean readOnlyValue : booleans) {
for (Boolean traceValue : booleans) {
- result.add(new Object[] { listingsValue, readOnlyValue,
traceValue, COLLECTION_NAME, method });
+ for (String method : methods) {
+ result.add(new Object[] {
+ listingsValue, readOnlyValue, traceValue,
FILE_NAME, method } );
+ }
}
}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFileCOPY.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsFileCOPY.java
deleted file mode 100644
index f449aa611c..0000000000
--- a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFileCOPY.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionsFileCOPY extends
WebdavServletOptionsBaseTestFile {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFileDELETE.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsFileDELETE.java
deleted file mode 100644
index 17eada5362..0000000000
--- a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFileDELETE.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionsFileDELETE extends
WebdavServletOptionsBaseTestFile {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFileGET.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsFileGET.java
deleted file mode 100644
index 047df6aa6a..0000000000
--- a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFileGET.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionsFileGET extends
WebdavServletOptionsBaseTestFile {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFileHEAD.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsFileHEAD.java
deleted file mode 100644
index 8b1e150a14..0000000000
--- a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFileHEAD.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionsFileHEAD extends
WebdavServletOptionsBaseTestFile {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFileLOCK.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsFileLOCK.java
deleted file mode 100644
index 3c7d98c740..0000000000
--- a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFileLOCK.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionsFileLOCK extends
WebdavServletOptionsBaseTestFile {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFileMKCOL.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsFileMKCOL.java
deleted file mode 100644
index 37b76e2075..0000000000
--- a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFileMKCOL.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionsFileMKCOL extends
WebdavServletOptionsBaseTestFile {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFileMOVE.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsFileMOVE.java
deleted file mode 100644
index df4007f655..0000000000
--- a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFileMOVE.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionsFileMOVE extends
WebdavServletOptionsBaseTestFile {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFilePOST.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsFilePOST.java
deleted file mode 100644
index dd664d5cd4..0000000000
--- a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFilePOST.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionsFilePOST extends
WebdavServletOptionsBaseTestFile {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFilePROPFIND.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsFilePROPFIND.java
deleted file mode 100644
index 3399aa83ad..0000000000
---
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFilePROPFIND.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionsFilePROPFIND extends
WebdavServletOptionsBaseTestFile {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFilePROPPATCH.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsFilePROPPATCH.java
deleted file mode 100644
index 68e14cfeac..0000000000
---
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFilePROPPATCH.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionsFilePROPPATCH extends
WebdavServletOptionsBaseTestFile {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFilePUT.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsFilePUT.java
deleted file mode 100644
index 5b7814c89f..0000000000
--- a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFilePUT.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionsFilePUT extends
WebdavServletOptionsBaseTestFile {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFileTRACE.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsFileTRACE.java
deleted file mode 100644
index 24a76b6658..0000000000
--- a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFileTRACE.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionsFileTRACE extends
WebdavServletOptionsBaseTestFile {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFileUNLOCK.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsFileUNLOCK.java
deleted file mode 100644
index d94f3faf55..0000000000
--- a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFileUNLOCK.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionsFileUNLOCK extends
WebdavServletOptionsBaseTestFile {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/WebdavServletOptionsBaseTestFile.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknown.java
similarity index 67%
rename from
test/org/apache/catalina/servlets/WebdavServletOptionsBaseTestFile.java
rename to test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknown.java
index 746c8e4d5b..f5ca12c698 100644
--- a/test/org/apache/catalina/servlets/WebdavServletOptionsBaseTestFile.java
+++ b/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknown.java
@@ -22,22 +22,31 @@ import java.util.List;
import jakarta.servlet.Servlet;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
/*
* Split into multiple tests as a single test takes so long it impacts the time
* of an entire test run.
*/
-public abstract class WebdavServletOptionsBaseTestFile extends
ServletOptionsBaseTest {
-
- public static Collection<Object[]> inputs(Class<?> clazz) {
+@RunWith(Parameterized.class)
+public class TestWebdavServletOptionsUnknown extends ServletOptionsBaseTest {
- String method =
clazz.getSimpleName().substring(clazz.getSuperclass().getSimpleName().length()
- 4);
+ @Parameters
+ public static Collection<Object[]> inputs() {
+ String[] methods = new String[] { "GET", "POST", "HEAD", "TRACE",
"PUT", "DELETE",
+ "MKCOL", "LOCK", "UNLOCK", "COPY", "MOVE", "PROPFIND",
"PROPPATCH" };
List<Object[]> result = new ArrayList<>();
for (Boolean listingsValue : booleans) {
for (Boolean readOnlyValue : booleans) {
for (Boolean traceValue : booleans) {
- result.add(new Object[] { listingsValue, readOnlyValue,
traceValue, FILE_NAME, method });
+ for (String method : methods) {
+ result.add(new Object[] {
+ listingsValue, readOnlyValue, traceValue,
UNKNOWN_NAME, method } );
+ }
}
}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownCOPY.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownCOPY.java
deleted file mode 100644
index 633bf55096..0000000000
--- a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownCOPY.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionsUnknownCOPY extends
WebdavServletOptionsBaseTestUnknown {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownDELETE.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownDELETE.java
deleted file mode 100644
index dc8cf33162..0000000000
---
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownDELETE.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionsUnknownDELETE extends
WebdavServletOptionsBaseTestUnknown {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownGET.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownGET.java
deleted file mode 100644
index fb0c0faefb..0000000000
--- a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownGET.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionsUnknownGET extends
WebdavServletOptionsBaseTestUnknown {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownHEAD.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownHEAD.java
deleted file mode 100644
index 3d6b27b0a5..0000000000
--- a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownHEAD.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionsUnknownHEAD extends
WebdavServletOptionsBaseTestUnknown {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownLOCK.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownLOCK.java
deleted file mode 100644
index 43f4d71682..0000000000
--- a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownLOCK.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionsUnknownLOCK extends
WebdavServletOptionsBaseTestUnknown {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownMKCOL.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownMKCOL.java
deleted file mode 100644
index 76bb1dc55d..0000000000
---
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownMKCOL.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionsUnknownMKCOL extends
WebdavServletOptionsBaseTestUnknown {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownMOVE.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownMOVE.java
deleted file mode 100644
index 2aaf94a859..0000000000
--- a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownMOVE.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionsUnknownMOVE extends
WebdavServletOptionsBaseTestUnknown {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownPOST.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownPOST.java
deleted file mode 100644
index 8f52705eef..0000000000
--- a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownPOST.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionsUnknownPOST extends
WebdavServletOptionsBaseTestUnknown {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownPROPFIND.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownPROPFIND.java
deleted file mode 100644
index 71813b350d..0000000000
---
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownPROPFIND.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionsUnknownPROPFIND extends
WebdavServletOptionsBaseTestUnknown {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownPROPPATCH.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownPROPPATCH.java
deleted file mode 100644
index a2e294fdb2..0000000000
---
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownPROPPATCH.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionsUnknownPROPPATCH extends
WebdavServletOptionsBaseTestUnknown {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownPUT.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownPUT.java
deleted file mode 100644
index e3948602b4..0000000000
--- a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownPUT.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionsUnknownPUT extends
WebdavServletOptionsBaseTestUnknown {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownTRACE.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownTRACE.java
deleted file mode 100644
index ba8e8203f7..0000000000
---
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownTRACE.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionsUnknownTRACE extends
WebdavServletOptionsBaseTestUnknown {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownUNLOCK.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownUNLOCK.java
deleted file mode 100644
index f28bac3fcb..0000000000
---
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknownUNLOCK.java
+++ /dev/null
@@ -1,38 +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.
- */
-package org.apache.catalina.servlets;
-
-import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-/*
- * Split into multiple tests as a single test takes so long it impacts the time
- * of an entire test run.
- */
-@RunWith(Parameterized.class)
-public class TestWebdavServletOptionsUnknownUNLOCK extends
WebdavServletOptionsBaseTestUnknown {
-
- @Parameters
- public static Collection<Object[]> inputs() {
- // Use the name of this class to derive the HTTP method to test
- return
DefaultServletOptionsBaseTest.inputs(MethodHandles.lookup().lookupClass());
- }
-}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
