Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestContextConfigAnnotation.java Mon Nov 13 12:00:30 2017 @@ -29,12 +29,7 @@ import javax.servlet.ServletContainerIni import javax.servlet.ServletContext; import javax.servlet.ServletException; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - +import org.junit.Assert; import org.junit.Test; import org.apache.catalina.Context; @@ -59,23 +54,23 @@ public class TestContextConfigAnnotation ContextConfig config = new ContextConfig(); File pFile = paramClassResource( "org/apache/catalina/startup/ParamServlet"); - assertTrue(pFile.exists()); + Assert.assertTrue(pFile.exists()); config.processAnnotationsFile(pFile, webxml, false); ServletDef servletDef = webxml.getServlets().get("param"); - assertNotNull(servletDef); - assertEquals("Hello", servletDef.getParameterMap().get("foo")); - assertEquals("World!", servletDef.getParameterMap().get("bar")); - assertEquals("param", webxml.getServletMappings().get( + Assert.assertNotNull(servletDef); + Assert.assertEquals("Hello", servletDef.getParameterMap().get("foo")); + Assert.assertEquals("World!", servletDef.getParameterMap().get("bar")); + Assert.assertEquals("param", webxml.getServletMappings().get( "/annotation/overwrite")); - assertEquals("param", servletDef.getDescription()); - assertEquals("param", servletDef.getDisplayName()); - assertEquals("paramLarge.png", servletDef.getLargeIcon()); - assertEquals("paramSmall.png", servletDef.getSmallIcon()); - assertEquals(Boolean.FALSE, servletDef.getAsyncSupported()); - assertEquals(Integer.valueOf(0), servletDef.getLoadOnStartup()); - assertNull(servletDef.getEnabled()); - assertNull(servletDef.getJspFile()); + Assert.assertEquals("param", servletDef.getDescription()); + Assert.assertEquals("param", servletDef.getDisplayName()); + Assert.assertEquals("paramLarge.png", servletDef.getLargeIcon()); + Assert.assertEquals("paramSmall.png", servletDef.getSmallIcon()); + Assert.assertEquals(Boolean.FALSE, servletDef.getAsyncSupported()); + Assert.assertEquals(Integer.valueOf(0), servletDef.getLoadOnStartup()); + Assert.assertNull(servletDef.getEnabled()); + Assert.assertNull(servletDef.getJspFile()); } @@ -98,25 +93,25 @@ public class TestContextConfigAnnotation ContextConfig config = new ContextConfig(); File pFile = paramClassResource( "org/apache/catalina/startup/ParamServlet"); - assertTrue(pFile.exists()); + Assert.assertTrue(pFile.exists()); config.processAnnotationsFile(pFile, webxml, false); - assertEquals(servletDef, webxml.getServlets().get("param")); + Assert.assertEquals(servletDef, webxml.getServlets().get("param")); - assertEquals("tomcat", servletDef.getParameterMap().get("foo")); - assertEquals("param", webxml.getServletMappings().get("/param")); + Assert.assertEquals("tomcat", servletDef.getParameterMap().get("foo")); + Assert.assertEquals("param", webxml.getServletMappings().get("/param")); // annotation mapping not added s. Servlet Spec 3.0 (Nov 2009) // 8.2.3.3.iv page 81 - assertNull(webxml.getServletMappings().get("/annotation/overwrite")); + Assert.assertNull(webxml.getServletMappings().get("/annotation/overwrite")); - assertEquals("Description", servletDef.getDescription()); - assertEquals("DisplayName", servletDef.getDisplayName()); - assertEquals("LargeIcon", servletDef.getLargeIcon()); - assertEquals("SmallIcon", servletDef.getSmallIcon()); - assertEquals(Boolean.TRUE, servletDef.getAsyncSupported()); - assertEquals(Integer.valueOf(1), servletDef.getLoadOnStartup()); - assertNull(servletDef.getEnabled()); - assertNull(servletDef.getJspFile()); + Assert.assertEquals("Description", servletDef.getDescription()); + Assert.assertEquals("DisplayName", servletDef.getDisplayName()); + Assert.assertEquals("LargeIcon", servletDef.getLargeIcon()); + Assert.assertEquals("SmallIcon", servletDef.getSmallIcon()); + Assert.assertEquals(Boolean.TRUE, servletDef.getAsyncSupported()); + Assert.assertEquals(Integer.valueOf(1), servletDef.getLoadOnStartup()); + Assert.assertNull(servletDef.getEnabled()); + Assert.assertNull(servletDef.getJspFile()); } @Test @@ -125,15 +120,15 @@ public class TestContextConfigAnnotation ContextConfig config = new ContextConfig(); File pFile = paramClassResource( "org/apache/catalina/startup/NoMappingParamServlet"); - assertTrue(pFile.exists()); + Assert.assertTrue(pFile.exists()); config.processAnnotationsFile(pFile, webxml, false); ServletDef servletDef = webxml.getServlets().get("param1"); - assertNull(servletDef); + Assert.assertNull(servletDef); webxml.addServletMapping("/param", "param1"); config.processAnnotationsFile(pFile, webxml, false); servletDef = webxml.getServlets().get("param1"); - assertNull(servletDef); + Assert.assertNull(servletDef); } @@ -151,13 +146,13 @@ public class TestContextConfigAnnotation ContextConfig config = new ContextConfig(); File pFile = paramClassResource( "org/apache/catalina/startup/NoMappingParamServlet"); - assertTrue(pFile.exists()); + Assert.assertTrue(pFile.exists()); config.processAnnotationsFile(pFile, webxml, false); - assertEquals("tomcat", servletDef.getParameterMap().get("foo")); - assertEquals("World!", servletDef.getParameterMap().get("bar")); + Assert.assertEquals("tomcat", servletDef.getParameterMap().get("foo")); + Assert.assertEquals("World!", servletDef.getParameterMap().get("bar")); ServletDef servletDef1 = webxml.getServlets().get("param1"); - assertNotNull(servletDef1); - assertEquals(servletDef, servletDef1); + Assert.assertNotNull(servletDef1); + Assert.assertEquals(servletDef, servletDef1); } @Test @@ -166,15 +161,15 @@ public class TestContextConfigAnnotation ContextConfig config = new ContextConfig(); File pFile = paramClassResource( "org/apache/catalina/startup/DuplicateMappingParamServlet"); - assertTrue(pFile.exists()); + Assert.assertTrue(pFile.exists()); try { config.processAnnotationsFile(pFile, webxml, false); - fail(); + Assert.fail(); } catch (IllegalArgumentException ex) { // ignore } ServletDef servletDef = webxml.getServlets().get("param"); - assertNull(servletDef); + Assert.assertNull(servletDef); } @Test @@ -188,8 +183,8 @@ public class TestContextConfigAnnotation "org/apache/catalina/startup/ParamFilter"); config.processAnnotationsFile(fFile, webxml, false); FilterDef fdef = webxml.getFilters().get("paramFilter"); - assertNotNull(fdef); - assertEquals("Servlet says: ",fdef.getParameterMap().get("message")); + Assert.assertNotNull(fdef); + Assert.assertEquals("Servlet says: ",fdef.getParameterMap().get("message")); } @Test @@ -220,30 +215,30 @@ public class TestContextConfigAnnotation "org/apache/catalina/startup/ParamFilter"); config.processAnnotationsFile(fFile, webxml, false); FilterDef fdef = webxml.getFilters().get("paramFilter"); - assertNotNull(fdef); - assertEquals(filterDef,fdef); - assertEquals("tomcat",fdef.getParameterMap().get("message")); + Assert.assertNotNull(fdef); + Assert.assertEquals(filterDef,fdef); + Assert.assertEquals("tomcat",fdef.getParameterMap().get("message")); Set<FilterMap> filterMappings = webxml.getFilterMappings(); - assertTrue(filterMappings.contains(filterMap)); + Assert.assertTrue(filterMappings.contains(filterMap)); // annotation mapping not added s. Servlet Spec 3.0 (Nov 2009) // 8.2.3.3.vi page 81 String[] urlPatterns = filterMap.getURLPatterns(); - assertNotNull(urlPatterns); - assertEquals(1,urlPatterns.length); - assertEquals("/param1",urlPatterns[0]); + Assert.assertNotNull(urlPatterns); + Assert.assertEquals(1,urlPatterns.length); + Assert.assertEquals("/param1",urlPatterns[0]); // check simple Parameter - assertEquals("Description", fdef.getDescription()); - assertEquals("DisplayName", fdef.getDisplayName()); - assertEquals("LargeIcon", fdef.getLargeIcon()); - assertEquals("SmallIcon", fdef.getSmallIcon()); + Assert.assertEquals("Description", fdef.getDescription()); + Assert.assertEquals("DisplayName", fdef.getDisplayName()); + Assert.assertEquals("LargeIcon", fdef.getLargeIcon()); + Assert.assertEquals("SmallIcon", fdef.getSmallIcon()); // FIXME: Strange why servletDef is Boolean and FilterDef is String? - assertEquals("true", fdef.getAsyncSupported()); + Assert.assertEquals("true", fdef.getAsyncSupported()); String[] dis = filterMap.getDispatcherNames(); - assertEquals(2, dis.length); - assertEquals(DispatcherType.ERROR.toString(),dis[0]); - assertEquals(DispatcherType.ASYNC.toString(),dis[1]); + Assert.assertEquals(2, dis.length); + Assert.assertEquals(DispatcherType.ERROR.toString(),dis[0]); + Assert.assertEquals(DispatcherType.ASYNC.toString(),dis[1]); } @@ -253,15 +248,15 @@ public class TestContextConfigAnnotation ContextConfig config = new ContextConfig(); File pFile = paramClassResource( "org/apache/catalina/startup/DuplicateMappingParamFilter"); - assertTrue(pFile.exists()); + Assert.assertTrue(pFile.exists()); try { config.processAnnotationsFile(pFile, webxml, false); - fail(); + Assert.fail(); } catch (IllegalArgumentException ex) { // ignore } FilterDef filterDef = webxml.getFilters().get("paramD"); - assertNull(filterDef); + Assert.assertNull(filterDef); } @Test @@ -306,9 +301,9 @@ public class TestContextConfigAnnotation config.processAnnotationsFile(file, ignore, false); // Check right number of classes were noted to be handled - assertEquals(0, config.initializerClassMap.get(sciNone).size()); - assertEquals(2, config.initializerClassMap.get(sciServlet).size()); - assertEquals(4, config.initializerClassMap.get(sciObject).size()); + Assert.assertEquals(0, config.initializerClassMap.get(sciNone).size()); + Assert.assertEquals(2, config.initializerClassMap.get(sciServlet).size()); + Assert.assertEquals(4, config.initializerClassMap.get(sciObject).size()); } private static final class SCI implements ServletContainerInitializer { @@ -357,7 +352,7 @@ public class TestContextConfigAnnotation */ private File paramClassResource(String className) throws URISyntaxException { URL url = getClass().getClassLoader().getResource(className + ".class"); - assertNotNull(url); + Assert.assertNotNull(url); File file = new File(url.toURI()); return file;
Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestListener.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestListener.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestListener.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestListener.java Mon Nov 13 12:00:30 2017 @@ -24,9 +24,7 @@ import javax.servlet.ServletContextEvent import javax.servlet.ServletContextListener; import javax.servlet.ServletException; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - +import org.junit.Assert; import org.junit.Test; import org.apache.catalina.Context; @@ -47,7 +45,7 @@ public class TestListener extends Tomcat context.addServletContainerInitializer(new SCI(), null); tomcat.start(); - assertTrue(SCL.initialized); + Assert.assertTrue(SCL.initialized); } /* @@ -68,7 +66,7 @@ public class TestListener extends Tomcat tomcat.start(); //check that the ServletContextInitializer wasn't initialized. - assertFalse(SCL3.initialized); + Assert.assertFalse(SCL3.initialized); } public static class SCI implements ServletContainerInitializer { Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestTomcat.java Mon Nov 13 12:00:30 2017 @@ -33,12 +33,6 @@ import javax.servlet.http.HttpServletReq import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import org.junit.Assert; import org.junit.Test; @@ -198,7 +192,7 @@ public class TestTomcat extends TomcatBa tomcat.start(); ByteChunk res = getUrl("http://localhost:"; + getPort() + "/"); - assertEquals("Hello world", res.toString()); + Assert.assertEquals("Hello world", res.toString()); } @Test @@ -215,7 +209,7 @@ public class TestTomcat extends TomcatBa ByteChunk res = getUrl("http://localhost:"; + getPort() + "/examples/servlets/servlet/HelloWorldExample"); String text = res.toString(); - assertTrue(text, text.indexOf("<a href=\"../helloworld.html\">") > 0); + Assert.assertTrue(text, text.indexOf("<a href=\"../helloworld.html\">") > 0); } @Test @@ -233,7 +227,7 @@ public class TestTomcat extends TomcatBa ByteChunk res = getUrl("http://localhost:"; + getPort() + "/examples/jsp/jsp2/el/basic-arithmetic.jsp"); String text = res.toString(); - assertTrue(text, text.indexOf("<td>${(1==2) ? 3 : 4}</td>") > 0); + Assert.assertTrue(text, text.indexOf("<td>${(1==2) ? 3 : 4}</td>") > 0); } @Test @@ -249,7 +243,7 @@ public class TestTomcat extends TomcatBa tomcat.start(); ByteChunk res = getUrl("http://localhost:"; + getPort() + "/"); - assertEquals("Hello world", res.toString()); + Assert.assertEquals("Hello world", res.toString()); } @Test @@ -288,7 +282,7 @@ public class TestTomcat extends TomcatBa tomcat.start(); ByteChunk res = getUrl("http://localhost:"; + getPort() + "/"); - assertEquals("Hello, Tomcat User", res.toString()); + Assert.assertEquals("Hello, Tomcat User", res.toString()); } /* @@ -322,7 +316,7 @@ public class TestTomcat extends TomcatBa tomcat.start(); ByteChunk res = getUrl("http://localhost:"; + getPort() + "/"); - assertEquals("Hello, Tomcat User", res.toString()); + Assert.assertEquals("Hello, Tomcat User", res.toString()); } @@ -350,8 +344,8 @@ public class TestTomcat extends TomcatBa int rc =getUrl("http://localhost:"; + getPort() + contextPath + "/testGetResource", res, null); - assertEquals(HttpServletResponse.SC_OK, rc); - assertTrue(res.toString().contains("<?xml version=\"1.0\" ")); + Assert.assertEquals(HttpServletResponse.SC_OK, rc); + Assert.assertTrue(res.toString().contains("<?xml version=\"1.0\" ")); } @Test @@ -370,7 +364,7 @@ public class TestTomcat extends TomcatBa ex.printStackTrace(); e = ex; } - assertNull(e); + Assert.assertNull(e); } @Test @@ -387,33 +381,33 @@ public class TestTomcat extends TomcatBa tomcat.start(); ByteChunk res = getUrl("http://localhost:"; + getPort() + "/"); - assertEquals("OK", res.toString()); + Assert.assertEquals("OK", res.toString()); - assertEquals(1, initCount.getCallCount()); + Assert.assertEquals(1, initCount.getCallCount()); } @Test public void testGetWebappConfigFileFromDirectory() { Tomcat tomcat = new Tomcat(); - assertNotNull(tomcat.getWebappConfigFile("test/deployment/dirContext", "")); + Assert.assertNotNull(tomcat.getWebappConfigFile("test/deployment/dirContext", "")); } @Test public void testGetWebappConfigFileFromDirectoryNegative() { Tomcat tomcat = new Tomcat(); - assertNull(tomcat.getWebappConfigFile("test/deployment/dirNoContext", "")); + Assert.assertNull(tomcat.getWebappConfigFile("test/deployment/dirNoContext", "")); } @Test public void testGetWebappConfigFileFromJar() { Tomcat tomcat = new Tomcat(); - assertNotNull(tomcat.getWebappConfigFile("test/deployment/context.war", "")); + Assert.assertNotNull(tomcat.getWebappConfigFile("test/deployment/context.war", "")); } @Test public void testGetWebappConfigFileFromJarNegative() { Tomcat tomcat = new Tomcat(); - assertNull(tomcat.getWebappConfigFile("test/deployment/noContext.war", "")); + Assert.assertNull(tomcat.getWebappConfigFile("test/deployment/noContext.war", "")); } @Test @@ -426,7 +420,7 @@ public class TestTomcat extends TomcatBa tomcat.start(); - assertEquals("WAR_CONTEXT", context.getSessionCookieName()); + Assert.assertEquals("WAR_CONTEXT", context.getSessionCookieName()); } @Test @@ -437,7 +431,7 @@ public class TestTomcat extends TomcatBa Context context = tomcat.addWebapp(null, "/test", appFile.getAbsolutePath()); - assertEquals(StandardContext.class.getName(), context.getClass() + Assert.assertEquals(StandardContext.class.getName(), context.getClass() .getName()); } @@ -452,7 +446,7 @@ public class TestTomcat extends TomcatBa try { File appFile = new File("test/deployment/context.war"); tomcat.addWebapp(null, "/test", appFile.getAbsolutePath()); - fail(); + Assert.fail(); } catch (IllegalArgumentException e) { // OK } @@ -471,7 +465,7 @@ public class TestTomcat extends TomcatBa Context context = tomcat.addWebapp(null, "/test", appFile.getAbsolutePath()); - assertEquals(ReplicatedContext.class.getName(), context.getClass() + Assert.assertEquals(ReplicatedContext.class.getName(), context.getClass() .getName()); } @@ -488,7 +482,7 @@ public class TestTomcat extends TomcatBa Context context = tomcat.addWebapp(host, "/test", appFile.getAbsolutePath()); - assertEquals(ReplicatedContext.class.getName(), context.getClass() + Assert.assertEquals(ReplicatedContext.class.getName(), context.getClass() .getName()); } @@ -498,7 +492,7 @@ public class TestTomcat extends TomcatBa // No file system docBase required Context ctx = tomcat.addContext(null, "", null); - assertEquals(StandardContext.class.getName(), ctx.getClass().getName()); + Assert.assertEquals(StandardContext.class.getName(), ctx.getClass().getName()); } @Test @@ -512,7 +506,7 @@ public class TestTomcat extends TomcatBa // No file system docBase required try { tomcat.addContext(null, "", null); - fail(); + Assert.fail(); } catch (IllegalArgumentException e) { // OK } @@ -529,7 +523,7 @@ public class TestTomcat extends TomcatBa // No file system docBase required Context ctx = tomcat.addContext(host, "", null); - assertEquals(ReplicatedContext.class.getName(), ctx.getClass() + Assert.assertEquals(ReplicatedContext.class.getName(), ctx.getClass() .getName()); } Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestTomcatClassLoader.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestTomcatClassLoader.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestTomcatClassLoader.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TestTomcatClassLoader.java Mon Nov 13 12:00:30 2017 @@ -26,8 +26,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import static org.junit.Assert.assertEquals; - +import org.junit.Assert; import org.junit.Test; import org.apache.catalina.Context; @@ -49,7 +48,7 @@ public class TestTomcatClassLoader exten tomcat.start(); ByteChunk res = getUrl("http://localhost:"; + getPort() + "/"); - assertEquals("WEBAPP,SYSTEM,OTHER,", res.toString()); + Assert.assertEquals("WEBAPP,SYSTEM,OTHER,", res.toString()); } @Test @@ -72,7 +71,7 @@ public class TestTomcatClassLoader exten tomcat.start(); ByteChunk res = getUrl("http://localhost:"; + getPort() + "/"); - assertEquals("WEBAPP,CUSTOM,SYSTEM,OTHER,", res.toString()); + Assert.assertEquals("WEBAPP,CUSTOM,SYSTEM,OTHER,", res.toString()); } private static final class ClassLoaderReport extends HttpServlet { Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Mon Nov 13 12:00:30 2017 @@ -42,8 +42,6 @@ import javax.servlet.http.HttpServletReq import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import static org.junit.Assert.fail; - import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -142,7 +140,7 @@ public abstract class TomcatBaseTest ext File appBase = new File(getTemporaryDirectory(), "webapps"); if (!appBase.exists() && !appBase.mkdir()) { - fail("Unable to create appBase for test"); + Assert.fail("Unable to create appBase for test"); } tomcat = new TomcatWithFastSessionIDs(); Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java Mon Nov 13 12:00:30 2017 @@ -16,10 +16,8 @@ */ package org.apache.catalina.tribes.group; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -62,7 +60,7 @@ public class TestGroupChannelOptionFlag }catch ( ChannelException x ) { if ( x.getMessage().indexOf("option flag conflict") >= 0 ) error = true; } - assertTrue(error); + Assert.assertTrue(error); } @Test @@ -83,7 +81,7 @@ public class TestGroupChannelOptionFlag }catch ( ChannelException x ) { if ( x.getMessage().indexOf("option flag conflict") >= 0 ) error = true; } - assertFalse(error); + Assert.assertFalse(error); } public static class TestInterceptor extends ChannelInterceptorBase { Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java Mon Nov 13 12:00:30 2017 @@ -22,9 +22,8 @@ import java.util.HashMap; import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; -import static org.junit.Assert.fail; - import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -79,7 +78,7 @@ public class TestGroupChannelSenderConne while ((countReceived = getReceivedMessageCount()) != n) { long time = System.currentTimeMillis(); if ((time - startTime) > sleep) { - fail("Only " + countReceived + " out of " + n + Assert.fail("Only " + countReceived + " out of " + n + " messages have been received in " + (sleep / 1000) + " seconds"); break; Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java Mon Nov 13 12:00:30 2017 @@ -16,9 +16,8 @@ */ package org.apache.catalina.tribes.group; -import static org.junit.Assert.assertEquals; - import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -57,7 +56,7 @@ public class TestGroupChannelStartStop { channel.start(Channel.DEFAULT); count++; } catch ( Exception x){x.printStackTrace();} - assertEquals(count,2); + Assert.assertEquals(count,2); channel.stop(Channel.DEFAULT); } @@ -82,7 +81,7 @@ public class TestGroupChannelStartStop { } catch ( Exception x){ // expected } - assertEquals(count,1); + Assert.assertEquals(count,1); channel.stop(Channel.DEFAULT); //double the membership sender count = 0; @@ -97,7 +96,7 @@ public class TestGroupChannelStartStop { } catch ( Exception x){ // expected } - assertEquals(count,1); + Assert.assertEquals(count,1); channel.stop(Channel.DEFAULT); count = 0; @@ -111,7 +110,7 @@ public class TestGroupChannelStartStop { } catch ( Exception x){ // expected } - assertEquals(count,1); + Assert.assertEquals(count,1); channel.stop(Channel.DEFAULT); count = 0; @@ -125,7 +124,7 @@ public class TestGroupChannelStartStop { } catch ( Exception x){ // expected } - assertEquals(count,1); + Assert.assertEquals(count,1); channel.stop(Channel.DEFAULT); } @@ -143,7 +142,7 @@ public class TestGroupChannelStartStop { } catch ( Exception x){ // expected } - assertEquals(count,2); + Assert.assertEquals(count,2); channel.stop(Channel.DEFAULT); } Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java Mon Nov 13 12:00:30 2017 @@ -18,9 +18,8 @@ package org.apache.catalina.tribes.group import java.util.ArrayList; -import static org.junit.Assert.assertEquals; - import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -77,7 +76,9 @@ public class TestDomainFilterInterceptor for (int i=0; i<threads.length; i++ ) threads[i].start(); for (int i=0; i<threads.length; i++ ) threads[i].join(); System.out.println("All channels started."); - for (int i=listeners.length-1; i>=0; i-- ) assertEquals("Checking member arrival length",0,listeners[i].members.size()); + for (int i=listeners.length-1; i>=0; i-- ) { + Assert.assertEquals("Checking member arrival length",0,listeners[i].members.size()); + } } @After Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestGzipInterceptor.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestGzipInterceptor.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestGzipInterceptor.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestGzipInterceptor.java Mon Nov 13 12:00:30 2017 @@ -18,8 +18,7 @@ package org.apache.catalina.tribes.group import java.util.Arrays; -import static org.junit.Assert.assertTrue; - +import org.junit.Assert; import org.junit.Test; public class TestGzipInterceptor { @@ -64,6 +63,6 @@ public class TestGzipInterceptor { Arrays.fill(data, (byte)1); byte[] compress = GzipInterceptor.compress(data); byte[] result = GzipInterceptor.decompress(compress); - assertTrue(Arrays.equals(data, result)); + Assert.assertTrue(Arrays.equals(data, result)); } } Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java Mon Nov 13 12:00:30 2017 @@ -16,9 +16,8 @@ */ package org.apache.catalina.tribes.group.interceptors; -import static org.junit.Assert.assertEquals; - import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -72,7 +71,7 @@ public class TestNonBlockingCoordinator public void testCoord1() throws Exception { int expectedCount = channels[0].getMembers().length; for (int i = 1; i < CHANNEL_COUNT; i++) { - assertEquals("Message count expected to be equal.", expectedCount, + Assert.assertEquals("Message count expected to be equal.", expectedCount, channels[i].getMembers().length); } Member member = coordinators[0].getCoordinator(); @@ -86,7 +85,7 @@ public class TestNonBlockingCoordinator } } for (int i = 0; i < CHANNEL_COUNT; i++) { - assertEquals(member, coordinators[i].getCoordinator()); + Assert.assertEquals(member, coordinators[i].getCoordinator()); } System.out.println("Coordinator[1] is:" + member); } @@ -114,7 +113,7 @@ public class TestNonBlockingCoordinator member = coordinators[index].getCoordinator(); for (int i = 1; i < CHANNEL_COUNT; i++) { if (i != dead) { - assertEquals(member, coordinators[i].getCoordinator()); + Assert.assertEquals(member, coordinators[i].getCoordinator()); } } System.out.println("Coordinator[2b] is:" + member); Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java Mon Nov 13 12:00:30 2017 @@ -21,10 +21,8 @@ import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicInteger; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.fail; - import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -93,7 +91,7 @@ public class TestOrderInterceptor { } Thread.sleep(5000); for ( int i=0; i<test.length; i++ ) { - assertFalse(test[i].fail); + Assert.assertFalse(test[i].fail); } } @@ -127,12 +125,12 @@ public class TestOrderInterceptor { threads[i].join(); } if (!exceptionQueue.isEmpty()) { - fail("Exception while sending in threads: " + Assert.fail("Exception while sending in threads: " + exceptionQueue.remove().toString()); } Thread.sleep(5000); for ( int i=0; i<test.length; i++ ) { - assertFalse(test[i].fail); + Assert.assertFalse(test[i].fail); } } Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java Mon Nov 13 12:00:30 2017 @@ -18,10 +18,8 @@ package org.apache.catalina.tribes.group import java.util.ArrayList; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -71,16 +69,16 @@ public class TestTcpFailureDetector { channel1.start(Channel.DEFAULT); channel2.start(Channel.DEFAULT); //Thread.sleep(1000); - assertEquals("Expecting member count to be equal",mbrlist1.members.size(),mbrlist2.members.size()); + Assert.assertEquals("Expecting member count to be equal",mbrlist1.members.size(),mbrlist2.members.size()); channel2.stop(Channel.SND_RX_SEQ); ByteMessage msg = new ByteMessage(new byte[1024]); try { channel1.send(channel1.getMembers(), msg, 0); - fail("Message send should have failed."); + Assert.fail("Message send should have failed."); } catch ( ChannelException x ) { // Ignore } - assertEquals("Expecting member count to not be equal",mbrlist1.members.size()+1,mbrlist2.members.size()); + Assert.assertEquals("Expecting member count to not be equal",mbrlist1.members.size()+1,mbrlist2.members.size()); channel1.stop(Channel.DEFAULT); channel2.stop(Channel.DEFAULT); } @@ -96,7 +94,7 @@ public class TestTcpFailureDetector { channel2.stop(Channel.SND_RX_SEQ); channel2.start(Channel.MBR_TX_SEQ); //Thread.sleep(1000); - assertEquals("Expecting member count to not be equal",mbrlist1.members.size()+1,mbrlist2.members.size()); + Assert.assertEquals("Expecting member count to not be equal",mbrlist1.members.size()+1,mbrlist2.members.size()); channel1.stop(Channel.DEFAULT); channel2.stop(Channel.DEFAULT); } @@ -108,15 +106,15 @@ public class TestTcpFailureDetector { channel1.start(Channel.DEFAULT); channel2.start(Channel.DEFAULT); //Thread.sleep(1000); - assertEquals("Expecting member count to be equal",mbrlist1.members.size(),mbrlist2.members.size()); + Assert.assertEquals("Expecting member count to be equal",mbrlist1.members.size(),mbrlist2.members.size()); channel2.stop(Channel.MBR_TX_SEQ); ByteMessage msg = new ByteMessage(new byte[1024]); try { Thread.sleep(5000); - assertEquals("Expecting member count to be equal",mbrlist1.members.size(),mbrlist2.members.size()); + Assert.assertEquals("Expecting member count to be equal",mbrlist1.members.size(),mbrlist2.members.size()); channel1.send(channel1.getMembers(), msg, 0); } catch ( ChannelException x ) { - fail("Message send should have succeeded."); + Assert.fail("Message send should have succeeded."); } channel1.stop(Channel.DEFAULT); channel2.stop(Channel.DEFAULT); Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java Mon Nov 13 12:00:30 2017 @@ -16,10 +16,7 @@ */ package org.apache.catalina.tribes.io; -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; public class TestXByteBuffer { @@ -27,7 +24,7 @@ public class TestXByteBuffer { @Test public void testEmptyArray() throws Exception { Object obj = XByteBuffer.deserialize(new byte[0]); - assertNull(obj); + Assert.assertNull(obj); } @Test @@ -35,7 +32,7 @@ public class TestXByteBuffer { String test = "This is as test."; byte[] msg = XByteBuffer.serialize(test); Object obj = XByteBuffer.deserialize(msg); - assertTrue(obj instanceof String); - assertEquals(test, obj); + Assert.assertTrue(obj instanceof String); + Assert.assertEquals(test, obj); } } Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java Mon Nov 13 12:00:30 2017 @@ -18,9 +18,7 @@ package org.apache.catalina.tribes.membe import java.util.Arrays; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -51,13 +49,13 @@ public class TestMemberImplSerialization @Test public void testCompare() throws Exception { - assertTrue(m1.equals(m2)); - assertTrue(m2.equals(m1)); - assertTrue(p1.equals(m2)); - assertFalse(m1.equals(p2)); - assertFalse(m1.equals(p2)); - assertFalse(m2.equals(p2)); - assertFalse(p1.equals(p2)); + Assert.assertTrue(m1.equals(m2)); + Assert.assertTrue(m2.equals(m1)); + Assert.assertTrue(p1.equals(m2)); + Assert.assertFalse(m1.equals(p2)); + Assert.assertFalse(m1.equals(p2)); + Assert.assertFalse(m2.equals(p2)); + Assert.assertFalse(p1.equals(p2)); } @Test @@ -68,8 +66,8 @@ public class TestMemberImplSerialization Member a1 = MemberImpl.getMember(md1); Member a2 = MemberImpl.getMember(md2); - assertTrue(a1.getUdpPort()==a2.getUdpPort()); - assertTrue(a1.getUdpPort()==udpPort); + Assert.assertTrue(a1.getUdpPort()==a2.getUdpPort()); + Assert.assertTrue(a1.getUdpPort()==udpPort); } @Test @@ -77,23 +75,23 @@ public class TestMemberImplSerialization Member m = m1; byte[] md1 = m.getData(false,true); byte[] mda1 = m.getData(false,false); - assertTrue(Arrays.equals(md1,mda1)); - assertTrue(md1==mda1); + Assert.assertTrue(Arrays.equals(md1,mda1)); + Assert.assertTrue(md1==mda1); mda1 = m.getData(true,true); Member ma1 = MemberImpl.getMember(mda1); - assertTrue(compareMembers(m,ma1)); + Assert.assertTrue(compareMembers(m,ma1)); mda1 = p1.getData(false); - assertFalse(Arrays.equals(md1,mda1)); + Assert.assertFalse(Arrays.equals(md1,mda1)); ma1 = MemberImpl.getMember(mda1); - assertTrue(compareMembers(p1,ma1)); + Assert.assertTrue(compareMembers(p1,ma1)); md1 = m.getData(true,true); Thread.sleep(50); mda1 = m.getData(true,true); Member a1 = MemberImpl.getMember(md1); Member a2 = MemberImpl.getMember(mda1); - assertTrue(a1.equals(a2)); - assertFalse(Arrays.equals(md1,mda1)); + Assert.assertTrue(a1.equals(a2)); + Assert.assertFalse(Arrays.equals(md1,mda1)); } Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java Mon Nov 13 12:00:30 2017 @@ -20,9 +20,8 @@ import java.io.Serializable; import java.util.Arrays; import java.util.Random; -import static org.junit.Assert.assertEquals; - import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -85,7 +84,7 @@ public class TestDataIntegrity { long start = System.currentTimeMillis(); while ( (System.currentTimeMillis()-start)<15000 && msgCount*threadCount!=listener1.count) Thread.sleep(500); System.err.println("Finished NO_ACK ["+listener1.count+"]"); - assertEquals("Checking success messages.",msgCount*threadCount,listener1.count); + Assert.assertEquals("Checking success messages.",msgCount*threadCount,listener1.count); } @Test @@ -113,7 +112,7 @@ public class TestDataIntegrity { long start = System.currentTimeMillis(); while ( (System.currentTimeMillis()-start)<25000 && msgCount*threadCount!=listener1.count) Thread.sleep(500); System.err.println("Finished ASYNC MULTI THREAD ["+listener1.count+"]"); - assertEquals("Checking success messages.",msgCount*threadCount,listener1.count); + Assert.assertEquals("Checking success messages.",msgCount*threadCount,listener1.count); } @Test @@ -124,7 +123,7 @@ public class TestDataIntegrity { long start = System.currentTimeMillis(); while ( (System.currentTimeMillis()-start)<5000 && msgCount!=listener1.count) Thread.sleep(500); System.err.println("Finished ASYNC"); - assertEquals("Checking success messages.",msgCount,listener1.count); + Assert.assertEquals("Checking success messages.",msgCount,listener1.count); } @Test @@ -133,7 +132,7 @@ public class TestDataIntegrity { for (int i=0; i<msgCount; i++) channel1.send(new Member[] {channel2.getLocalMember(false)},Data.createRandomData(),Channel.SEND_OPTIONS_USE_ACK); Thread.sleep(250); System.err.println("Finished ACK"); - assertEquals("Checking success messages.",msgCount,listener1.count); + Assert.assertEquals("Checking success messages.",msgCount,listener1.count); } @Test @@ -142,7 +141,7 @@ public class TestDataIntegrity { for (int i=0; i<msgCount; i++) channel1.send(new Member[] {channel2.getLocalMember(false)},Data.createRandomData(),Channel.SEND_OPTIONS_SYNCHRONIZED_ACK|Channel.SEND_OPTIONS_USE_ACK); Thread.sleep(250); System.err.println("Finished SYNC_ACK"); - assertEquals("Checking success messages.",msgCount,listener1.count); + Assert.assertEquals("Checking success messages.",msgCount,listener1.count); } public static class Listener implements ChannelListener { Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestMulticastPackages.java Mon Nov 13 12:00:30 2017 @@ -22,9 +22,8 @@ import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import static org.junit.Assert.assertEquals; - import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -91,7 +90,7 @@ public class TestMulticastPackages { channel1.send(new Member[] {channel2.getLocalMember(false)}, Data.createRandomData(1024),Channel.SEND_OPTIONS_MULTICAST); Thread.sleep(500); System.err.println("Finished Single package NO_ACK ["+listener1.count+"]"); - assertEquals("Checking success messages.",1,listener1.count.get()); + Assert.assertEquals("Checking success messages.",1,listener1.count.get()); } @@ -141,7 +140,7 @@ public class TestMulticastPackages { System.out.println("Sent "+counter.get()+ " messages. Received "+listener1.count+" Highest msg received:"+listener1.maxIdx); System.out.print("Missing messages:"); printMissingMsgs(listener1.nrs,counter.get()); - assertEquals("Checking success messages.",msgCount*threadCount,listener1.count.get()); + Assert.assertEquals("Checking success messages.",msgCount*threadCount,listener1.count.get()); } @Test @@ -152,7 +151,7 @@ public class TestMulticastPackages { long start = System.currentTimeMillis(); while ( (System.currentTimeMillis()-start)<5000 && msgCount!=listener1.count.get()) Thread.sleep(500); System.err.println("Finished ASYNC"); - assertEquals("Checking success messages.",msgCount,listener1.count.get()); + Assert.assertEquals("Checking success messages.",msgCount,listener1.count.get()); } @Test @@ -161,7 +160,7 @@ public class TestMulticastPackages { for (int i=0; i<msgCount; i++) channel1.send(new Member[] {channel2.getLocalMember(false)},Data.createRandomData(1024),Channel.SEND_OPTIONS_USE_ACK|Channel.SEND_OPTIONS_MULTICAST); Thread.sleep(250); System.err.println("Finished ACK"); - assertEquals("Checking success messages.",msgCount,listener1.count.get()); + Assert.assertEquals("Checking success messages.",msgCount,listener1.count.get()); } @Test @@ -170,7 +169,7 @@ public class TestMulticastPackages { for (int i=0; i<msgCount; i++) channel1.send(new Member[] {channel2.getLocalMember(false)},Data.createRandomData(1024),Channel.SEND_OPTIONS_SYNCHRONIZED_ACK|Channel.SEND_OPTIONS_USE_ACK|Channel.SEND_OPTIONS_MULTICAST); Thread.sleep(250); System.err.println("Finished SYNC_ACK"); - assertEquals("Checking success messages.",msgCount,listener1.count.get()); + Assert.assertEquals("Checking success messages.",msgCount,listener1.count.get()); } public static class Listener implements ChannelListener { Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestRemoteProcessException.java Mon Nov 13 12:00:30 2017 @@ -21,10 +21,8 @@ import java.io.Serializable; import java.util.Arrays; import java.util.Random; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -71,7 +69,7 @@ public class TestRemoteProcessException Channel.SEND_OPTIONS_SYNCHRONIZED_ACK | Channel.SEND_OPTIONS_USE_ACK); if (error) { - fail("A ChannelException was expected"); + Assert.fail("A ChannelException was expected"); } } catch (ChannelException e) { if (!error) { @@ -86,10 +84,10 @@ public class TestRemoteProcessException // as it is being re-sent. Thus the listener1 count is off by +2. final int duplicate = 2; - assertEquals("Checking failure messages.", errC + duplicate, + Assert.assertEquals("Checking failure messages.", errC + duplicate, listener1.errCnt); - assertEquals("Checking success messages.", nerrC, listener1.noErrCnt); - assertEquals("Checking all messages.", msgCount + duplicate, + Assert.assertEquals("Checking success messages.", nerrC, listener1.noErrCnt); + Assert.assertEquals("Checking all messages.", msgCount + duplicate, listener1.noErrCnt + listener1.errCnt); System.out.println("Listener 1 stats:"); listener1.printStats(System.out); Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestUdpPackages.java Mon Nov 13 12:00:30 2017 @@ -22,9 +22,8 @@ import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import static org.junit.Assert.assertEquals; - import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -91,7 +90,7 @@ public class TestUdpPackages { channel1.send(new Member[] {channel2.getLocalMember(false)}, Data.createRandomData(1024),Channel.SEND_OPTIONS_UDP); Thread.sleep(500); System.err.println("Finished Single package NO_ACK ["+listener1.count+"]"); - assertEquals("Checking success messages.",1,listener1.count.get()); + Assert.assertEquals("Checking success messages.",1,listener1.count.get()); } @Test @@ -133,7 +132,7 @@ public class TestUdpPackages { System.out.println("Sent "+counter.get()+ " messages. Received "+listener1.count+" Highest msg received:"+listener1.maxIdx); System.out.print("Missing messages:"); printMissingMsgs(listener1.nrs,counter.get()); - assertEquals("Checking success messages.",msgCount*threadCount,listener1.count.get()); + Assert.assertEquals("Checking success messages.",msgCount*threadCount,listener1.count.get()); } public static void printMissingMsgs(int[] msgs, int maxIdx) { @@ -182,7 +181,7 @@ public class TestUdpPackages { System.out.println("Sent "+counter.get()+ " messages. Received "+listener1.count+" Highest msg received:"+listener1.maxIdx); System.out.print("Missing messages:"); printMissingMsgs(listener1.nrs,counter.get()); - assertEquals("Checking success messages.",msgCount*threadCount,listener1.count.get()); + Assert.assertEquals("Checking success messages.",msgCount*threadCount,listener1.count.get()); } @Test @@ -193,7 +192,7 @@ public class TestUdpPackages { long start = System.currentTimeMillis(); while ( (System.currentTimeMillis()-start)<5000 && msgCount!=listener1.count.get()) Thread.sleep(500); System.err.println("Finished ASYNC"); - assertEquals("Checking success messages.",msgCount,listener1.count.get()); + Assert.assertEquals("Checking success messages.",msgCount,listener1.count.get()); } @Test @@ -202,7 +201,7 @@ public class TestUdpPackages { for (int i=0; i<msgCount; i++) channel1.send(new Member[] {channel2.getLocalMember(false)},Data.createRandomData(1024),Channel.SEND_OPTIONS_USE_ACK|Channel.SEND_OPTIONS_UDP); Thread.sleep(250); System.err.println("Finished ACK"); - assertEquals("Checking success messages.",msgCount,listener1.count.get()); + Assert.assertEquals("Checking success messages.",msgCount,listener1.count.get()); } @Test @@ -211,7 +210,7 @@ public class TestUdpPackages { for (int i=0; i<msgCount; i++) channel1.send(new Member[] {channel2.getLocalMember(false)},Data.createRandomData(1024),Channel.SEND_OPTIONS_SYNCHRONIZED_ACK|Channel.SEND_OPTIONS_USE_ACK|Channel.SEND_OPTIONS_UDP); Thread.sleep(250); System.err.println("Finished SYNC_ACK"); - assertEquals("Checking success messages.",msgCount,listener1.count.get()); + Assert.assertEquals("Checking success messages.",msgCount,listener1.count.get()); } public static class Listener implements ChannelListener { Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/util/TestContextName.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/util/TestContextName.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/util/TestContextName.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/util/TestContextName.java Mon Nov 13 12:00:30 2017 @@ -16,8 +16,7 @@ */ package org.apache.catalina.util; -import static org.junit.Assert.assertEquals; - +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -75,132 +74,132 @@ public class TestContextName { @Test public void testGetBaseName() { - assertEquals("ROOT", cn1.getBaseName()); - assertEquals("ROOT", cn2.getBaseName()); - assertEquals("ROOT", cn3.getBaseName()); - assertEquals("foo", cn4.getBaseName()); - assertEquals("foo#bar", cn5.getBaseName()); - assertEquals("ROOT##A", cn6.getBaseName()); - assertEquals("ROOT##B", cn7.getBaseName()); - assertEquals("ROOT##C", cn8.getBaseName()); - assertEquals("foo##D", cn9.getBaseName()); - assertEquals("foo#bar##E", cn10.getBaseName()); - assertEquals("ROOT", cn11.getBaseName()); - assertEquals("foo", cn12.getBaseName()); - assertEquals("foo#bar", cn13.getBaseName()); - assertEquals("ROOT##A", cn14.getBaseName()); - assertEquals("foo##D", cn15.getBaseName()); - assertEquals("foo#bar##E", cn16.getBaseName()); - assertEquals("ROOT", cn17.getBaseName()); - assertEquals("ROOT#bar", cn18.getBaseName()); - assertEquals("ROOT#bar##A", cn19.getBaseName()); - assertEquals("ROOT##A", cn20.getBaseName()); - assertEquals("foo.war", cn21.getBaseName()); - assertEquals("foo", cn22.getBaseName()); + Assert.assertEquals("ROOT", cn1.getBaseName()); + Assert.assertEquals("ROOT", cn2.getBaseName()); + Assert.assertEquals("ROOT", cn3.getBaseName()); + Assert.assertEquals("foo", cn4.getBaseName()); + Assert.assertEquals("foo#bar", cn5.getBaseName()); + Assert.assertEquals("ROOT##A", cn6.getBaseName()); + Assert.assertEquals("ROOT##B", cn7.getBaseName()); + Assert.assertEquals("ROOT##C", cn8.getBaseName()); + Assert.assertEquals("foo##D", cn9.getBaseName()); + Assert.assertEquals("foo#bar##E", cn10.getBaseName()); + Assert.assertEquals("ROOT", cn11.getBaseName()); + Assert.assertEquals("foo", cn12.getBaseName()); + Assert.assertEquals("foo#bar", cn13.getBaseName()); + Assert.assertEquals("ROOT##A", cn14.getBaseName()); + Assert.assertEquals("foo##D", cn15.getBaseName()); + Assert.assertEquals("foo#bar##E", cn16.getBaseName()); + Assert.assertEquals("ROOT", cn17.getBaseName()); + Assert.assertEquals("ROOT#bar", cn18.getBaseName()); + Assert.assertEquals("ROOT#bar##A", cn19.getBaseName()); + Assert.assertEquals("ROOT##A", cn20.getBaseName()); + Assert.assertEquals("foo.war", cn21.getBaseName()); + Assert.assertEquals("foo", cn22.getBaseName()); } @Test public void testGetPath() { - assertEquals("", cn1.getPath()); - assertEquals("", cn2.getPath()); - assertEquals("", cn3.getPath()); - assertEquals("/foo", cn4.getPath()); - assertEquals("/foo/bar", cn5.getPath()); - assertEquals("", cn6.getPath()); - assertEquals("", cn7.getPath()); - assertEquals("", cn8.getPath()); - assertEquals("/foo", cn9.getPath()); - assertEquals("/foo/bar", cn10.getPath()); - assertEquals("", cn11.getPath()); - assertEquals("/foo", cn12.getPath()); - assertEquals("/foo/bar", cn13.getPath()); - assertEquals("", cn14.getPath()); - assertEquals("/foo", cn15.getPath()); - assertEquals("/foo/bar", cn16.getPath()); - assertEquals("", cn17.getPath()); - assertEquals("/ROOT/bar", cn18.getPath()); - assertEquals("/ROOT/bar", cn19.getPath()); - assertEquals("", cn20.getPath()); - assertEquals("/foo.war", cn21.getPath()); - assertEquals("/foo", cn22.getPath()); + Assert.assertEquals("", cn1.getPath()); + Assert.assertEquals("", cn2.getPath()); + Assert.assertEquals("", cn3.getPath()); + Assert.assertEquals("/foo", cn4.getPath()); + Assert.assertEquals("/foo/bar", cn5.getPath()); + Assert.assertEquals("", cn6.getPath()); + Assert.assertEquals("", cn7.getPath()); + Assert.assertEquals("", cn8.getPath()); + Assert.assertEquals("/foo", cn9.getPath()); + Assert.assertEquals("/foo/bar", cn10.getPath()); + Assert.assertEquals("", cn11.getPath()); + Assert.assertEquals("/foo", cn12.getPath()); + Assert.assertEquals("/foo/bar", cn13.getPath()); + Assert.assertEquals("", cn14.getPath()); + Assert.assertEquals("/foo", cn15.getPath()); + Assert.assertEquals("/foo/bar", cn16.getPath()); + Assert.assertEquals("", cn17.getPath()); + Assert.assertEquals("/ROOT/bar", cn18.getPath()); + Assert.assertEquals("/ROOT/bar", cn19.getPath()); + Assert.assertEquals("", cn20.getPath()); + Assert.assertEquals("/foo.war", cn21.getPath()); + Assert.assertEquals("/foo", cn22.getPath()); } @Test public void testGetVersion() { - assertEquals("", cn1.getVersion()); - assertEquals("", cn2.getVersion()); - assertEquals("", cn3.getVersion()); - assertEquals("", cn4.getVersion()); - assertEquals("", cn5.getVersion()); - assertEquals("A", cn6.getVersion()); - assertEquals("B", cn7.getVersion()); - assertEquals("C", cn8.getVersion()); - assertEquals("D", cn9.getVersion()); - assertEquals("E", cn10.getVersion()); - assertEquals("", cn11.getVersion()); - assertEquals("", cn12.getVersion()); - assertEquals("", cn13.getVersion()); - assertEquals("A", cn14.getVersion()); - assertEquals("D", cn15.getVersion()); - assertEquals("E", cn16.getVersion()); - assertEquals("", cn17.getVersion()); - assertEquals("", cn18.getVersion()); - assertEquals("A", cn19.getVersion()); - assertEquals("A", cn20.getVersion()); - assertEquals("", cn21.getVersion()); - assertEquals("", cn22.getVersion()); + Assert.assertEquals("", cn1.getVersion()); + Assert.assertEquals("", cn2.getVersion()); + Assert.assertEquals("", cn3.getVersion()); + Assert.assertEquals("", cn4.getVersion()); + Assert.assertEquals("", cn5.getVersion()); + Assert.assertEquals("A", cn6.getVersion()); + Assert.assertEquals("B", cn7.getVersion()); + Assert.assertEquals("C", cn8.getVersion()); + Assert.assertEquals("D", cn9.getVersion()); + Assert.assertEquals("E", cn10.getVersion()); + Assert.assertEquals("", cn11.getVersion()); + Assert.assertEquals("", cn12.getVersion()); + Assert.assertEquals("", cn13.getVersion()); + Assert.assertEquals("A", cn14.getVersion()); + Assert.assertEquals("D", cn15.getVersion()); + Assert.assertEquals("E", cn16.getVersion()); + Assert.assertEquals("", cn17.getVersion()); + Assert.assertEquals("", cn18.getVersion()); + Assert.assertEquals("A", cn19.getVersion()); + Assert.assertEquals("A", cn20.getVersion()); + Assert.assertEquals("", cn21.getVersion()); + Assert.assertEquals("", cn22.getVersion()); } @Test public void testGetName() { - assertEquals("", cn1.getName()); - assertEquals("", cn2.getName()); - assertEquals("", cn3.getName()); - assertEquals("/foo", cn4.getName()); - assertEquals("/foo/bar", cn5.getName()); - assertEquals("##A", cn6.getName()); - assertEquals("##B", cn7.getName()); - assertEquals("##C", cn8.getName()); - assertEquals("/foo##D", cn9.getName()); - assertEquals("/foo/bar##E", cn10.getName()); - assertEquals("", cn11.getName()); - assertEquals("/foo", cn12.getName()); - assertEquals("/foo/bar", cn13.getName()); - assertEquals("##A", cn14.getName()); - assertEquals("/foo##D", cn15.getName()); - assertEquals("/foo/bar##E", cn16.getName()); - assertEquals("", cn17.getName()); - assertEquals("/ROOT/bar", cn18.getName()); - assertEquals("/ROOT/bar##A", cn19.getName()); - assertEquals("##A", cn20.getName()); - assertEquals("/foo.war", cn21.getName()); - assertEquals("/foo", cn22.getName()); + Assert.assertEquals("", cn1.getName()); + Assert.assertEquals("", cn2.getName()); + Assert.assertEquals("", cn3.getName()); + Assert.assertEquals("/foo", cn4.getName()); + Assert.assertEquals("/foo/bar", cn5.getName()); + Assert.assertEquals("##A", cn6.getName()); + Assert.assertEquals("##B", cn7.getName()); + Assert.assertEquals("##C", cn8.getName()); + Assert.assertEquals("/foo##D", cn9.getName()); + Assert.assertEquals("/foo/bar##E", cn10.getName()); + Assert.assertEquals("", cn11.getName()); + Assert.assertEquals("/foo", cn12.getName()); + Assert.assertEquals("/foo/bar", cn13.getName()); + Assert.assertEquals("##A", cn14.getName()); + Assert.assertEquals("/foo##D", cn15.getName()); + Assert.assertEquals("/foo/bar##E", cn16.getName()); + Assert.assertEquals("", cn17.getName()); + Assert.assertEquals("/ROOT/bar", cn18.getName()); + Assert.assertEquals("/ROOT/bar##A", cn19.getName()); + Assert.assertEquals("##A", cn20.getName()); + Assert.assertEquals("/foo.war", cn21.getName()); + Assert.assertEquals("/foo", cn22.getName()); } @Test public void testGetDisplayName() { - assertEquals("/", cn1.getDisplayName()); - assertEquals("/", cn2.getDisplayName()); - assertEquals("/", cn3.getDisplayName()); - assertEquals("/foo", cn4.getDisplayName()); - assertEquals("/foo/bar", cn5.getDisplayName()); - assertEquals("/##A", cn6.getDisplayName()); - assertEquals("/##B", cn7.getDisplayName()); - assertEquals("/##C", cn8.getDisplayName()); - assertEquals("/foo##D", cn9.getDisplayName()); - assertEquals("/foo/bar##E", cn10.getDisplayName()); - assertEquals("/", cn11.getDisplayName()); - assertEquals("/foo", cn12.getDisplayName()); - assertEquals("/foo/bar", cn13.getDisplayName()); - assertEquals("/##A", cn14.getDisplayName()); - assertEquals("/foo##D", cn15.getDisplayName()); - assertEquals("/foo/bar##E", cn16.getDisplayName()); - assertEquals("/", cn17.getDisplayName()); - assertEquals("/ROOT/bar", cn18.getDisplayName()); - assertEquals("/ROOT/bar##A", cn19.getDisplayName()); - assertEquals("/##A", cn20.getDisplayName()); - assertEquals("/foo.war", cn21.getDisplayName()); - assertEquals("/foo", cn22.getDisplayName()); + Assert.assertEquals("/", cn1.getDisplayName()); + Assert.assertEquals("/", cn2.getDisplayName()); + Assert.assertEquals("/", cn3.getDisplayName()); + Assert.assertEquals("/foo", cn4.getDisplayName()); + Assert.assertEquals("/foo/bar", cn5.getDisplayName()); + Assert.assertEquals("/##A", cn6.getDisplayName()); + Assert.assertEquals("/##B", cn7.getDisplayName()); + Assert.assertEquals("/##C", cn8.getDisplayName()); + Assert.assertEquals("/foo##D", cn9.getDisplayName()); + Assert.assertEquals("/foo/bar##E", cn10.getDisplayName()); + Assert.assertEquals("/", cn11.getDisplayName()); + Assert.assertEquals("/foo", cn12.getDisplayName()); + Assert.assertEquals("/foo/bar", cn13.getDisplayName()); + Assert.assertEquals("/##A", cn14.getDisplayName()); + Assert.assertEquals("/foo##D", cn15.getDisplayName()); + Assert.assertEquals("/foo/bar##E", cn16.getDisplayName()); + Assert.assertEquals("/", cn17.getDisplayName()); + Assert.assertEquals("/ROOT/bar", cn18.getDisplayName()); + Assert.assertEquals("/ROOT/bar##A", cn19.getDisplayName()); + Assert.assertEquals("/##A", cn20.getDisplayName()); + Assert.assertEquals("/foo.war", cn21.getDisplayName()); + Assert.assertEquals("/foo", cn22.getDisplayName()); } @Test @@ -236,10 +235,10 @@ public class TestContextName { } private void doCompare(ContextName cn1, ContextName cn2) { - assertEquals(cn1.getBaseName(), cn2.getBaseName()); - assertEquals(cn1.getDisplayName(), cn2.getDisplayName()); - assertEquals(cn1.getName(), cn2.getName()); - assertEquals(cn1.getPath(), cn2.getPath()); - assertEquals(cn1.getVersion(), cn2.getVersion()); + Assert.assertEquals(cn1.getBaseName(), cn2.getBaseName()); + Assert.assertEquals(cn1.getDisplayName(), cn2.getDisplayName()); + Assert.assertEquals(cn1.getName(), cn2.getName()); + Assert.assertEquals(cn1.getPath(), cn2.getPath()); + Assert.assertEquals(cn1.getVersion(), cn2.getVersion()); } } Modified: tomcat/tc8.0.x/trunk/test/org/apache/catalina/util/TestConversions.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/util/TestConversions.java?rev=1815090&r1=1815089&r2=1815090&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/util/TestConversions.java (original) +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/util/TestConversions.java Mon Nov 13 12:00:30 2017 @@ -18,19 +18,19 @@ package org.apache.catalina.util; import java.io.IOException; -import static org.junit.Assert.assertEquals; +import org.junit.Assert; import org.junit.Test; public class TestConversions { @Test public void testByteArrayToLong() throws IOException { - assertEquals(0L, Conversions.byteArrayToLong(new byte[] { 0 })); - assertEquals(1L, Conversions.byteArrayToLong(new byte[] { 1 })); - assertEquals(0xFF, Conversions.byteArrayToLong(new byte[] { -1 })); - assertEquals(0xFFFF, + Assert.assertEquals(0L, Conversions.byteArrayToLong(new byte[] { 0 })); + Assert.assertEquals(1L, Conversions.byteArrayToLong(new byte[] { 1 })); + Assert.assertEquals(0xFF, Conversions.byteArrayToLong(new byte[] { -1 })); + Assert.assertEquals(0xFFFF, Conversions.byteArrayToLong(new byte[] { -1, -1 })); - assertEquals(0xFFFFFF, + Assert.assertEquals(0xFFFFFF, Conversions.byteArrayToLong(new byte[] { -1, -1, -1 })); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
