Drops unrelated tests
Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/9681d33b Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/9681d33b Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/9681d33b Branch: refs/heads/master Commit: 9681d33b3474186ae6d53e7fb069683d608ff369 Parents: b2fd330 Author: Lukasz Lenart <lukasz.len...@gmail.com> Authored: Sun Jan 10 18:29:17 2016 +0100 Committer: Lukasz Lenart <lukasz.len...@gmail.com> Committed: Sun Jan 10 18:29:17 2016 +0100 ---------------------------------------------------------------------- .../test/java/org/demo/example/ConfigTest.java | 97 -------------------- .../java/org/demo/example/HelloWorldTest.java | 37 -------- .../test/java/org/demo/example/LoginTest.java | 55 ----------- 3 files changed, 189 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts-examples/blob/9681d33b/tiles/src/test/java/org/demo/example/ConfigTest.java ---------------------------------------------------------------------- diff --git a/tiles/src/test/java/org/demo/example/ConfigTest.java b/tiles/src/test/java/org/demo/example/ConfigTest.java deleted file mode 100644 index c3cbceb..0000000 --- a/tiles/src/test/java/org/demo/example/ConfigTest.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * $Id: ConfigTest.java 1376638 2012-08-23 18:30:10Z jogep $ - * - * 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.demo.example; - -import com.opensymphony.xwork2.ActionSupport; -import com.opensymphony.xwork2.config.RuntimeConfiguration; -import com.opensymphony.xwork2.config.entities.ActionConfig; -import com.opensymphony.xwork2.config.entities.ResultConfig; -import com.opensymphony.xwork2.config.providers.XmlConfigurationProvider; - -import java.util.Map; -import java.util.List; - -import org.apache.struts2.StrutsTestCase; - -public class ConfigTest extends StrutsTestCase { - - protected void assertSuccess(String result) throws Exception { - assertTrue("Expected a success result!", - ActionSupport.SUCCESS.equals(result)); - } - - protected void assertInput(String result) throws Exception { - assertTrue("Expected an input result!", - ActionSupport.INPUT.equals(result)); - } - - protected Map assertFieldErrors(ActionSupport action) throws Exception { - assertTrue(action.hasFieldErrors()); - return action.getFieldErrors(); - } - - protected void assertFieldError(Map field_errors, String field_name, String error_message) { - - List errors = (List) field_errors.get(field_name); - assertNotNull("Expected errors for " + field_name, errors); - assertTrue("Expected errors for " + field_name, errors.size()>0); - // TODO: Should be a loop - assertEquals(error_message,errors.get(0)); - - } - - protected void setUp() throws Exception { - super.setUp(); - XmlConfigurationProvider c = new XmlConfigurationProvider("struts.xml"); - configurationManager.addContainerProvider(c); - configurationManager.reload(); - } - - protected ActionConfig assertClass(String namespace, String action_name, String class_name) { - RuntimeConfiguration configuration = configurationManager.getConfiguration().getRuntimeConfiguration(); - ActionConfig config = configuration.getActionConfig(namespace, action_name); - assertNotNull("Mssing action", config); - assertTrue("Wrong class name: [" + config.getClassName() + "]", - class_name.equals(config.getClassName())); - return config; - } - - protected ActionConfig assertClass(String action_name, String class_name) { - return assertClass("", action_name, class_name); - } - - protected void assertResult(ActionConfig config, String result_name, String result_value) { - Map results = config.getResults(); - ResultConfig result = (ResultConfig) results.get(result_name); - Map params = result.getParams(); - String value = (String) params.get("actionName"); - if (value == null) - value = (String) params.get("location"); - assertTrue("Wrong result value: [" + value + "]", - result_value.equals(value)); - } - - public void testConfig() throws Exception { - assertNotNull(configurationManager); - } - -} http://git-wip-us.apache.org/repos/asf/struts-examples/blob/9681d33b/tiles/src/test/java/org/demo/example/HelloWorldTest.java ---------------------------------------------------------------------- diff --git a/tiles/src/test/java/org/demo/example/HelloWorldTest.java b/tiles/src/test/java/org/demo/example/HelloWorldTest.java deleted file mode 100644 index af276dc..0000000 --- a/tiles/src/test/java/org/demo/example/HelloWorldTest.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * $Id: HelloWorldTest.java 739661 2009-02-01 00:06:00Z davenewton $ - * - * 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.demo.example; - -import com.opensymphony.xwork2.ActionSupport; -import org.apache.struts2.StrutsTestCase; - -public class HelloWorldTest extends StrutsTestCase { - - public void testHelloWorld() throws Exception { - HelloWorld hello_world = new HelloWorld(); - String result = hello_world.execute(); - assertTrue("Expected a success result!", - ActionSupport.SUCCESS.equals(result)); - assertTrue("Expected the default message!", - hello_world.getText(HelloWorld.MESSAGE).equals(hello_world.getMessage())); - } -} http://git-wip-us.apache.org/repos/asf/struts-examples/blob/9681d33b/tiles/src/test/java/org/demo/example/LoginTest.java ---------------------------------------------------------------------- diff --git a/tiles/src/test/java/org/demo/example/LoginTest.java b/tiles/src/test/java/org/demo/example/LoginTest.java deleted file mode 100644 index e383040..0000000 --- a/tiles/src/test/java/org/demo/example/LoginTest.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * $Id: LoginTest.java 739661 2009-02-01 00:06:00Z davenewton $ - * - * 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.demo.example; - -import com.opensymphony.xwork2.ActionSupport; -import com.opensymphony.xwork2.config.entities.ActionConfig; - -import java.util.Map; - -public class LoginTest extends ConfigTest { - - public void FIXME_testLoginConfig() throws Exception { - ActionConfig config = assertClass("example", "Login_input", "example.Login"); - assertResult(config, ActionSupport.SUCCESS, "Menu"); - assertResult(config, ActionSupport.INPUT, "/example/Login.jsp"); - } - - public void testLoginSubmit() throws Exception { - Login login = new Login(); - login.setUsername("username"); - login.setPassword("password"); - String result = login.execute(); - assertSuccess(result); - } - - // Needs access to an envinronment that includes validators - public void FIXME_testLoginSubmitInput() throws Exception { - Login login = new Login(); - String result = login.execute(); - assertInput(result); - Map errors = assertFieldErrors(login); - assertFieldError(errors,"username","Username is required."); - assertFieldError(errors,"password","Password is required."); - } - -}
