Author: rmannibucau
Date: Sat May 3 10:21:53 2014
New Revision: 1592173
URL: http://svn.apache.org/r1592173
Log:
making test rest-on-ejb deterministic
Modified:
tomee/tomee/trunk/examples/rest-on-ejb/src/main/java/org/superbiz/rest/User.java
tomee/tomee/trunk/examples/rest-on-ejb/src/test/java/org/superbiz/rest/UserServiceTest.java
Modified:
tomee/tomee/trunk/examples/rest-on-ejb/src/main/java/org/superbiz/rest/User.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-on-ejb/src/main/java/org/superbiz/rest/User.java?rev=1592173&r1=1592172&r2=1592173&view=diff
==============================================================================
---
tomee/tomee/trunk/examples/rest-on-ejb/src/main/java/org/superbiz/rest/User.java
(original)
+++
tomee/tomee/trunk/examples/rest-on-ejb/src/main/java/org/superbiz/rest/User.java
Sat May 3 10:21:53 2014
@@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlRoot
@Entity
@NamedQueries({
- @NamedQuery(name = "user.list", query = "select u from User
u")
+ @NamedQuery(name = "user.list", query = "select u from User
u order by u.fullname")
})
@XmlRootElement(name = "user")
public class User implements Cloneable {
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=1592173&r1=1592172&r2=1592173&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
Sat May 3 10:21:53 2014
@@ -66,11 +66,11 @@ public class UserServiceTest {
public void create() {
int expected = service.list(0, 100).size() + 1;
Response response =
WebClient.create("http://localhost:4204/rest-on-ejb";)
- .path("/user/create")
- .query("name", "dummy")
- .query("pwd", "unbreakable")
- .query("mail", "f...@bar.fr")
- .put(null);
+ .path("/user/create")
+ .query("name", "dummy")
+ .query("pwd", "unbreakable")
+ .query("mail", "f...@bar.fr")
+ .put(null);
List<User> list = service.list(0, 100);
for (User u : list) {
if (!users.contains(u)) {
@@ -94,8 +94,8 @@ public class UserServiceTest {
@Test
public void show() {
User user = WebClient.create("http://localhost:4204/rest-on-ejb";)
- .path("/user/show/" +
users.iterator().next().getId())
- .get(User.class);
+ .path("/user/show/" + users.iterator().next().getId())
+ .get(User.class);
assertEquals("foo", user.getFullname());
assertEquals("foopwd", user.getPassword());
assertEquals("f...@foo.com", user.getEmail());
@@ -104,24 +104,25 @@ public class UserServiceTest {
@Test
public void list() throws Exception {
String users = WebClient.create("http://localhost:4204/rest-on-ejb";)
- .path("/user/list")
- .get(String.class);
- assertEquals(
- inline("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
- "<users>" +
- " <user>" +
- " <email>f...@foo.com</email>" +
- " <fullname>foo</fullname>" +
- " <id>1</id>" +
- " <password>foopwd</password>" +
- " </user>" +
- " <user>" +
- " <email>b...@bar.com</email>" +
- " <fullname>bar</fullname>" +
- " <id>2</id>" +
- " <password>barpwd</password>" +
- " </user>" +
- "</users>"), inline(users));
+ .path("/user/list")
+ .get(String.class);
+ assertEquals(users,
+ inline("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+ "<users>" +
+ " <user>" +
+ " <email>b...@bar.com</email>" +
+ " <fullname>bar</fullname>" +
+ " <id>2</id>" +
+ " <password>barpwd</password>" +
+ " </user>" +
+ " <user>" +
+ " <email>f...@foo.com</email>" +
+ " <fullname>foo</fullname>" +
+ " <id>1</id>" +
+ " <password>foopwd</password>" +
+ " </user>" +
+ "</users>"), inline(users)
+ );
}
private static String inline(String s) {
@@ -133,11 +134,11 @@ public class UserServiceTest {
public void update() throws Exception {
User created = service.create("name", "pwd", "mail");
Response response =
WebClient.create("http://localhost:4204/rest-on-ejb";)
- .path("/user/update/" + created.getId())
- .query("name", "corrected")
- .query("pwd", "userpwd")
- .query("mail", "i...@is.ok")
- .post(null);
+ .path("/user/update/" + created.getId())
+ .query("name", "corrected")
+ .query("pwd", "userpwd")
+ .query("mail", "i...@is.ok")
+ .post(null);
JAXBContext ctx = JAXBContext.newInstance(User.class);
Unmarshaller unmarshaller = ctx.createUnmarshaller();
@@ -146,5 +147,6 @@ public class UserServiceTest {
assertEquals("corrected", modified.getFullname());
assertEquals("userpwd", modified.getPassword());
assertEquals("i...@is.ok", modified.getEmail());
+ service.delete(created.getId());
}
}
