Modified: tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXmlOrdering.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXmlOrdering.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXmlOrdering.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXmlOrdering.java Mon Nov 13 12:00:30 2017 @@ -24,10 +24,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -86,12 +83,12 @@ public class TestWebXmlOrdering { Set<WebXml> ordered = WebXml.orderWebFragments(app, fragments, null); Iterator<WebXml> iter = ordered.iterator(); - assertEquals(c,iter.next()); - assertEquals(a,iter.next()); - assertEquals(b,iter.next()); - assertEquals(e,iter.next()); - assertEquals(d,iter.next()); - assertFalse(iter.hasNext()); + Assert.assertEquals(c,iter.next()); + Assert.assertEquals(a,iter.next()); + Assert.assertEquals(b,iter.next()); + Assert.assertEquals(e,iter.next()); + Assert.assertEquals(d,iter.next()); + Assert.assertFalse(iter.hasNext()); } @Test @@ -102,9 +99,9 @@ public class TestWebXmlOrdering { Set<WebXml> ordered = WebXml.orderWebFragments(app, fragments, null); Iterator<WebXml> iter = ordered.iterator(); - assertEquals(c,iter.next()); - assertEquals(a,iter.next()); - assertFalse(iter.hasNext()); + Assert.assertEquals(c,iter.next()); + Assert.assertEquals(a,iter.next()); + Assert.assertFalse(iter.hasNext()); } @Test @@ -124,12 +121,12 @@ public class TestWebXmlOrdering { Iterator<WebXml> iter = ordered.iterator(); while (others.size() > 0) { WebXml o = iter.next(); - assertTrue(others.contains(o)); + Assert.assertTrue(others.contains(o)); others.remove(o); } - assertEquals(b,iter.next()); - assertEquals(d,iter.next()); - assertFalse(iter.hasNext()); + Assert.assertEquals(b,iter.next()); + Assert.assertEquals(d,iter.next()); + Assert.assertFalse(iter.hasNext()); } @Test @@ -147,15 +144,15 @@ public class TestWebXmlOrdering { Set<WebXml> ordered = WebXml.orderWebFragments(app, fragments, null); Iterator<WebXml> iter = ordered.iterator(); - assertEquals(b,iter.next()); + Assert.assertEquals(b,iter.next()); while (others.size() > 0) { WebXml o = iter.next(); - assertTrue(others.contains(o)); + Assert.assertTrue(others.contains(o)); others.remove(o); } - assertEquals(d,iter.next()); - assertFalse(iter.hasNext()); + Assert.assertEquals(d,iter.next()); + Assert.assertFalse(iter.hasNext()); } @Test @@ -163,8 +160,8 @@ public class TestWebXmlOrdering { app.addAbsoluteOrdering("a"); app.addAbsoluteOrdering("z"); Set<WebXml> ordered = WebXml.orderWebFragments(app, fragments, null); - assertEquals(1,ordered.size()); - assertEquals(fragments.get("a"),ordered.toArray()[0]); + Assert.assertEquals(1,ordered.size()); + Assert.assertEquals(fragments.get("a"),ordered.toArray()[0]); } @Test @@ -182,15 +179,15 @@ public class TestWebXmlOrdering { Set<WebXml> ordered = WebXml.orderWebFragments(app, fragments, null); Iterator<WebXml> iter = ordered.iterator(); - assertEquals(b,iter.next()); - assertEquals(d,iter.next()); + Assert.assertEquals(b,iter.next()); + Assert.assertEquals(d,iter.next()); while (others.size() > 0) { WebXml o = iter.next(); - assertTrue(others.contains(o)); + Assert.assertTrue(others.contains(o)); others.remove(o); } - assertFalse(iter.hasNext()); + Assert.assertFalse(iter.hasNext()); } private void doRelativeOrderingTest(RelativeOrderingTestRunner runner) { @@ -376,33 +373,33 @@ public class TestWebXmlOrdering { // check the tests are complete this way. //a.addAfterOrderingOthers(); - assertTrue(order, posA > posB); - assertTrue(order, posA > posC); - assertTrue(order, posA > posD); - assertTrue(order, posA > posE); - assertTrue(order, posA > posF); + Assert.assertTrue(order, posA > posB); + Assert.assertTrue(order, posA > posC); + Assert.assertTrue(order, posA > posD); + Assert.assertTrue(order, posA > posE); + Assert.assertTrue(order, posA > posF); // a.addAfterOrdering("c"); - assertTrue(order, posA > posC); + Assert.assertTrue(order, posA > posC); // b.addBeforeOrderingOthers(); - assertTrue(order, posB < posC); + Assert.assertTrue(order, posB < posC); // c.addAfterOrderingOthers(); - assertTrue(order, posC > posB); - assertTrue(order, posC > posD); - assertTrue(order, posC > posE); - assertTrue(order, posC > posF); + Assert.assertTrue(order, posC > posB); + Assert.assertTrue(order, posC > posD); + Assert.assertTrue(order, posC > posE); + Assert.assertTrue(order, posC > posF); // f.addBeforeOrderingOthers(); - assertTrue(order, posF < posA); - assertTrue(order, posF < posB); - assertTrue(order, posF < posC); - assertTrue(order, posF < posD); - assertTrue(order, posF < posE); + Assert.assertTrue(order, posF < posA); + Assert.assertTrue(order, posF < posB); + Assert.assertTrue(order, posF < posC); + Assert.assertTrue(order, posF < posD); + Assert.assertTrue(order, posF < posE); // f.addBeforeOrdering("b"); - assertTrue(order, posF < posB); + Assert.assertTrue(order, posF < posB); } } @@ -423,32 +420,32 @@ public class TestWebXmlOrdering { // check the tests are complete this way. // a.addAfterOrderingOthers(); - assertTrue(order, posA > posB); - assertTrue(order, posA > posE); - assertTrue(order, posA > posF); + Assert.assertTrue(order, posA > posB); + Assert.assertTrue(order, posA > posE); + Assert.assertTrue(order, posA > posF); // a.addBeforeOrdering("c"); - assertTrue(order, posC > posA); - assertTrue(order, posC > posB); - assertTrue(order, posC > posE); - assertTrue(order, posC > posF); + Assert.assertTrue(order, posC > posA); + Assert.assertTrue(order, posC > posB); + Assert.assertTrue(order, posC > posE); + Assert.assertTrue(order, posC > posF); // b.addBeforeOrderingOthers(); - assertTrue(order, posB < posA); - assertTrue(order, posB < posC); - assertTrue(order, posB < posD); - assertTrue(order, posB < posF); + Assert.assertTrue(order, posB < posA); + Assert.assertTrue(order, posB < posC); + Assert.assertTrue(order, posB < posD); + Assert.assertTrue(order, posB < posF); // d.addAfterOrderingOthers(); - assertTrue(order, posD > posB); - assertTrue(order, posD > posE); - assertTrue(order, posD > posF); + Assert.assertTrue(order, posD > posB); + Assert.assertTrue(order, posD > posE); + Assert.assertTrue(order, posD > posF); // e.addBeforeOrderingOthers(); - assertTrue(order, posE < posA); - assertTrue(order, posE < posC); - assertTrue(order, posE < posD); - assertTrue(order, posE < posF); + Assert.assertTrue(order, posE < posA); + Assert.assertTrue(order, posE < posC); + Assert.assertTrue(order, posE < posD); + Assert.assertTrue(order, posE < posF); } } @@ -466,14 +463,14 @@ public class TestWebXmlOrdering { // check the tests are complete this way. // a.addAfterOrdering("b"); - assertTrue(order, posA > posB); + Assert.assertTrue(order, posA > posB); // c.addBeforeOrderingOthers(); - assertTrue(order, posC < posA); - assertTrue(order, posC < posB); - assertTrue(order, posC < posD); - assertTrue(order, posC < posE); - assertTrue(order, posC < posF); + Assert.assertTrue(order, posC < posA); + Assert.assertTrue(order, posC < posB); + Assert.assertTrue(order, posC < posD); + Assert.assertTrue(order, posC < posE); + Assert.assertTrue(order, posC < posF); } } @@ -491,10 +488,10 @@ public class TestWebXmlOrdering { // check the tests are complete this way. // b.addAfterOrdering("a"); - assertTrue(order, posB > posA); + Assert.assertTrue(order, posB > posA); // c.addAfterOrdering("b"); - assertTrue(order, posC > posB); + Assert.assertTrue(order, posC > posB); } } @@ -512,10 +509,10 @@ public class TestWebXmlOrdering { // check the tests are complete this way. // b.addBeforeOrdering("a"); - assertTrue(order, posB < posA); + Assert.assertTrue(order, posB < posA); // c.addBeforeOrdering("b"); - assertTrue(order, posC < posB); + Assert.assertTrue(order, posC < posB); } } @@ -533,10 +530,10 @@ public class TestWebXmlOrdering { // check the tests are complete this way. // b.addBeforeOrdering("a"); - assertTrue(order, posB < posA); + Assert.assertTrue(order, posB < posA); //b.addAfterOrdering("c"); - assertTrue(order, posB > posC); + Assert.assertTrue(order, posB > posC); } } @@ -555,13 +552,13 @@ public class TestWebXmlOrdering { // check the tests are complete this way. // b.addBeforeOrdering("a"); - assertTrue(order, posB < posA); + Assert.assertTrue(order, posB < posA); // c.addBeforeOrdering("b"); - assertTrue(order, posC < posB); + Assert.assertTrue(order, posC < posB); // a.addAfterOrdering("c"); - assertTrue(order, posA > posC); + Assert.assertTrue(order, posA > posC); } } @@ -585,42 +582,42 @@ public class TestWebXmlOrdering { // check the tests are complete this way. // a.addBeforeOrderingOthers(); - assertTrue(order, posA < posB); - assertTrue(order, posA < posC); - assertTrue(order, posA < posD); - assertTrue(order, posA < posE); - assertTrue(order, posA < posF); + Assert.assertTrue(order, posA < posB); + Assert.assertTrue(order, posA < posC); + Assert.assertTrue(order, posA < posD); + Assert.assertTrue(order, posA < posE); + Assert.assertTrue(order, posA < posF); // a.addBeforeOrdering("b"); - assertTrue(order, posA < posB); + Assert.assertTrue(order, posA < posB); // b.addBeforeOrderingOthers(); - assertTrue(order, posB < posC); - assertTrue(order, posB < posD); - assertTrue(order, posB < posE); - assertTrue(order, posB < posF); + Assert.assertTrue(order, posB < posC); + Assert.assertTrue(order, posB < posD); + Assert.assertTrue(order, posB < posE); + Assert.assertTrue(order, posB < posF); // c.addAfterOrdering("b"); - assertTrue(order, posC > posB); + Assert.assertTrue(order, posC > posB); // d.addAfterOrdering("c"); - assertTrue(order, posD > posC); + Assert.assertTrue(order, posD > posC); // e.addAfterOrderingOthers(); - assertTrue(order, posE > posA); - assertTrue(order, posE > posB); - assertTrue(order, posE > posC); - assertTrue(order, posE > posD); + Assert.assertTrue(order, posE > posA); + Assert.assertTrue(order, posE > posB); + Assert.assertTrue(order, posE > posC); + Assert.assertTrue(order, posE > posD); // f.addAfterOrderingOthers(); - assertTrue(order, posF > posA); - assertTrue(order, posF > posB); - assertTrue(order, posF > posC); - assertTrue(order, posF > posD); - assertTrue(order, posF > posE); + Assert.assertTrue(order, posF > posA); + Assert.assertTrue(order, posF > posB); + Assert.assertTrue(order, posF > posC); + Assert.assertTrue(order, posF > posD); + Assert.assertTrue(order, posF > posE); // f.addAfterOrdering("e"); - assertTrue(order, posF > posE); + Assert.assertTrue(order, posF > posE); } } @@ -639,15 +636,15 @@ public class TestWebXmlOrdering { // check the tests are complete this way. // a.addBeforeOrderingOthers(); - assertTrue(order, posA < posD); - assertTrue(order, posA < posE); - assertTrue(order, posA < posF); + Assert.assertTrue(order, posA < posD); + Assert.assertTrue(order, posA < posE); + Assert.assertTrue(order, posA < posF); // b.addBeforeOrdering("a"); - assertTrue(order, posB < posA); + Assert.assertTrue(order, posB < posA); // c.addBeforeOrdering("b"); - assertTrue(order, posC < posB); + Assert.assertTrue(order, posC < posB); } } @@ -666,15 +663,15 @@ public class TestWebXmlOrdering { // check the tests are complete this way. // a.addAfterOrderingOthers(); - assertTrue(order, posA > posD); - assertTrue(order, posA > posE); - assertTrue(order, posA > posF); + Assert.assertTrue(order, posA > posD); + Assert.assertTrue(order, posA > posE); + Assert.assertTrue(order, posA > posF); // b.addAfterOrdering("a"); - assertTrue(order, posB > posA); + Assert.assertTrue(order, posB > posA); // c.addAfterOrdering("b"); - assertTrue(order, posC > posB); + Assert.assertTrue(order, posC > posB); } } @@ -693,7 +690,7 @@ public class TestWebXmlOrdering { // check the tests are complete this way. // a.addAfterOrdering("b"); - assertTrue(order, posA > posB); + Assert.assertTrue(order, posA > posB); } } }
Modified: tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TestParameters.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TestParameters.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TestParameters.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TestParameters.java Mon Nov 13 12:00:30 2017 @@ -20,13 +20,7 @@ import java.io.UnsupportedEncodingExcept import java.net.URLEncoder; import java.util.Enumeration; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - +import org.junit.Assert; import org.junit.Test; public class TestParameters { @@ -78,13 +72,13 @@ public class TestParameters { // Make sure the inner Parameter class behaves correctly @Test public void testInternal() { - assertEquals("foo1=bar1", SIMPLE.toString()); + Assert.assertEquals("foo1=bar1", SIMPLE.toString()); // Note: testing requires that ' ' is encoded as '+', // because that is what browsers will send us. - assertEquals("foo2=bar1&foo2=bar2&foo2=hello+world&foo2=%3F%25%40", + Assert.assertEquals("foo2=bar1&foo2=bar2&foo2=hello+world&foo2=%3F%25%40", SIMPLE_MULTIPLE.toString()); - assertEquals("foo3", NO_VALUE.toString()); - assertEquals("foo4=", EMPTY_VALUE.toString()); + Assert.assertEquals("foo3", NO_VALUE.toString()); + Assert.assertEquals("foo4=", EMPTY_VALUE.toString()); } private long doTestProcessParametersByteArrayIntInt(int limit, @@ -127,13 +121,13 @@ public class TestParameters { Parameters p = new Parameters(); String value = p.getParameter("foo"); - assertNull(value); + Assert.assertNull(value); Enumeration<String> names = p.getParameterNames(); - assertFalse(names.hasMoreElements()); + Assert.assertFalse(names.hasMoreElements()); String[] values = p.getParameterValues("foo"); - assertNull(values); + Assert.assertNull(values); } @@ -143,39 +137,39 @@ public class TestParameters { // Empty at this point Enumeration<String> names = p.getParameterNames(); - assertFalse(names.hasMoreElements()); + Assert.assertFalse(names.hasMoreElements()); String[] values = p.getParameterValues("foo"); - assertNull(values); + Assert.assertNull(values); // Add a parameter with two values p.addParameter("foo", "value1"); p.addParameter("foo", "value2"); names = p.getParameterNames(); - assertTrue(names.hasMoreElements()); - assertEquals("foo", names.nextElement()); - assertFalse(names.hasMoreElements()); + Assert.assertTrue(names.hasMoreElements()); + Assert.assertEquals("foo", names.nextElement()); + Assert.assertFalse(names.hasMoreElements()); values = p.getParameterValues("foo"); - assertEquals(2, values.length); - assertEquals("value1", values[0]); - assertEquals("value2", values[1]); + Assert.assertEquals(2, values.length); + Assert.assertEquals("value1", values[0]); + Assert.assertEquals("value2", values[1]); // Add two more values p.addParameter("foo", "value3"); p.addParameter("foo", "value4"); names = p.getParameterNames(); - assertTrue(names.hasMoreElements()); - assertEquals("foo", names.nextElement()); - assertFalse(names.hasMoreElements()); + Assert.assertTrue(names.hasMoreElements()); + Assert.assertEquals("foo", names.nextElement()); + Assert.assertFalse(names.hasMoreElements()); values = p.getParameterValues("foo"); - assertEquals(4, values.length); - assertEquals("value1", values[0]); - assertEquals("value2", values[1]); - assertEquals("value3", values[2]); - assertEquals("value4", values[3]); + Assert.assertEquals(4, values.length); + Assert.assertEquals("value1", values[0]); + Assert.assertEquals("value2", values[1]); + Assert.assertEquals("value3", values[2]); + Assert.assertEquals("value4", values[3]); } @Test @@ -186,38 +180,38 @@ public class TestParameters { // Empty at this point Enumeration<String> names = p.getParameterNames(); - assertFalse(names.hasMoreElements()); + Assert.assertFalse(names.hasMoreElements()); String[] values = p.getParameterValues("foo1"); - assertNull(values); + Assert.assertNull(values); // Add a parameter p.addParameter("foo1", "value1"); names = p.getParameterNames(); - assertTrue(names.hasMoreElements()); - assertEquals("foo1", names.nextElement()); - assertFalse(names.hasMoreElements()); + Assert.assertTrue(names.hasMoreElements()); + Assert.assertEquals("foo1", names.nextElement()); + Assert.assertFalse(names.hasMoreElements()); values = p.getParameterValues("foo1"); - assertEquals(1, values.length); - assertEquals("value1", values[0]); + Assert.assertEquals(1, values.length); + Assert.assertEquals("value1", values[0]); // Add another parameter p.addParameter("foo2", "value2"); names = p.getParameterNames(); - assertTrue(names.hasMoreElements()); - assertEquals("foo1", names.nextElement()); - assertEquals("foo2", names.nextElement()); - assertFalse(names.hasMoreElements()); + Assert.assertTrue(names.hasMoreElements()); + Assert.assertEquals("foo1", names.nextElement()); + Assert.assertEquals("foo2", names.nextElement()); + Assert.assertFalse(names.hasMoreElements()); values = p.getParameterValues("foo1"); - assertEquals(1, values.length); - assertEquals("value1", values[0]); + Assert.assertEquals(1, values.length); + Assert.assertEquals("value1", values[0]); values = p.getParameterValues("foo2"); - assertEquals(1, values.length); - assertEquals("value2", values[0]); + Assert.assertEquals(1, values.length); + Assert.assertEquals("value2", values[0]); // Add another parameter IllegalStateException e = null; @@ -226,22 +220,22 @@ public class TestParameters { } catch (IllegalStateException ise) { e = ise; } - assertNotNull(e); + Assert.assertNotNull(e); // Check current parameters remain unaffected names = p.getParameterNames(); - assertTrue(names.hasMoreElements()); - assertEquals("foo1", names.nextElement()); - assertEquals("foo2", names.nextElement()); - assertFalse(names.hasMoreElements()); + Assert.assertTrue(names.hasMoreElements()); + Assert.assertEquals("foo1", names.nextElement()); + Assert.assertEquals("foo2", names.nextElement()); + Assert.assertFalse(names.hasMoreElements()); values = p.getParameterValues("foo1"); - assertEquals(1, values.length); - assertEquals("value1", values[0]); + Assert.assertEquals(1, values.length); + Assert.assertEquals("value1", values[0]); values = p.getParameterValues("foo2"); - assertEquals(1, values.length); - assertEquals("value2", values[0]); + Assert.assertEquals(1, values.length); + Assert.assertEquals("value2", values[0]); } @@ -264,14 +258,14 @@ public class TestParameters { match = true; if (parameter.values.length == 0) { // Special case - assertArrayEquals(new String[] {""}, values); + Assert.assertArrayEquals(new String[] {""}, values); } else { - assertArrayEquals(parameter.getValues(), values); + Assert.assertArrayEquals(parameter.getValues(), values); } break; } } - assertTrue(match); + Assert.assertTrue(match); } } Modified: tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/TesterParametersPerformance.java Mon Nov 13 12:00:30 2017 @@ -22,7 +22,7 @@ import java.nio.charset.StandardCharsets import java.util.logging.Level; import java.util.logging.LogManager; -import static org.junit.Assert.assertEquals; +import org.junit.Assert; import org.junit.Test; import org.apache.tomcat.util.buf.B2CConverter; @@ -47,7 +47,7 @@ public class TesterParametersPerformance } private long doTestProcessParameters(byte[] input, int size) { - assertEquals(input.length, 3); + Assert.assertEquals(input.length, 3); Parameters p = new Parameters(); Modified: tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/parser/TestMediaType.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/parser/TestMediaType.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/parser/TestMediaType.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/tomcat/util/http/parser/TestMediaType.java Mon Nov 13 12:00:30 2017 @@ -19,10 +19,6 @@ package org.apache.tomcat.util.http.pars import java.io.IOException; import java.io.StringReader; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import org.junit.Assert; import org.junit.Test; @@ -138,9 +134,9 @@ public class TestMediaType { StringReader sr = new StringReader(sb.toString()); MediaType m = MediaType.parseMediaType(sr); - assertEquals("foo/bar; charset=UTF-8; a=b", m.toString()); - assertEquals(CHARSET, m.getCharset()); - assertEquals("foo/bar; a=b", m.toStringNoCharset()); + Assert.assertEquals("foo/bar; charset=UTF-8; a=b", m.toString()); + Assert.assertEquals(CHARSET, m.getCharset()); + Assert.assertEquals("foo/bar; a=b", m.toStringNoCharset()); } @@ -153,8 +149,8 @@ public class TestMediaType { StringReader sr = new StringReader(sb.toString()); MediaType m = MediaType.parseMediaType(sr); - assertEquals(CHARSET_WS, m.getCharset()); - assertEquals(TYPES.replaceAll(" ", ""), + Assert.assertEquals(CHARSET_WS, m.getCharset()); + Assert.assertEquals(TYPES.replaceAll(" ", ""), m.toStringNoCharset()); } @@ -169,23 +165,23 @@ public class TestMediaType { MediaType m = MediaType.parseMediaType(sr); // Check the types - assertEquals("multipart", m.getType()); - assertEquals("related", m.getSubtype()); + Assert.assertEquals("multipart", m.getType()); + Assert.assertEquals("related", m.getSubtype()); // Check the parameters - assertTrue(m.getParameterCount() == 3); + Assert.assertTrue(m.getParameterCount() == 3); - assertEquals("1_4F50BD36_CDF8C28", m.getParameterValue("boundary")); - assertEquals("\"<31671603.smil>\"", m.getParameterValue("Start")); - assertEquals("\"application/smil;charset=UTF-8\"", + Assert.assertEquals("1_4F50BD36_CDF8C28", m.getParameterValue("boundary")); + Assert.assertEquals("\"<31671603.smil>\"", m.getParameterValue("Start")); + Assert.assertEquals("\"application/smil;charset=UTF-8\"", m.getParameterValue("Type")); String expected = "multipart/related; boundary=1_4F50BD36_CDF8C28; " + "start=\"<31671603.smil>\"; " + "type=\"application/smil;charset=UTF-8\""; - assertEquals(expected, m.toString()); - assertEquals(expected, m.toStringNoCharset()); - assertNull(m.getCharset()); + Assert.assertEquals(expected, m.toString()); + Assert.assertEquals(expected, m.toStringNoCharset()); + Assert.assertNull(m.getCharset()); } @@ -197,18 +193,18 @@ public class TestMediaType { MediaType m = MediaType.parseMediaType(sr); // Check the types - assertEquals("text", m.getType()); - assertEquals("html", m.getSubtype()); + Assert.assertEquals("text", m.getType()); + Assert.assertEquals("html", m.getSubtype()); // Check the parameters - assertTrue(m.getParameterCount() == 2); + Assert.assertTrue(m.getParameterCount() == 2); - assertEquals("", m.getParameterValue("UTF-8")); - assertEquals("UTF-8", m.getCharset()); + Assert.assertEquals("", m.getParameterValue("UTF-8")); + Assert.assertEquals("UTF-8", m.getCharset()); // Note: Invalid input is filtered out - assertEquals("text/html; charset=UTF-8", m.toString()); - assertEquals("UTF-8", m.getCharset()); + Assert.assertEquals("text/html; charset=UTF-8", m.toString()); + Assert.assertEquals("UTF-8", m.getCharset()); } @@ -219,15 +215,15 @@ public class TestMediaType { StringReader sr = new StringReader(input); MediaType m = MediaType.parseMediaType(sr); - assertEquals("text", m.getType()); - assertEquals("html", m.getSubtype()); + Assert.assertEquals("text", m.getType()); + Assert.assertEquals("html", m.getSubtype()); - assertTrue(m.getParameterCount() == 1); + Assert.assertTrue(m.getParameterCount() == 1); - assertEquals("UTF-8", m.getParameterValue("charset")); - assertEquals("UTF-8", m.getCharset()); + Assert.assertEquals("UTF-8", m.getParameterValue("charset")); + Assert.assertEquals("UTF-8", m.getCharset()); - assertEquals("text/html; charset=UTF-8", m.toString()); + Assert.assertEquals("text/html; charset=UTF-8", m.toString()); } @@ -249,15 +245,15 @@ public class TestMediaType { MediaType m = MediaType.parseMediaType(sr); // Check all expected parameters are present - assertTrue(m.getParameterCount() == parameters.length); + Assert.assertTrue(m.getParameterCount() == parameters.length); // Check the types - assertEquals(TYPE.trim(), m.getType()); - assertEquals(SUBTYPE.trim(), m.getSubtype()); + Assert.assertEquals(TYPE.trim(), m.getType()); + Assert.assertEquals(SUBTYPE.trim(), m.getSubtype()); // Check the parameters for (int i = 0; i < parameters.length; i++) { - assertEquals(parameters[i].getValue().trim(), + Assert.assertEquals(parameters[i].getValue().trim(), m.getParameterValue(parameters[i].getName().trim())); } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
