BAEL-524:after review comments (#1154)

* BAEL-524

* BAEL-524

* BAEL-524

* BAEL-524

* BAEL-524 resolving build failure

* BAEL-524 do not exclude test class
This commit is contained in:
Ravi-ronic 2017-02-14 00:40:28 +05:30 committed by maibin
parent 5ef3b149f1
commit 491d36e745
5 changed files with 102 additions and 61 deletions

View File

@ -2,19 +2,15 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.baeldung</groupId> <groupId>com.baeldung</groupId>
<artifactId>struts2</artifactId> <artifactId>MyStrutsApp</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<packaging>war</packaging> <packaging>war</packaging>
<name>struts2</name> <name>MyStrutsApp</name>
<build> <build>
<sourceDirectory>src</sourceDirectory> <sourceDirectory>src</sourceDirectory>
<resources> <resources>
<resource> <resource>
<directory>src</directory> <directory>src</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource> </resource>
</resources> </resources>
<plugins> <plugins>
@ -35,14 +31,29 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<dependencies> <dependencies>
<!-- https://mvnrepository.com/artifact/org.apache.struts/struts2-core --> <!-- http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22struts2-core%22 -->
<dependency> <dependency>
<groupId>org.apache.struts</groupId> <groupId>org.apache.struts</groupId>
<artifactId>struts2-core</artifactId> <artifactId>struts2-core</artifactId>
<version>2.5.5</version> <version>2.5.5</version>
</dependency> </dependency>
<!-- http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22struts2-core%22 -->
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-junit-plugin</artifactId>
<version>2.5.5</version>
</dependency>
<!-- http://search.maven.org/#search%7Cga%7C1%7Cstruts2-convention-plugin -->
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-convention-plugin</artifactId>
<version>2.5.8</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
</dependency>
</dependencies> </dependencies>
</project> </project>

View File

@ -1,7 +1,14 @@
package com.baeldung.struts; package com.baeldung.struts;
public class CarAction { import org.apache.struts2.convention.annotation.Action;
import org.apache.struts2.convention.annotation.Namespace;
import org.apache.struts2.convention.annotation.Result;
import org.apache.struts2.convention.annotation.ResultPath;
@Namespace("/tutorial")
@Action("/car")
@Result(name = "success", location = "/result.jsp")
public class CarAction {
private String carName; private String carName;
private String carMessage; private String carMessage;
private CarMessageService carMessageService = new CarMessageService(); private CarMessageService carMessageService = new CarMessageService();

View File

@ -4,12 +4,15 @@ public class CarMessageService {
public String getMessage(String carName) { public String getMessage(String carName) {
System.out.println("inside getMessage()" + carName); System.out.println("inside getMessage()" + carName);
if (carName.equalsIgnoreCase("ferrari")) if (carName.equalsIgnoreCase("ferrari")){
return "Ferrari Fan!"; return "Ferrari Fan!";
else if (carName.equalsIgnoreCase("bmw")) }
else if (carName.equalsIgnoreCase("bmw")){
return "BMW Fan!"; return "BMW Fan!";
else }
else{
return "please choose ferrari Or bmw"; return "please choose ferrari Or bmw";
} }
}
} }

View File

@ -0,0 +1,32 @@
package com.baeldung.struts.test;
import org.apache.struts2.StrutsTestCase;
import org.junit.Test;
import com.baeldung.struts.CarAction;
import com.opensymphony.xwork2.ActionProxy;
public class TestCarAction extends StrutsTestCase {
@Test
public void test_givenCarOptions_WhenferrariSelected_ThenShowMessage() throws Exception {
request.setParameter("carName", "ferrari");
ActionProxy proxy = getActionProxy("/tutorial/car.action");
CarAction carAction = (CarAction) proxy.getAction();
String result = proxy.execute();
assertEquals(result,"success");
assertEquals(carAction.getCarMessage(), "Ferrari Fan!");
}
public void test_givenCarOptions_WhenbmwSelected_ThenShowMessage() throws Exception {
request.setParameter("carName", "bmw");
ActionProxy proxy = getActionProxy("/tutorial/car.action");
CarAction carAction = (CarAction) proxy.getAction();
String result = proxy.execute();
assertEquals(result,"success");
assertEquals(carAction.getCarMessage(), "BMW Fan!");
}
}

View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE struts PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
"http://struts.apache.org/dtds/struts-2.0.dtd">
<struts>
<package name="tutorial" extends="struts-default" namespace="/tutorial">
<action name="car" class="com.baeldung.struts.CarAction"
method="execute">
<result name="success">/result.jsp</result>
</action>
</package>
</struts>