svn commit: r1785669 - /tomcat/tc8.5.x/trunk/test/org/apache/catalina/util/TestParameterMap.java

[markt]

Author: markt
Date: Mon Mar  6 15:32:00 2017
New Revision: 1785669

URL: http://svn.apache.org/viewvc?rev=1785669&view=rev
Log:
Remove Java 8 specific tests
Modified:
    tomcat/tc8.5.x/trunk/test/org/apache/catalina/util/TestParameterMap.java

Modified: 
tomcat/tc8.5.x/trunk/test/org/apache/catalina/util/TestParameterMap.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/util/TestParameterMap.java?rev=1785669&r1=1785668&r2=1785669&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/test/org/apache/catalina/util/TestParameterMap.java 
(original)
+++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/util/TestParameterMap.java 
Mon Mar  6 15:32:00 2017
@@ -37,7 +37,6 @@ public class TestParameterMap {
     private static final String[] TEST_PARAM_VALUES_2 = { "value2" };
     private static final String[] TEST_PARAM_VALUES_2_UPDATED = { 
"value2-updated" };
     private static final String[] TEST_PARAM_VALUES_3 = { "value3" };
-    private static final String[] TEST_PARAM_VALUES_REPLACED = { "replaced" };
 
     private Map<String, String[]> paramMap;
 
@@ -98,13 +97,6 @@ public class TestParameterMap {
         }
 
         try {
-            String[] updatedParamValues22 = new String[] { "value2-updated-2" 
};
-            paramMap.putIfAbsent("param22", updatedParamValues22);
-            Assert.fail("ParameterMap is not locked.");
-        } catch (IllegalStateException expectedException) {
-        }
-
-        try {
             final Map<String, String[]> additionalParams = new HashMap<>();
             additionalParams.put("param4", new String[] { "value4" });
             paramMap.putAll(additionalParams);
@@ -113,42 +105,12 @@ public class TestParameterMap {
         }
 
         try {
-            paramMap.merge("param2", new String[] { "value2-merged" }, (a, b) 
-> (b));
-            Assert.fail("ParameterMap is not locked.");
-        } catch (IllegalStateException expectedException) {
-        }
-
-        try {
             paramMap.remove("param2");
             Assert.fail("ParameterMap is not locked.");
         } catch (IllegalStateException expectedException) {
         }
 
         try {
-            paramMap.remove("param2", TEST_PARAM_VALUES_2_UPDATED);
-            Assert.fail("ParameterMap is not locked.");
-        } catch (IllegalStateException expectedException) {
-        }
-
-        try {
-            paramMap.replace("param2", new String[] { "value2-replaced" });
-            Assert.fail("ParameterMap is not locked.");
-        } catch (IllegalStateException expectedException) {
-        }
-
-        try {
-            paramMap.replace("param2", TEST_PARAM_VALUES_2_UPDATED, new 
String[] { "value2-replaced" });
-            Assert.fail("ParameterMap is not locked.");
-        } catch (IllegalStateException expectedException) {
-        }
-
-        try {
-            paramMap.replaceAll((a, b) -> TEST_PARAM_VALUES_REPLACED);
-            Assert.fail("ParameterMap is not locked.");
-        } catch (UnsupportedOperationException expectedException) {
-        }
-
-        try {
             paramMap.clear();
             Assert.fail("ParameterMap is not locked.");
         } catch (IllegalStateException expectedException) {
@@ -174,12 +136,6 @@ public class TestParameterMap {
         }
 
         try {
-            keySet.removeIf((a) -> "param2".equals(a));
-            Assert.fail("ParameterMap is not locked.");
-        } catch (UnsupportedOperationException expectedException) {
-        }
-
-        try {
             keySet.removeAll(Arrays.asList("param1", "param2"));
             Assert.fail("ParameterMap is not locked.");
         } catch (UnsupportedOperationException expectedException) {
@@ -225,12 +181,6 @@ public class TestParameterMap {
         }
 
         try {
-            valuesCol.removeIf((a) -> true);
-            Assert.fail("ParameterMap is not locked.");
-        } catch (UnsupportedOperationException expectedException) {
-        }
-
-        try {
             List<String[]> list = new ArrayList<>();
             list.add(TEST_PARAM_VALUES_1);
             valuesCol.removeAll(list);
@@ -281,12 +231,6 @@ public class TestParameterMap {
             Assert.fail("ParameterMap is not locked.");
         } catch (UnsupportedOperationException expectedException) {
         }
-
-        try {
-            entrySet.removeIf((a) -> true);
-            Assert.fail("ParameterMap is not locked.");
-        } catch (UnsupportedOperationException expectedException) {
-        }
 
         try {
             Set<Map.Entry<String, String[]>> anotherEntrySet = new 
HashSet<>(entrySet);



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org