diff options
author | Sopot Cela | 2016-04-11 12:46:40 +0000 |
---|---|---|
committer | Sopot Cela | 2016-04-11 12:46:40 +0000 |
commit | fffcb119d75411561fdbab4ff2f8580a2010ac60 (patch) | |
tree | aa223b1c1aa6d8952aa543c4e984d2b61978a0f3 | |
parent | 20de7888ff28d7a8a1606794a0603a5f37aa1b53 (diff) | |
download | rt.equinox.bundles-fffcb119d75411561fdbab4ff2f8580a2010ac60.tar.gz rt.equinox.bundles-fffcb119d75411561fdbab4ff2f8580a2010ac60.tar.xz rt.equinox.bundles-fffcb119d75411561fdbab4ff2f8580a2010ac60.zip |
Bug 490273 - Move tests to JUnit 4
Ports the o.e.e.http.servlet.tests.
Change-Id: I2bf44e0dbd5bc7a7925eca3d0c3a114547c265f0
Signed-off-by: Sopot Cela <scela@redhat.com>
5 files changed, 248 insertions, 104 deletions
diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http.servlet.tests/META-INF/MANIFEST.MF index 2ceb42cdf..86ca6fe99 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.http.servlet.tests/META-INF/MANIFEST.MF @@ -8,7 +8,6 @@ Eclipse-BundleShape: dir Bundle-Activator: org.eclipse.equinox.http.servlet.tests.bundle.Activator Import-Package: javax.servlet;version="2.6.0", javax.servlet.http;version="2.6.0", - junit.framework;version="4.8.2", org.apache.commons.fileupload;version="1.2.2", org.apache.commons.fileupload.disk;version="1.2.2", org.apache.commons.fileupload.servlet;version="1.2.2", @@ -16,6 +15,9 @@ Import-Package: javax.servlet;version="2.6.0", org.eclipse.equinox.http.servlet.context;version="1.0.0", org.eclipse.osgi.service.urlconversion;version="1.0.0", org.junit;version="4.11.0", + org.junit.rules;version="4.12.0", + org.junit.runner;version="4.12.0", + org.junit.runners;version="4.12.0", org.osgi.framework;version="1.6.0", org.osgi.framework.hooks.service;version="1.1.0", org.osgi.service.component, diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/testbase/AllTests.java b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/testbase/AllTests.java index 1f30bee6f..e0c907367 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/testbase/AllTests.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/testbase/AllTests.java @@ -3,17 +3,12 @@ package org.eclipse.equinox.http.servlet.testbase; import org.eclipse.equinox.http.servlet.tests.DispatchingTest; import org.eclipse.equinox.http.servlet.tests.ServletTest; - -import junit.framework.Test; -import junit.framework.TestSuite; - -public class AllTests extends TestSuite { - - public static Test suite() { - TestSuite suite = new TestSuite(); - suite.addTest(new TestSuite(DispatchingTest.class)); - suite.addTest(new TestSuite(ServletTest.class)); - return suite; - } - +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + +@RunWith(Suite.class) +@SuiteClasses({DispatchingTest.class,ServletTest.class}) +public class AllTests { + // see @SuiteClasses } diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/testbase/BaseTest.java b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/testbase/BaseTest.java index df77ff3f4..3c1c0ed47 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/testbase/BaseTest.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/testbase/BaseTest.java @@ -37,7 +37,8 @@ import org.eclipse.equinox.http.servlet.tests.bundle.Activator; import org.eclipse.equinox.http.servlet.tests.bundle.BundleAdvisor; import org.eclipse.equinox.http.servlet.tests.bundle.BundleInstaller; import org.eclipse.equinox.http.servlet.tests.util.ServletRequestAdvisor; - +import org.junit.After; +import org.junit.Before; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleException; @@ -47,11 +48,9 @@ import org.osgi.framework.ServiceRegistration; import org.osgi.service.http.HttpService; import org.osgi.service.http.context.ServletContextHelper; -import junit.framework.TestCase; - -public class BaseTest extends TestCase { +public class BaseTest { - @Override + @Before public void setUp() throws Exception { // Quiet logging for tests System.setProperty("/.LEVEL", "OFF"); @@ -70,7 +69,7 @@ public class BaseTest extends TestCase { startJetty(); } - @Override + @After public void tearDown() throws Exception { for (ServiceRegistration<? extends Object> serviceRegistration : registrations) { serviceRegistration.unregister(); diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/DispatchingTest.java b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/DispatchingTest.java index 5966983e3..99c17f05e 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/DispatchingTest.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/DispatchingTest.java @@ -35,7 +35,7 @@ import javax.servlet.http.HttpServletResponse; import org.eclipse.equinox.http.servlet.testbase.BaseTest; import org.eclipse.equinox.http.servlet.tests.util.BaseServlet; import org.junit.Assert; - +import org.junit.Test; import org.osgi.service.http.HttpContext; import org.osgi.service.http.HttpService; import org.osgi.service.http.context.ServletContextHelper; @@ -43,6 +43,7 @@ import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; public class DispatchingTest extends BaseTest { + @Test public void test_forwardDepth1() throws Exception { Servlet servlet1 = new BaseServlet() { private static final long serialVersionUID = 1L; @@ -107,6 +108,7 @@ public class DispatchingTest extends BaseTest { Assert.assertEquals("/a|/b|u=5&p=1|/a/s2/b|/s2|/a|/d|p=1|/a/s1/d|/s1", response); } + @Test public void test_forwardDepth1_WithRequestFilter() throws Exception { Servlet servlet1 = new BaseServlet() { private static final long serialVersionUID = 1L; @@ -195,6 +197,7 @@ public class DispatchingTest extends BaseTest { Assert.assertTrue(filter.getCalled()); } + @Test public void test_forwardDepth1_WithRequestAndForwardFilter() throws Exception { Servlet servlet1 = new BaseServlet() { private static final long serialVersionUID = 1L; @@ -283,6 +286,7 @@ public class DispatchingTest extends BaseTest { Assert.assertEquals(2, filter.getCount()); } + @Test public void test_forwardDepth2() throws Exception { Servlet servlet1 = new BaseServlet() { private static final long serialVersionUID = 1L; @@ -362,6 +366,7 @@ public class DispatchingTest extends BaseTest { Assert.assertEquals("/c1|/i3|p3=3&p2=2&p1=1|/c1/s3/i3|/s3|/c1|/i1|p1=1|/c1/s1/i1|/s1", response); } + @Test public void test_forwardDepth3() throws Exception { Servlet servlet1 = new BaseServlet() { private static final long serialVersionUID = 1L; @@ -456,6 +461,7 @@ public class DispatchingTest extends BaseTest { Assert.assertEquals("/c1|/i4|p4=4&p3=3&p2=2&p1=1|/c1/s4/i4|/s4|/c1|/i1|p1=1|/c1/s1/i1|/s1", response); } + @Test public void test_forwardNamedParameterAggregationAndPrecedence() throws Exception { Servlet sA = new HttpServlet() { private static final long serialVersionUID = 1L; @@ -513,6 +519,7 @@ public class DispatchingTest extends BaseTest { Assert.assertEquals("p=1&p=2|null|1|[1, 2]", result); } + @Test public void test_forwardNamed() throws Exception { Servlet sA = new HttpServlet() { private static final long serialVersionUID = 1L; @@ -583,6 +590,7 @@ public class DispatchingTest extends BaseTest { Assert.assertEquals("/c1|/c1/s1/a|p=1&p=2|/c1/s1/a||null|null|null|null|null", result); } + @Test public void test_forwardParameterAggregationAndPrecedence() throws Exception { Servlet sA = new HttpServlet() { private static final long serialVersionUID = 1L; @@ -631,6 +639,7 @@ public class DispatchingTest extends BaseTest { Assert.assertEquals("p=3&p=4&p=1&p=2|p=1&p=2|3|[3, 4, 1, 2]", result); } + @Test public void test_forwardStreamed() throws Exception { Servlet servlet1 = new BaseServlet() { private static final long serialVersionUID = 1L; @@ -695,6 +704,7 @@ public class DispatchingTest extends BaseTest { Assert.assertEquals("/a|/b|u=5&p=1|/a/s2/b|/s2|/a|/d|p=1|/a/s1/d|/s1", response); } + @Test public void test_forwardStreamed_WithRequestFilter() throws Exception { Servlet servlet1 = new BaseServlet() { private static final long serialVersionUID = 1L; @@ -783,6 +793,7 @@ public class DispatchingTest extends BaseTest { Assert.assertTrue(filter.getCalled()); } + @Test public void test_forwardStreamed_WithRequestAndForwardFilter() throws Exception { Servlet servlet1 = new BaseServlet() { private static final long serialVersionUID = 1L; @@ -871,6 +882,7 @@ public class DispatchingTest extends BaseTest { Assert.assertEquals(2, filter.getCount()); } + @Test public void test_includeBasic() throws Exception { Servlet servlet8 = new HttpServlet() { private static final long serialVersionUID = 1L; @@ -909,6 +921,7 @@ public class DispatchingTest extends BaseTest { Assert.assertEquals("s8target", requestAdvisor.request("S8")); } + @Test public void test_includeDepth1() throws Exception { Servlet servlet1 = new BaseServlet() { private static final long serialVersionUID = 1L; @@ -973,6 +986,7 @@ public class DispatchingTest extends BaseTest { Assert.assertEquals("/a|/d|u=5&p=1|/a/s1/d|/s1|/a|/b|u=5|/a/s2/b|/s2", response); } + @Test public void test_includeDepth1_WithRequestFilter() throws Exception { Servlet servlet1 = new BaseServlet() { private static final long serialVersionUID = 1L; @@ -1061,6 +1075,7 @@ public class DispatchingTest extends BaseTest { Assert.assertTrue(filter.getCalled()); } + @Test public void test_includeDepth1_WithRequestAndIncludeFilter() throws Exception { Servlet servlet1 = new BaseServlet() { private static final long serialVersionUID = 1L; @@ -1149,6 +1164,7 @@ public class DispatchingTest extends BaseTest { Assert.assertEquals(2, filter.getCount()); } + @Test public void test_includeDepth2() throws Exception { Servlet servlet1 = new BaseServlet() { private static final long serialVersionUID = 1L; @@ -1228,6 +1244,7 @@ public class DispatchingTest extends BaseTest { Assert.assertEquals("/c1|/i1|p3=3&p2=2&p1=1|/c1/s1/i1|/s1|/c1|/i3|p3=3|/c1/s3/i3|/s3", response); } + @Test public void test_includeDepth3() throws Exception { Servlet servlet1 = new BaseServlet() { private static final long serialVersionUID = 1L; @@ -1322,6 +1339,7 @@ public class DispatchingTest extends BaseTest { Assert.assertEquals("/c1|/i1|p4=4&p3=3&p2=2&p1=1|/c1/s1/i1|/s1|/c1|/i4|p4=4|/c1/s4/i4|/s4", response); } + @Test public void test_includeNamedParameterAggregationAndPrecedence() throws Exception { Servlet sA = new HttpServlet() { private static final long serialVersionUID = 1L; @@ -1379,6 +1397,7 @@ public class DispatchingTest extends BaseTest { Assert.assertEquals("p=1&p=2|null|1|[1, 2]", result); } + @Test public void test_includeNamed() throws Exception { Servlet sA = new HttpServlet() { private static final long serialVersionUID = 1L; @@ -1449,6 +1468,7 @@ public class DispatchingTest extends BaseTest { Assert.assertEquals("/c1|/c1/s1/a|p=1&p=2|/c1/s1/a||null|null|null|null|null", result); } + @Test public void test_includeParameterAggregationAndPrecedence() throws Exception { Servlet sA = new HttpServlet() { private static final long serialVersionUID = 1L; @@ -1497,6 +1517,7 @@ public class DispatchingTest extends BaseTest { Assert.assertEquals("p=3&p=4&p=1&p=2|p=3&p=4|3|[3, 4, 1, 2]", result); } + @Test public void test_includeStreamed() throws Exception { Servlet servlet1 = new BaseServlet() { private static final long serialVersionUID = 1L; @@ -1561,6 +1582,7 @@ public class DispatchingTest extends BaseTest { Assert.assertEquals("/a|/d|u=5&p=1|/a/s1/d|/s1|/a|/b|u=5|/a/s2/b|/s2", response); } + @Test public void test_includeStreamed_WithRequestFilter() throws Exception { Servlet servlet1 = new BaseServlet() { private static final long serialVersionUID = 1L; @@ -1649,6 +1671,7 @@ public class DispatchingTest extends BaseTest { Assert.assertTrue(filter.getCalled()); } + @Test public void test_includeStreamed_WithRequestAndIncludeFilter() throws Exception { Servlet servlet1 = new BaseServlet() { private static final long serialVersionUID = 1L; @@ -1737,6 +1760,7 @@ public class DispatchingTest extends BaseTest { Assert.assertEquals(2, filter.getCount()); } + @Test public void test_Bug479115() throws Exception { Servlet servlet = new HttpServlet() { private static final long serialVersionUID = 1L; diff --git a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java index 24b792b07..7a9a13338 100644 --- a/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java +++ b/bundles/org.eclipse.equinox.http.servlet.tests/src/org/eclipse/equinox/http/servlet/tests/ServletTest.java @@ -12,6 +12,8 @@ *******************************************************************************/ package org.eclipse.equinox.http.servlet.tests; +import static org.junit.Assert.*; + import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; @@ -85,7 +87,9 @@ import org.eclipse.equinox.http.servlet.tests.util.BaseServletRequestAttributeLi import org.eclipse.equinox.http.servlet.tests.util.BaseServletRequestListener; import org.eclipse.equinox.http.servlet.tests.util.BufferedServlet; import org.junit.Assert; - +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TestName; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; @@ -104,7 +108,11 @@ import org.osgi.service.http.runtime.dto.ServletDTO; import org.osgi.service.http.whiteboard.HttpWhiteboardConstants; public class ServletTest extends BaseTest { - + @Rule + public TestName testName = new TestName(); + + + @Test public void test_ErrorPage1() throws Exception { String expected = "403 ERROR :"; String actual = null; @@ -125,6 +133,7 @@ public class ServletTest extends BaseTest { "Expected <" + expected + "*> but got <" + actual + ">", actual.startsWith(expected)); } + @Test public void test_ErrorPage2() throws Exception { String expected = "org.eclipse.equinox.http.servlet.tests.tb1.TestErrorPage2$MyException ERROR :"; String actual = null; @@ -145,6 +154,7 @@ public class ServletTest extends BaseTest { "Expected <" + expected + "*> but got <" + actual + ">", actual.startsWith(expected)); } + @Test public void test_ErrorPage3() throws Exception { String expected = "400 ERROR :"; String actual = null; @@ -169,6 +179,7 @@ public class ServletTest extends BaseTest { * This case should NOT hit the error servlet because the response is already * committed. However, setting the response code is perfectly allowed. */ + @Test public void test_ErrorPage4() throws Exception { String actual = null; Map<String, List<String>> response = Collections.emptyMap(); @@ -187,6 +198,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals("", actual); } + @Test public void test_ErrorPage5() throws Exception { Dictionary<String, Object> errorProps = new Hashtable<String, Object>(); errorProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_NAME, "E5.4xx"); @@ -212,6 +224,7 @@ public class ServletTest extends BaseTest { * This test should also not hit the error servlet as we've only set the * status. As per the Servlet spec this should not trigger error handling. */ + @Test public void test_ErrorPage6() throws Exception { Servlet servlet = new HttpServlet() { private static final long serialVersionUID = 1L; @@ -249,6 +262,7 @@ public class ServletTest extends BaseTest { * This test should also not hit the error servlet as we've only set the * status. As per the Servlet spec this should not trigger error handling. */ + @Test public void test_ErrorPage7() throws Exception { final int status = 422; @@ -292,6 +306,7 @@ public class ServletTest extends BaseTest { Assert.assertNotEquals(status + " : " + status + " : ERROR : /TestErrorPage7/a", responseBody); } + @Test public void test_ErrorPage8() throws Exception { Servlet servlet = new HttpServlet() { private static final long serialVersionUID = 1L; @@ -323,6 +338,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals("500 : 500 : ERROR : /TestErrorPage8/a", responseBody); } + @Test public void test_ErrorPage9() throws Exception { Servlet servlet = new HttpServlet() { private static final long serialVersionUID = 1L; @@ -354,6 +370,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals("500 : 500 : ERROR : /TestErrorPage9/a", responseBody); } + @Test public void test_ErrorPage10() throws Exception { Servlet servlet = new HttpServlet() { private static final long serialVersionUID = 1L; @@ -387,6 +404,7 @@ public class ServletTest extends BaseTest { Assert.fail("Expecting java.io.IOException: Premature EOF"); } + @Test public void test_ErrorPage11() throws Exception { Servlet servlet = new HttpServlet() { private static final long serialVersionUID = 1L; @@ -414,6 +432,7 @@ public class ServletTest extends BaseTest { } } + @Test public void test_Filter1() throws Exception { String expected = "bab"; String actual; @@ -427,6 +446,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Filter2() throws Exception { String expected = "cbabc"; String actual; @@ -440,6 +460,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Filter3() throws Exception { String expected = "cbdadbc"; String actual; @@ -453,6 +474,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Filter4() throws Exception { String expected = "dcbabcd"; String actual; @@ -466,6 +488,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Filter5() throws Exception { String expected = "bab"; String actual; @@ -479,6 +502,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Filter6() throws Exception { String expected = "cbabc"; String actual; @@ -492,6 +516,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Filter7() throws Exception { String expected = "cbdadbc"; String actual; @@ -505,6 +530,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Filter8() throws Exception { String expected = "dcbabcd"; String actual; @@ -518,6 +544,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Filter9() throws Exception { String expected = "bab"; String actual; @@ -531,6 +558,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Filter10() throws Exception { String expected = "cbabc"; String actual; @@ -544,6 +572,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Filter11() throws Exception { String expected = "cbdadbc"; String actual; @@ -557,6 +586,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Filter12() throws Exception { String expected = "dcbabcd"; String actual; @@ -570,6 +600,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Filter13() throws Exception { String expected = "bab"; String actual; @@ -583,6 +614,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Filter14() throws Exception { String expected = "cbabc"; String actual; @@ -596,6 +628,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Filter15() throws Exception { String expected = "cbdadbc"; String actual; @@ -609,6 +642,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Filter16() throws Exception { String expected = "dcbabcd"; String actual; @@ -622,6 +656,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Filter17() throws Exception { String expected = "ebcdadcbe"; String actual; @@ -635,6 +670,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Filter18() throws Exception { String expected = "dbcacbd"; String actual; @@ -648,6 +684,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Filter19() throws Exception { String expected = "dfbcacbfd"; String actual; @@ -661,6 +698,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Filter20() throws Exception { // Make sure legacy filter registrations match against all controllers that are for legacy HttpContext // Make sure legacy filter registrations match as if they are prefix matching with wildcards @@ -686,6 +724,7 @@ public class ServletTest extends BaseTest { Assert.assertTrue("testFilter2 did not get called.", testFilter2.getCalled()); } + @Test public void test_Filter21() throws Exception { // Make sure exact path matching is honored by filters registrations String expected = "a"; @@ -792,42 +831,52 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, response); } + @Test public void test_Filter22a() throws Exception { basicFilterTest22 ( "/f22/*", "*.jsp", "/f22/*", "a", new String[] {"REQUEST"} ); } + @Test public void test_Filter22b() throws Exception { basicFilterTest22 ( "/*", "*.jsp", "/*", "a", new String[] {"REQUEST"} ); } + @Test public void test_Filter22c() throws Exception { basicFilterTest22 ( "/f22/*", "*.jsp", "*.jsp", "a", new String[] {"REQUEST"} ); } + @Test public void test_Filter22d() throws Exception { basicFilterTest22 ( "/f22/*", "*.jsp", "/f22/*", "bab", new String[] {"FORWARD"} ); } + @Test public void test_Filter22e() throws Exception { basicFilterTest22 ( "/*", "*.jsp", "/*", "bab", new String[] {"FORWARD"} ); } + @Test public void test_Filter22f() throws Exception { basicFilterTest22 ( "/f22/*", "*.jsp", "*.jsp", "bab", new String[] {"FORWARD"} ); } + @Test public void test_Filter22g() throws Exception { basicFilterTest22 ( "/f22/*", "*.jsp", "/f22/*", "bab", new String[] {"REQUEST", "FORWARD"} ); } + @Test public void test_Filter22h() throws Exception { basicFilterTest22 ( "/*", "*.jsp", "/*", "bab", new String[] {"REQUEST", "FORWARD"} ); } + @Test public void test_Filter22i() throws Exception { basicFilterTest22 ( "/f22/*", "*.jsp", "*.jsp", "bab", new String[] {"REQUEST", "FORWARD"} ); } + @Test public void test_Filter23a() throws Exception { // Make sure legacy filter registrations match as if they are prefix matching with extension matching String expected = "a"; @@ -857,6 +906,7 @@ public class ServletTest extends BaseTest { Assert.assertTrue("testFilter3 did not get called.", testFilter3.getCalled()); } + @Test public void test_Filter23b() throws Exception { // Make sure legacy filter registrations match as if they are prefix matching wildcard, but make sure the prefix is checked String expected = "a"; @@ -879,6 +929,7 @@ public class ServletTest extends BaseTest { Assert.assertTrue("testFilter2 did not get called.", testFilter2.getCalled()); } + @Test public void test_Filter23c() throws Exception { // Test WB servlet with default servlet pattern "/" and filter matching against it. String expected = "a"; @@ -901,6 +952,7 @@ public class ServletTest extends BaseTest { Assert.assertTrue("testFilter2 did not get called.", testFilter2.getCalled()); } + @Test public void test_Filter24() throws Exception { // Test WB servlet and WB testfilter matching against it. // Test filter gets called. @@ -932,7 +984,7 @@ public class ServletTest extends BaseTest { } } - + @Test public void test_Registration1() throws Exception { String expected = "Alias cannot be null"; try { @@ -950,6 +1002,7 @@ public class ServletTest extends BaseTest { Assert.fail(); } + @Test public void test_Registration2() throws Exception { String pattern = "blah"; String expected = "Invalid pattern '" + pattern + "'"; @@ -968,6 +1021,7 @@ public class ServletTest extends BaseTest { Assert.fail(); } + @Test public void test_Registration3() throws Exception { String pattern = "/blah/"; String expected = "Invalid pattern '" + pattern + "'"; @@ -986,6 +1040,7 @@ public class ServletTest extends BaseTest { Assert.fail(); } + @Test public void test_Registration4() throws Exception { String pattern = "/blah"; String expected = "Pattern already in use: " + pattern; @@ -1006,6 +1061,7 @@ public class ServletTest extends BaseTest { Assert.fail(); } + @Test public void test_Registration5() throws Exception { String alias = "/blah"; String expected = "Servlet cannot be null"; @@ -1024,6 +1080,7 @@ public class ServletTest extends BaseTest { Assert.fail(); } + @Test public void test_Registration6() throws Exception { String expected = "Servlet has already been registered:"; try { @@ -1043,6 +1100,7 @@ public class ServletTest extends BaseTest { Assert.fail(); } + @Test public void test_unregister() throws Exception { ExtendedHttpService extendedHttpService = (ExtendedHttpService)getHttpService(); @@ -1058,6 +1116,7 @@ public class ServletTest extends BaseTest { extendedHttpService.unregister("/r1"); } + @Test public void test_Registration11() throws Exception { ExtendedHttpService extendedHttpService = (ExtendedHttpService)getHttpService(); @@ -1087,6 +1146,7 @@ public class ServletTest extends BaseTest { } } + @Test public void test_Registration12() throws Exception { Bundle bundle = installBundle(TEST_BUNDLE_1); try { @@ -1110,6 +1170,7 @@ public class ServletTest extends BaseTest { } } + @Test public void test_Registration13() throws Exception { ExtendedHttpService extendedHttpService = (ExtendedHttpService)getHttpService(); @@ -1136,6 +1197,7 @@ public class ServletTest extends BaseTest { } } + @Test public void test_Registration14() throws Exception { Servlet initError = new HttpServlet() { private static final long serialVersionUID = 1L; @@ -1156,6 +1218,7 @@ public class ServletTest extends BaseTest { } } + @Test public void test_Registration15() throws Exception { Servlet initError = new HttpServlet() { private static final long serialVersionUID = 1L; @@ -1176,6 +1239,7 @@ public class ServletTest extends BaseTest { } } + @Test public void test_Registration16() throws Exception { Filter initError = new Filter() { @@ -1205,6 +1269,7 @@ public class ServletTest extends BaseTest { } } + @Test public void test_Registration17() throws Exception { Filter initError = new Filter() { @@ -1234,6 +1299,7 @@ public class ServletTest extends BaseTest { } } + @Test public void test_Registration18_WhiteboardServletByNameOnly() throws Exception { String expected = "a"; final String servletName = "hello_servlet"; @@ -1262,6 +1328,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_RegistrationTCCL1() { final Set<String> filterTCCL = Collections.synchronizedSet(new HashSet<String>()); final Set<String> servletTCCL = Collections.synchronizedSet(new HashSet<String>()); @@ -1339,6 +1406,7 @@ public class ServletTest extends BaseTest { } + @Test public void test_Sessions01() { final AtomicBoolean valueBound = new AtomicBoolean(false); final AtomicBoolean valueUnbound = new AtomicBoolean(false); @@ -1444,6 +1512,7 @@ public class ServletTest extends BaseTest { } } + @Test public void test_Resource1() throws Exception { String expected = "a"; String actual; @@ -1457,6 +1526,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Resource2() throws Exception { String expected = "cbdadbc"; String actual; @@ -1470,6 +1540,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Resource3() throws Exception { String expected = "a"; String actual; @@ -1483,6 +1554,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Resource4() throws Exception { String expected = "dcbabcd"; String actual; @@ -1496,6 +1568,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Resource5() throws Exception { String expected = "dcbabcd"; String actual; @@ -1509,6 +1582,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Runtime() throws Exception { Bundle bundle = installBundle(TEST_BUNDLE_1); try { @@ -1531,6 +1605,7 @@ public class ServletTest extends BaseTest { } } + @Test public void test_Servlet1() throws Exception { String expected = STATUS_OK; String actual; @@ -1544,6 +1619,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Servlet2() throws Exception { String expected = "3"; String actual; @@ -1558,6 +1634,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Servlet3() throws Exception { String expected = STATUS_OK; String actual; @@ -1571,6 +1648,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Servlet4() throws Exception { String expected = System.getProperty(JETTY_PROPERTY_PREFIX + "context.path", ""); String actual; @@ -1584,6 +1662,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Servlet5() throws Exception { String expected = "Equinox Jetty-based Http Service"; String actual; @@ -1597,6 +1676,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Servlet6() throws Exception { String expected = "a"; String actual; @@ -1610,6 +1690,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Servlet7() throws Exception { String expected = "a"; String actual; @@ -1623,6 +1704,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Servlet9() throws Exception { String expected = "Equinox Jetty-based Http Service"; String actual; @@ -1636,6 +1718,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Servlet10() throws Exception { String expected = "a"; String actual; @@ -1649,6 +1732,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Servlet11() throws Exception { String expected = "a"; String actual; @@ -1662,6 +1746,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_Servlet12() throws Exception { Servlet sA = new HttpServlet() { private static final long serialVersionUID = 1L; @@ -1697,6 +1782,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals("b", requestAdvisor.request("files/help.txt")); } + @Test public void test_Servlet13() throws Exception { Servlet servlet = new HttpServlet() { private static final long serialVersionUID = 1L; @@ -1725,6 +1811,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals("p=1&p=2|1|[1, 2]", result); } + @Test public void test_ServletExactMatchPrecidence() throws Exception { Servlet sA = new HttpServlet() { private static final long serialVersionUID = 1L; @@ -1773,6 +1860,7 @@ public class ServletTest extends BaseTest { /* * 3.1 file uploads */ + @Test public void test_Servlet16() throws Exception { Servlet servlet = new HttpServlet() { private static final long serialVersionUID = 1L; @@ -1816,6 +1904,7 @@ public class ServletTest extends BaseTest { /* * 3.0 file uploads */ + @Test public void test_Servlet17() throws Exception { Servlet servlet = new HttpServlet() { private static final long serialVersionUID = 1L; @@ -1856,6 +1945,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals("blue.png|image/png|292", result.get("responseBody").get(0)); } + @Test public void test_commonsFileUpload() throws Exception { Servlet servlet = new HttpServlet() { private static final long serialVersionUID = 1L; @@ -1916,6 +2006,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals("blue.png|image/png|292", result.get("responseBody").get(0)); } + @Test public void test_ServletContext1() throws Exception { String expected = "/org/eclipse/equinox/http/servlet/tests/tb1/resource1.txt"; String actual; @@ -1930,6 +2021,7 @@ public class ServletTest extends BaseTest { } + @Test public void test_ServletContext1_2() throws Exception { String expected = "/org/eclipse/equinox/http/servlet/tests/tb1/resource1.txt"; String actual; @@ -1950,6 +2042,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_ServletContext2() throws Exception { Servlet servlet = new HttpServlet() { private static final long serialVersionUID = 1L; @@ -1976,6 +2069,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals("200", responseCode); } + @Test public void testServletContextUnsupportedOperations() { final AtomicReference<ServletContext> contextHolder = new AtomicReference<ServletContext>(); Servlet unsupportedServlet = new HttpServlet() { @@ -2034,6 +2128,7 @@ public class ServletTest extends BaseTest { return methods; } + @Test public void test_ServletContextHelper1() throws Exception { BundleContext bundleContext = getBundleContext(); Bundle bundle = bundleContext.getBundle(); @@ -2080,6 +2175,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(0, runtimeDTO.failedServletContextDTOs.length); } + @Test public void test_ServletContextHelper7() throws Exception { String expected = "a"; @@ -2113,6 +2209,7 @@ public class ServletTest extends BaseTest { } } + @Test public void test_ServletContextHelper8() throws Exception { String expected = "b"; @@ -2145,6 +2242,7 @@ public class ServletTest extends BaseTest { } } + @Test public void test_ServletContextHelper9() throws Exception { String expected1 = "c"; String expected2 = "d"; @@ -2189,6 +2287,7 @@ public class ServletTest extends BaseTest { } } + @Test public void test_ServletContextHelperVisibility() throws Exception { String expected1 = "c"; @@ -2236,6 +2335,7 @@ public class ServletTest extends BaseTest { } } + @Test public void test_ServletContextHelper10() throws Exception { String expected = "cac"; String actual; @@ -2251,6 +2351,7 @@ public class ServletTest extends BaseTest { private static final String HTTP_CONTEXT_TEST_ROOT = "http.context.test"; + @Test public void test_ServletContextHelper11() throws Exception { BaseHttpContext ctx1 = new BaseHttpContext(true, HTTP_CONTEXT_TEST_ROOT + "/1", getBundleContext().getBundle()); BaseHttpContext ctx2 = new BaseHttpContext(true, HTTP_CONTEXT_TEST_ROOT + "/2", getBundleContext().getBundle()); @@ -2273,6 +2374,7 @@ public class ServletTest extends BaseTest { } } + @Test public void test_ServletContextHelper12() throws Exception { String expected1 = "a,b,1"; @@ -2323,6 +2425,7 @@ public class ServletTest extends BaseTest { } } + @Test public void test_ServletContextHelper13() throws Exception { BundleContext bundleContext = getBundleContext(); Bundle bundle = bundleContext.getBundle(); @@ -2332,7 +2435,7 @@ public class ServletTest extends BaseTest { @Override public boolean handleSecurity(HttpServletRequest request, HttpServletResponse response) throws IOException { - request.setAttribute(getName(), Boolean.TRUE); + request.setAttribute(testName.getMethodName(), Boolean.TRUE); return super.handleSecurity(request, response); } @@ -2346,8 +2449,8 @@ public class ServletTest extends BaseTest { @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { - if (request.getAttribute(getName()) == Boolean.TRUE) { - request.setAttribute(getName() + ".fromFilter", Boolean.TRUE); + if (request.getAttribute(testName.getMethodName()) == Boolean.TRUE) { + request.setAttribute(testName.getMethodName() + ".fromFilter", Boolean.TRUE); } chain.doFilter(request, response); } @@ -2361,7 +2464,7 @@ public class ServletTest extends BaseTest { private static final long serialVersionUID = 1L; @Override public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException { - res.getWriter().print(req.getAttribute(getName() + ".fromFilter")); + res.getWriter().print(req.getAttribute(testName.getMethodName() + ".fromFilter")); } }; @@ -2395,6 +2498,7 @@ public class ServletTest extends BaseTest { } } + @Test public void test_Listener1() throws Exception { BaseServletContextListener scl1 = new BaseServletContextListener(); @@ -2409,6 +2513,7 @@ public class ServletTest extends BaseTest { Assert.assertTrue(scl1.destroyed.get()); } + @Test public void test_Listener2() throws Exception { BundleContext bundleContext = getBundleContext(); Bundle bundle = bundleContext.getBundle(); @@ -2439,6 +2544,7 @@ public class ServletTest extends BaseTest { } } + @Test public void test_Listener3() throws Exception { BundleContext bundleContext = getBundleContext(); Bundle bundle = bundleContext.getBundle(); @@ -2467,6 +2573,7 @@ public class ServletTest extends BaseTest { } } + @Test public void test_Listener4() throws Exception { BaseServletContextAttributeListener scal1 = @@ -2510,6 +2617,7 @@ public class ServletTest extends BaseTest { } } + @Test public void test_Listener5() throws Exception { BaseServletRequestListener srl1 = new BaseServletRequestListener(); @@ -2539,6 +2647,7 @@ public class ServletTest extends BaseTest { } } + @Test public void test_Listener6() throws Exception { BaseServletRequestAttributeListener sral1 = new BaseServletRequestAttributeListener(); @@ -2569,6 +2678,7 @@ public class ServletTest extends BaseTest { } } + @Test public void test_Listener7() throws Exception { BaseHttpSessionAttributeListener hsal1 = @@ -2630,6 +2740,7 @@ public class ServletTest extends BaseTest { } } + @Test public void test_Listener8() throws Exception { BaseHttpSessionIdListener hsil1 = new BaseHttpSessionIdListener(); @@ -2657,6 +2768,7 @@ public class ServletTest extends BaseTest { } } + @Test public void test_Listener9() throws Exception { Servlet sA = new HttpServlet() { private static final long serialVersionUID = 1L; @@ -2714,6 +2826,7 @@ public class ServletTest extends BaseTest { } } + @Test public void test_Listener10() throws Exception { BaseServletContextListener scl1 = new BaseServletContextListener(); BaseServletContextListener scl2 = new BaseServletContextListener(); @@ -2763,6 +2876,7 @@ public class ServletTest extends BaseTest { Assert.assertNotEquals(servletContext2.hashCode(), servletContext3.hashCode()); } + @Test public void test_Async1() throws Exception { Servlet s1 = new BaseAsyncServlet("test_Listener8"); @@ -2785,6 +2899,7 @@ public class ServletTest extends BaseTest { } } + @Test public void test_WBServlet1() throws Exception { String expected = "a"; String actual; @@ -2798,6 +2913,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_WBServlet2() throws Exception { String expected = "bab"; String actual; @@ -2811,6 +2927,7 @@ public class ServletTest extends BaseTest { Assert.assertEquals(expected, actual); } + @Test public void test_BufferedOutput() throws Exception { Collection<ServiceRegistration<?>> registrations = new ArrayList<ServiceRegistration<?>>(); try { @@ -2832,114 +2949,118 @@ public class ServletTest extends BaseTest { } } + @Test public void testWBServletChangeInitParams() throws Exception{ String actual; Map<String, String> params = new HashMap<String, String>(); - params.put(TEST_PROTOTYPE_NAME, getName()); - params.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, '/' + getName()); - params.put(STATUS_PARAM, getName()); + params.put(TEST_PROTOTYPE_NAME, testName.getMethodName()); + params.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, '/' + testName.getMethodName()); + params.put(STATUS_PARAM, testName.getMethodName()); actual = doRequest(CONFIGURE, params); - Assert.assertEquals(getName(), actual); - actual = requestAdvisor.request(getName()); - Assert.assertEquals(getName(), actual); + Assert.assertEquals(testName.getMethodName(), actual); + actual = requestAdvisor.request(testName.getMethodName()); + Assert.assertEquals(testName.getMethodName(), actual); // change the init param params.put(STATUS_PARAM, "changed"); doRequest(CONFIGURE, params); - actual = requestAdvisor.request(getName()); + actual = requestAdvisor.request(testName.getMethodName()); Assert.assertEquals("changed", actual); } + @Test public void testWBServletChangePattern() throws Exception{ String actual; Map<String, String> params = new HashMap<String, String>(); - params.put(TEST_PROTOTYPE_NAME, getName()); - params.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, '/' + getName()); - params.put(STATUS_PARAM, getName()); + params.put(TEST_PROTOTYPE_NAME, testName.getMethodName()); + params.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, '/' + testName.getMethodName()); + params.put(STATUS_PARAM, testName.getMethodName()); actual = doRequest(CONFIGURE, params); - Assert.assertEquals(getName(), actual); - actual = requestAdvisor.request(getName()); - Assert.assertEquals(getName(), actual); + Assert.assertEquals(testName.getMethodName(), actual); + actual = requestAdvisor.request(testName.getMethodName()); + Assert.assertEquals(testName.getMethodName(), actual); // change the pattern params.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, "/changed"); doRequest(CONFIGURE, params); actual = requestAdvisor.request("changed"); - Assert.assertEquals(getName(), actual); + Assert.assertEquals(testName.getMethodName(), actual); } + @Test public void testWBServletChangeRanking() throws Exception{ String actual; // Configure two servlets with the second one registered ranking higher Map<String, String> params1 = new HashMap<String, String>(); - params1.put(TEST_PROTOTYPE_NAME, getName() + 1); + params1.put(TEST_PROTOTYPE_NAME, testName.getMethodName() + 1); params1.put(Constants.SERVICE_RANKING, "1"); - params1.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, '/' + getName()); - params1.put(STATUS_PARAM, getName() + 1); + params1.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, '/' + testName.getMethodName()); + params1.put(STATUS_PARAM, testName.getMethodName() + 1); actual = doRequest(CONFIGURE, params1); - Assert.assertEquals(getName() + 1, actual); + Assert.assertEquals(testName.getMethodName() + 1, actual); Map<String, String> params2 = new HashMap<String, String>(); - params2.put(TEST_PROTOTYPE_NAME, getName() + 2); + params2.put(TEST_PROTOTYPE_NAME, testName.getMethodName() + 2); params2.put(Constants.SERVICE_RANKING, "2"); - params2.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, '/' + getName()); - params2.put(STATUS_PARAM, getName() + 2); + params2.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, '/' + testName.getMethodName()); + params2.put(STATUS_PARAM, testName.getMethodName() + 2); actual = doRequest(CONFIGURE, params2); - Assert.assertEquals(getName() + 2, actual); + Assert.assertEquals(testName.getMethodName() + 2, actual); // Confirm the second registered (higher ranked) gets used - actual = requestAdvisor.request(getName()); - Assert.assertEquals(getName() + 2, actual); + actual = requestAdvisor.request(testName.getMethodName()); + Assert.assertEquals(testName.getMethodName() + 2, actual); // change the ranking to use the first servlet registered params2.put(Constants.SERVICE_RANKING, "0"); doRequest(CONFIGURE, params2); - actual = requestAdvisor.request(getName()); - Assert.assertEquals(getName() + 1, actual); + actual = requestAdvisor.request(testName.getMethodName()); + Assert.assertEquals(testName.getMethodName() + 1, actual); // Unregister the first servlet should cause the second servlet to be used - actual = doRequest(UNREGISTER, Collections.singletonMap(TEST_PROTOTYPE_NAME, getName() + 1)); - Assert.assertEquals(getName() + 1, actual); + actual = doRequest(UNREGISTER, Collections.singletonMap(TEST_PROTOTYPE_NAME, testName.getMethodName() + 1)); + Assert.assertEquals(testName.getMethodName() + 1, actual); // Confirm the second registered is used - actual = requestAdvisor.request(getName()); - Assert.assertEquals(getName() + 2, actual); + actual = requestAdvisor.request(testName.getMethodName()); + Assert.assertEquals(testName.getMethodName() + 2, actual); } + @Test public void testWBServletDefaultContextAdaptor1() throws Exception{ Dictionary<String, String> helperProps = new Hashtable<String, String>(); - helperProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME, "testContext" + getName()); + helperProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME, "testContext" + testName.getMethodName()); helperProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_PATH, "/testContext"); - helperProps.put(TEST_PATH_CUSTOMIZER_NAME, getName()); + helperProps.put(TEST_PATH_CUSTOMIZER_NAME, testName.getMethodName()); ServiceRegistration<ServletContextHelper> helperReg = getBundleContext().registerService(ServletContextHelper.class, new TestServletContextHelperFactory(), helperProps); ServiceRegistration<ContextPathCustomizer> pathAdaptorReg = null; try { Map<String, String> params = new HashMap<String, String>(); - params.put(TEST_PROTOTYPE_NAME, getName()); - params.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, '/' + getName()); - params.put(STATUS_PARAM, getName()); - params.put("servlet.init." + TEST_PATH_CUSTOMIZER_NAME, getName()); + params.put(TEST_PROTOTYPE_NAME, testName.getMethodName()); + params.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, '/' + testName.getMethodName()); + params.put(STATUS_PARAM, testName.getMethodName()); + params.put("servlet.init." + TEST_PATH_CUSTOMIZER_NAME, testName.getMethodName()); String actual = doRequest(CONFIGURE, params); - Assert.assertEquals(getName(), actual); + Assert.assertEquals(testName.getMethodName(), actual); - actual = requestAdvisor.request(getName()); - Assert.assertEquals(getName(), actual); + actual = requestAdvisor.request(testName.getMethodName()); + Assert.assertEquals(testName.getMethodName(), actual); - ContextPathCustomizer pathAdaptor = new TestContextPathAdaptor("(" + HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME + "=" + "testContext" + getName() + ")", null, getName()); + ContextPathCustomizer pathAdaptor = new TestContextPathAdaptor("(" + HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME + "=" + "testContext" + testName.getMethodName() + ")", null, testName.getMethodName()); pathAdaptorReg = getBundleContext().registerService(ContextPathCustomizer.class, pathAdaptor, null); - actual = requestAdvisor.request("testContext/" + getName()); - Assert.assertEquals(getName(), actual); + actual = requestAdvisor.request("testContext/" + testName.getMethodName()); + Assert.assertEquals(testName.getMethodName(), actual); pathAdaptorReg.unregister(); pathAdaptorReg = null; - actual = requestAdvisor.request(getName()); - Assert.assertEquals(getName(), actual); + actual = requestAdvisor.request(testName.getMethodName()); + Assert.assertEquals(testName.getMethodName(), actual); } finally { helperReg.unregister(); if (pathAdaptorReg != null) { @@ -2948,38 +3069,39 @@ public class ServletTest extends BaseTest { } } + @Test public void testWBServletDefaultContextAdaptor2() throws Exception{ Dictionary<String, String> helperProps = new Hashtable<String, String>(); - helperProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME, "testContext" + getName()); + helperProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME, "testContext" + testName.getMethodName()); helperProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_PATH, "/testContext"); - helperProps.put(TEST_PATH_CUSTOMIZER_NAME, getName()); + helperProps.put(TEST_PATH_CUSTOMIZER_NAME, testName.getMethodName()); ServiceRegistration<ServletContextHelper> helperReg = getBundleContext().registerService(ServletContextHelper.class, new TestServletContextHelperFactory(), helperProps); ServiceRegistration<ContextPathCustomizer> pathAdaptorReg = null; try { Map<String, String> params = new HashMap<String, String>(); - params.put(TEST_PROTOTYPE_NAME, getName()); - params.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, '/' + getName()); - params.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT, "(" + HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME + "=" + "testContext" + getName() + ")"); - params.put(STATUS_PARAM, getName()); - params.put("servlet.init." + TEST_PATH_CUSTOMIZER_NAME, getName()); + params.put(TEST_PROTOTYPE_NAME, testName.getMethodName()); + params.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, '/' + testName.getMethodName()); + params.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT, "(" + HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME + "=" + "testContext" + testName.getMethodName() + ")"); + params.put(STATUS_PARAM, testName.getMethodName()); + params.put("servlet.init." + TEST_PATH_CUSTOMIZER_NAME, testName.getMethodName()); String actual = doRequest(CONFIGURE, params); - Assert.assertEquals(getName(), actual); + Assert.assertEquals(testName.getMethodName(), actual); - actual = requestAdvisor.request("testContext/" + getName()); - Assert.assertEquals(getName(), actual); + actual = requestAdvisor.request("testContext/" + testName.getMethodName()); + Assert.assertEquals(testName.getMethodName(), actual); - ContextPathCustomizer pathAdaptor = new TestContextPathAdaptor(null, "testPrefix", getName()); + ContextPathCustomizer pathAdaptor = new TestContextPathAdaptor(null, "testPrefix", testName.getMethodName()); pathAdaptorReg = getBundleContext().registerService(ContextPathCustomizer.class, pathAdaptor, null); - actual = requestAdvisor.request("testPrefix/testContext/" + getName()); - Assert.assertEquals(getName(), actual); + actual = requestAdvisor.request("testPrefix/testContext/" + testName.getMethodName()); + Assert.assertEquals(testName.getMethodName(), actual); pathAdaptorReg.unregister(); pathAdaptorReg = null; - actual = requestAdvisor.request("testContext/" + getName()); - Assert.assertEquals(getName(), actual); + actual = requestAdvisor.request("testContext/" + testName.getMethodName()); + Assert.assertEquals(testName.getMethodName(), actual); } finally { helperReg.unregister(); if (pathAdaptorReg != null) { @@ -2988,39 +3110,40 @@ public class ServletTest extends BaseTest { } } + @Test public void testWBServletDefaultContextAdaptor3() throws Exception{ // test the ContextPathCustomizer with a ServletContextHelper that has a '/' context path Dictionary<String, String> helperProps = new Hashtable<String, String>(); - helperProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME, "testContext" + getName()); + helperProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME, "testContext" + testName.getMethodName()); helperProps.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_PATH, "/"); - helperProps.put(TEST_PATH_CUSTOMIZER_NAME, getName()); + helperProps.put(TEST_PATH_CUSTOMIZER_NAME, testName.getMethodName()); ServiceRegistration<ServletContextHelper> helperReg = getBundleContext().registerService(ServletContextHelper.class, new TestServletContextHelperFactory(), helperProps); ServiceRegistration<ContextPathCustomizer> pathAdaptorReg = null; try { Map<String, String> params = new HashMap<String, String>(); - params.put(TEST_PROTOTYPE_NAME, getName()); - params.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, '/' + getName()); - params.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT, "(" + HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME + "=" + "testContext" + getName() + ")"); - params.put(STATUS_PARAM, getName()); - params.put("servlet.init." + TEST_PATH_CUSTOMIZER_NAME, getName()); + params.put(TEST_PROTOTYPE_NAME, testName.getMethodName()); + params.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN, '/' + testName.getMethodName()); + params.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT, "(" + HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_NAME + "=" + "testContext" + testName.getMethodName() + ")"); + params.put(STATUS_PARAM, testName.getMethodName()); + params.put("servlet.init." + TEST_PATH_CUSTOMIZER_NAME, testName.getMethodName()); String actual = doRequest(CONFIGURE, params); - Assert.assertEquals(getName(), actual); + Assert.assertEquals(testName.getMethodName(), actual); - actual = requestAdvisor.request(getName()); - Assert.assertEquals(getName(), actual); + actual = requestAdvisor.request(testName.getMethodName()); + Assert.assertEquals(testName.getMethodName(), actual); - ContextPathCustomizer pathAdaptor = new TestContextPathAdaptor(null, "testPrefix", getName()); + ContextPathCustomizer pathAdaptor = new TestContextPathAdaptor(null, "testPrefix", testName.getMethodName()); pathAdaptorReg = getBundleContext().registerService(ContextPathCustomizer.class, pathAdaptor, null); - actual = requestAdvisor.request("testPrefix/" + getName()); - Assert.assertEquals(getName(), actual); + actual = requestAdvisor.request("testPrefix/" + testName.getMethodName()); + Assert.assertEquals(testName.getMethodName(), actual); pathAdaptorReg.unregister(); pathAdaptorReg = null; - actual = requestAdvisor.request(getName()); - Assert.assertEquals(getName(), actual); + actual = requestAdvisor.request(testName.getMethodName()); + Assert.assertEquals(testName.getMethodName(), actual); } finally { helperReg.unregister(); if (pathAdaptorReg != null) { @@ -3029,6 +3152,7 @@ public class ServletTest extends BaseTest { } } + @Test public void testHttpContextSetUser() throws ServletException, NamespaceException, IOException { ExtendedHttpService extendedHttpService = (ExtendedHttpService)getHttpService(); @@ -3063,10 +3187,10 @@ public class ServletTest extends BaseTest { } }; - extendedHttpService.registerServlet("/" + getName(), testServlet, null, testContext); + extendedHttpService.registerServlet("/" + testName.getMethodName(), testServlet, null, testContext); String expected = "USER: TEST AUTH_TYPE: Basic"; - String actual = requestAdvisor.request(getName()); + String actual = requestAdvisor.request(testName.getMethodName()); Assert.assertEquals(expected, actual); } |