http://git-wip-us.apache.org/repos/asf/cayenne/blob/80416411/cayenne-web/src/test/java/org/apache/cayenne/web/WebConfigurationTest.java ---------------------------------------------------------------------- diff --git a/cayenne-web/src/test/java/org/apache/cayenne/web/WebConfigurationTest.java b/cayenne-web/src/test/java/org/apache/cayenne/web/WebConfigurationTest.java deleted file mode 100644 index f5410ed..0000000 --- a/cayenne-web/src/test/java/org/apache/cayenne/web/WebConfigurationTest.java +++ /dev/null @@ -1,214 +0,0 @@ -/***************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - ****************************************************************/ -package org.apache.cayenne.web; - -import com.mockrunner.mock.web.MockFilterConfig; -import com.mockrunner.mock.web.MockServletConfig; -import org.apache.cayenne.di.Module; -import org.junit.Test; - -import java.util.Collection; -import java.util.Iterator; -import java.util.Map; - -import static org.junit.Assert.*; - -public class WebConfigurationTest { - - @Test - public void testFilterCreateModules_Standard() throws Exception { - - MockFilterConfig config = new MockFilterConfig(); - WebConfiguration configuration = new WebConfiguration(config); - - Module m1 = binder -> { - }; - - Module m2 = binder -> { - }; - - Collection<Module> modules = configuration.createModules(m1, m2); - assertEquals(2, modules.size()); - - Iterator<Module> it = modules.iterator(); - assertSame(m1, it.next()); - assertSame(m2, it.next()); - } - - @Test - public void testFilterCreateModules_Extra() throws Exception { - - MockFilterConfig config = new MockFilterConfig(); - String exra = String.format( - "%s, \n%s", - MockModule1.class.getName(), - MockModule2.class.getName()); - config.setInitParameter(WebConfiguration.EXTRA_MODULES_PARAMETER, exra); - - WebConfiguration configuration = new WebConfiguration(config); - - Module m1 = binder -> { - }; - - Module m2 = binder -> { - }; - - Collection<Module> modules = configuration.createModules(m1, m2); - assertEquals(4, modules.size()); - - Iterator<Module> it = modules.iterator(); - assertSame(m1, it.next()); - assertSame(m2, it.next()); - assertTrue(it.next() instanceof MockModule1); - assertTrue(it.next() instanceof MockModule2); - } - - @Test - public void testServletCreateModules_Extra() throws Exception { - - MockServletConfig config = new MockServletConfig(); - String exra = String.format( - "%s, \n%s", - MockModule1.class.getName(), - MockModule2.class.getName()); - config.setInitParameter(WebConfiguration.EXTRA_MODULES_PARAMETER, exra); - - WebConfiguration configuration = new WebConfiguration(config); - - Module m1 = binder -> { - }; - - Module m2 = binder -> { - }; - - Collection<Module> modules = configuration.createModules(m1, m2); - assertEquals(4, modules.size()); - - Iterator<Module> it = modules.iterator(); - assertSame(m1, it.next()); - assertSame(m2, it.next()); - assertTrue(it.next() instanceof MockModule1); - assertTrue(it.next() instanceof MockModule2); - } - - @Test - public void testFilterConfigurationLocation_Name() { - MockFilterConfig config1 = new MockFilterConfig(); - config1.setFilterName("cayenne-x"); - - WebConfiguration configuration1 = new WebConfiguration(config1); - assertEquals("cayenne-x.xml", configuration1.getConfigurationLocation()); - - MockFilterConfig config2 = new MockFilterConfig(); - config2.setFilterName("cayenne-y.xml"); - - WebConfiguration configuration2 = new WebConfiguration(config2); - assertEquals("cayenne-y.xml", configuration2.getConfigurationLocation()); - - MockFilterConfig config3 = new MockFilterConfig(); - config3.setFilterName("a/b/c/cayenne-z.xml"); - - WebConfiguration configuration3 = new WebConfiguration(config3); - assertEquals("a/b/c/cayenne-z.xml", configuration3.getConfigurationLocation()); - } - - @Test - public void testServletConfigurationLocation_Name() { - MockServletConfig config1 = new MockServletConfig(); - config1.setServletName("cayenne-x"); - - WebConfiguration configuration1 = new WebConfiguration(config1); - assertEquals("cayenne-x.xml", configuration1.getConfigurationLocation()); - - MockServletConfig config2 = new MockServletConfig(); - config2.setServletName("cayenne-y.xml"); - - WebConfiguration configuration2 = new WebConfiguration(config2); - assertEquals("cayenne-y.xml", configuration2.getConfigurationLocation()); - - MockServletConfig config3 = new MockServletConfig(); - config3.setServletName("a/b/c/cayenne-z.xml"); - - WebConfiguration configuration3 = new WebConfiguration(config3); - assertEquals("a/b/c/cayenne-z.xml", configuration3.getConfigurationLocation()); - } - - @Test - public void testFilterConfigurationLocation_Parameter() { - MockFilterConfig config1 = new MockFilterConfig(); - config1.setFilterName("cayenne-x"); - config1.setInitParameter( - WebConfiguration.CONFIGURATION_LOCATION_PARAMETER, - "cayenne-y.xml"); - - WebConfiguration configuration1 = new WebConfiguration(config1); - assertEquals("cayenne-y.xml", configuration1.getConfigurationLocation()); - } - - @Test - public void testServletConfigurationLocation_Parameter() { - MockServletConfig config1 = new MockServletConfig(); - config1.setServletName("cayenne-x"); - config1.setInitParameter( - WebConfiguration.CONFIGURATION_LOCATION_PARAMETER, - "cayenne-y.xml"); - - WebConfiguration configuration1 = new WebConfiguration(config1); - assertEquals("cayenne-y.xml", configuration1.getConfigurationLocation()); - } - - @Test - public void testFilterParameters() { - MockFilterConfig config1 = new MockFilterConfig(); - config1.setFilterName("cayenne-x"); - config1.setInitParameter( - WebConfiguration.CONFIGURATION_LOCATION_PARAMETER, - "cayenne-y.xml"); - config1.setInitParameter("test", "xxx"); - - WebConfiguration configuration1 = new WebConfiguration(config1); - Map<String, String> parameters = configuration1.getParameters(); - assertNotSame(parameters, configuration1.getParameters()); - assertEquals(parameters, configuration1.getParameters()); - - assertEquals(2, parameters.size()); - assertEquals("cayenne-y.xml", parameters - .get(WebConfiguration.CONFIGURATION_LOCATION_PARAMETER)); - assertEquals("xxx", parameters.get("test")); - } - - @Test - public void testFilterOtherParameters() { - MockFilterConfig config1 = new MockFilterConfig(); - config1.setFilterName("cayenne-x"); - config1.setInitParameter( - WebConfiguration.CONFIGURATION_LOCATION_PARAMETER, - "cayenne-y.xml"); - config1.setInitParameter(WebConfiguration.EXTRA_MODULES_PARAMETER, "M1,M2"); - config1.setInitParameter("test", "xxx"); - - WebConfiguration configuration1 = new WebConfiguration(config1); - Map<String, String> parameters = configuration1.getOtherParameters(); - assertNotSame(parameters, configuration1.getOtherParameters()); - assertEquals(parameters, configuration1.getOtherParameters()); - - assertEquals(1, parameters.size()); - assertEquals("xxx", parameters.get("test")); - } -}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/80416411/cayenne-web/src/test/java/org/apache/cayenne/web/WebModuleProviderTest.java ---------------------------------------------------------------------- diff --git a/cayenne-web/src/test/java/org/apache/cayenne/web/WebModuleProviderTest.java b/cayenne-web/src/test/java/org/apache/cayenne/web/WebModuleProviderTest.java deleted file mode 100644 index 3a30b80..0000000 --- a/cayenne-web/src/test/java/org/apache/cayenne/web/WebModuleProviderTest.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cayenne.web; - -import org.apache.cayenne.configuration.server.CayenneServerModuleProvider; -import org.apache.cayenne.unit.util.ModuleProviderChecker; -import org.junit.Test; - -public class WebModuleProviderTest { - @Test - public void testProviderPresent() { - ModuleProviderChecker.testProviderPresent(WebServerModuleProvider.class, CayenneServerModuleProvider.class); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cayenne/blob/80416411/cayenne-web/src/test/java/org/apache/cayenne/web/WebModuleTest.java ---------------------------------------------------------------------- diff --git a/cayenne-web/src/test/java/org/apache/cayenne/web/WebModuleTest.java b/cayenne-web/src/test/java/org/apache/cayenne/web/WebModuleTest.java deleted file mode 100644 index afb4ae5..0000000 --- a/cayenne-web/src/test/java/org/apache/cayenne/web/WebModuleTest.java +++ /dev/null @@ -1,40 +0,0 @@ -/***************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - ****************************************************************/ -package org.apache.cayenne.web; - -import org.apache.cayenne.di.Injector; -import org.apache.cayenne.di.spi.DefaultInjector; -import org.junit.Test; - -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertTrue; - -public class WebModuleTest { - - @Test - public void testBind_Scopes() { - - Injector injector = new DefaultInjector(new WebModule()); - RequestHandler handler = injector.getInstance(RequestHandler.class); - assertTrue(handler instanceof SessionContextRequestHandler); - - RequestHandler handler1 = injector.getInstance(RequestHandler.class); - assertNotSame("Incorrect singleton scope for request handler", handler, handler1); - } -} http://git-wip-us.apache.org/repos/asf/cayenne/blob/80416411/cayenne-web/src/test/java/org/apache/cayenne/web/WebUtilTest.java ---------------------------------------------------------------------- diff --git a/cayenne-web/src/test/java/org/apache/cayenne/web/WebUtilTest.java b/cayenne-web/src/test/java/org/apache/cayenne/web/WebUtilTest.java deleted file mode 100644 index 723be27..0000000 --- a/cayenne-web/src/test/java/org/apache/cayenne/web/WebUtilTest.java +++ /dev/null @@ -1,50 +0,0 @@ -/***************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - ****************************************************************/ -package org.apache.cayenne.web; - -import com.mockrunner.mock.web.MockServletContext; -import org.apache.cayenne.configuration.CayenneRuntime; -import org.junit.Test; - -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.mockito.Mockito.mock; - -public class WebUtilTest { - - @Test - public void testGetCayenneRuntime() { - MockServletContext context = new MockServletContext(); - - assertNull(WebUtil.getCayenneRuntime(context)); - - CayenneRuntime runtime = mock(CayenneRuntime.class); - - WebUtil.setCayenneRuntime(context, runtime); - assertSame(runtime, WebUtil.getCayenneRuntime(context)); - - CayenneRuntime runtime1 = mock(CayenneRuntime.class); - - WebUtil.setCayenneRuntime(context, runtime1); - assertSame(runtime1, WebUtil.getCayenneRuntime(context)); - - WebUtil.setCayenneRuntime(context, null); - assertNull(WebUtil.getCayenneRuntime(context)); - } -} http://git-wip-us.apache.org/repos/asf/cayenne/blob/80416411/tutorials/tutorial-rop-server-http2/src/main/java/org/apache/cayenne/tutorial/Http2ROPServlet.java ---------------------------------------------------------------------- diff --git a/tutorials/tutorial-rop-server-http2/src/main/java/org/apache/cayenne/tutorial/Http2ROPServlet.java b/tutorials/tutorial-rop-server-http2/src/main/java/org/apache/cayenne/tutorial/Http2ROPServlet.java index d8fab63..e9c6df5 100644 --- a/tutorials/tutorial-rop-server-http2/src/main/java/org/apache/cayenne/tutorial/Http2ROPServlet.java +++ b/tutorials/tutorial-rop-server-http2/src/main/java/org/apache/cayenne/tutorial/Http2ROPServlet.java @@ -20,15 +20,16 @@ package org.apache.cayenne.tutorial; import org.apache.cayenne.configuration.rop.client.ProtostuffModule; -import org.apache.cayenne.rop.server.ROPServerModule; +import org.apache.cayenne.configuration.rop.server.ROPServerModule; import org.apache.cayenne.configuration.server.ServerRuntime; -import org.apache.cayenne.web.WebConfiguration; -import org.apache.cayenne.web.WebUtil; +import org.apache.cayenne.configuration.web.WebConfiguration; +import org.apache.cayenne.configuration.web.WebUtil; import org.apache.cayenne.di.Module; import org.apache.cayenne.remote.RemoteService; import org.apache.cayenne.rop.ROPSerializationService; import org.apache.cayenne.rop.ROPServlet; + import javax.servlet.ServletConfig; import javax.servlet.ServletException; import java.util.Collection;
