You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/08/07 07:27:41 UTC
svn commit: r1616404 - in /tomee/tomee/trunk/examples/rest-on-ejb: pom.xml
src/main/java/org/superbiz/rest/UserService.java
src/test/java/org/superbiz/rest/UserServiceTest.java
Author: rmannibucau
Date: Thu Aug 7 05:27:40 2014
New Revision: 1616404
URL: http://svn.apache.org/r1616404
Log:
fixing test
Modified:
tomee/tomee/trunk/examples/rest-on-ejb/pom.xml
tomee/tomee/trunk/examples/rest-on-ejb/src/main/java/org/superbiz/rest/UserService.java
tomee/tomee/trunk/examples/rest-on-ejb/src/test/java/org/superbiz/rest/UserServiceTest.java
Modified: tomee/tomee/trunk/examples/rest-on-ejb/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-on-ejb/pom.xml?rev=1616404&r1=1616403&r2=1616404&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/rest-on-ejb/pom.xml (original)
+++ tomee/tomee/trunk/examples/rest-on-ejb/pom.xml Thu Aug 7 05:27:40 2014
@@ -28,19 +28,28 @@
<name>OpenEJB :: Examples :: REST and EJB</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <openejb.version>5.0.0-SNAPSHOT</openejb.version>
</properties>
<build>
<defaultGoal>install</defaultGoal>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.17</version>
+ <configuration>
+ <argLine>"-javaagent:${settings.localRepository}/org/apache/openejb/openejb-javaagent/${openejb.version}/openejb-javaagent-${openejb.version}.jar"</argLine>
+ </configuration>
+ </plugin>
</plugins>
</build>
<repositories>
@@ -69,14 +78,8 @@
-->
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf-rs</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>${openejb.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/rest-on-ejb/src/main/java/org/superbiz/rest/UserService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-on-ejb/src/main/java/org/superbiz/rest/UserService.java?rev=1616404&r1=1616403&r2=1616404&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/rest-on-ejb/src/main/java/org/superbiz/rest/UserService.java (original)
+++ tomee/tomee/trunk/examples/rest-on-ejb/src/main/java/org/superbiz/rest/UserService.java Thu Aug 7 05:27:40 2014
@@ -57,7 +57,7 @@ public class UserService {
user.setPassword(pwd);
user.setEmail(mail);
em.persist(user);
- return user;
+ return user.copy();
}
@Path("/list")
Modified: tomee/tomee/trunk/examples/rest-on-ejb/src/test/java/org/superbiz/rest/UserServiceTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-on-ejb/src/test/java/org/superbiz/rest/UserServiceTest.java?rev=1616404&r1=1616403&r2=1616404&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/rest-on-ejb/src/test/java/org/superbiz/rest/UserServiceTest.java (original)
+++ tomee/tomee/trunk/examples/rest-on-ejb/src/test/java/org/superbiz/rest/UserServiceTest.java Thu Aug 7 05:27:40 2014
@@ -41,7 +41,7 @@ public class UserServiceTest {
private static Context context;
private static UserService service;
- private static List<User> users = new ArrayList<User>();
+ private static List<User> users = new ArrayList<>();
@BeforeClass
public static void start() throws NamingException {
@@ -64,13 +64,12 @@ public class UserServiceTest {
@Test
public void create() {
- int expected = service.list(0, 100).size() + 1;
- Response response = WebClient.create("http://localhost:4204/rest-on-ejb")
+ WebClient.create("http://localhost:4204/rest-on-ejb")
.path("/user/create")
.query("name", "dummy")
.query("pwd", "unbreakable")
.query("mail", "foo@bar.fr")
- .put(null);
+ .put("{}");
List<User> list = service.list(0, 100);
for (User u : list) {
if (!users.contains(u)) {