You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2013/09/19 11:51:08 UTC
svn commit: r1524674 - in /tomee/tomee/trunk/examples/rest-example: pom.xml
src/test/java/org/superbiz/rest/dao/UserDaoTest.java
src/test/java/org/superbiz/rest/dao/UserServiceTest.java
Author: dblevins
Date: Thu Sep 19 09:51:08 2013
New Revision: 1524674
URL: http://svn.apache.org/r1524674
Log:
Use tighter ziplock APIs TOMEE-1033
Modified:
tomee/tomee/trunk/examples/rest-example/pom.xml
tomee/tomee/trunk/examples/rest-example/src/test/java/org/superbiz/rest/dao/UserDaoTest.java
tomee/tomee/trunk/examples/rest-example/src/test/java/org/superbiz/rest/dao/UserServiceTest.java
Modified: tomee/tomee/trunk/examples/rest-example/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-example/pom.xml?rev=1524674&r1=1524673&r2=1524674&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/rest-example/pom.xml (original)
+++ tomee/tomee/trunk/examples/rest-example/pom.xml Thu Sep 19 09:51:08 2013
@@ -171,6 +171,12 @@
<version>2.0.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>ziplock</artifactId>
+ <version>1.6.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!--
This section allows you to configure where to publish libraries for sharing.
Modified: tomee/tomee/trunk/examples/rest-example/src/test/java/org/superbiz/rest/dao/UserDaoTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-example/src/test/java/org/superbiz/rest/dao/UserDaoTest.java?rev=1524674&r1=1524673&r2=1524674&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/rest-example/src/test/java/org/superbiz/rest/dao/UserDaoTest.java (original)
+++ tomee/tomee/trunk/examples/rest-example/src/test/java/org/superbiz/rest/dao/UserDaoTest.java Thu Sep 19 09:51:08 2013
@@ -44,8 +44,8 @@ public class UserDaoTest {
@Test
public void create() throws NamingException {
- UserDAO dao = (UserDAO) container.getContext().lookup("java:global/rest-example/UserDAO");
- User user = dao.create("foo", "dummy", "foo@bar.org");
+ final UserDAO dao = (UserDAO) container.getContext().lookup("java:global/rest-example/UserDAO");
+ final User user = dao.create("foo", "dummy", "foo@bar.org");
assertNotNull(dao.find(user.getId()));
}
}
Modified: tomee/tomee/trunk/examples/rest-example/src/test/java/org/superbiz/rest/dao/UserServiceTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-example/src/test/java/org/superbiz/rest/dao/UserServiceTest.java?rev=1524674&r1=1524673&r2=1524674&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/rest-example/src/test/java/org/superbiz/rest/dao/UserServiceTest.java (original)
+++ tomee/tomee/trunk/examples/rest-example/src/test/java/org/superbiz/rest/dao/UserServiceTest.java Thu Sep 19 09:51:08 2013
@@ -16,10 +16,9 @@
*/
package org.superbiz.rest.dao;
-import org.apache.commons.io.FileUtils;
import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
-import org.apache.openejb.loader.JarLocation;
import org.apache.tomee.embedded.EmbeddedTomEEContainer;
+import org.apache.ziplock.Archive;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -37,16 +36,16 @@ import java.util.Properties;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNotNull;
+import static org.apache.openejb.loader.JarLocation.jarLocation;
public class UserServiceTest {
private static EJBContainer container;
- private static File webApp;
@BeforeClass
public static void start() throws IOException {
- webApp = createWebApp();
- Properties p = new Properties();
+ final File webApp = Archive.archive().copyTo("WEB-INF/classes", jarLocation(UserDAO.class)).asDir();
+ final Properties p = new Properties();
p.setProperty(EJBContainer.APP_NAME, "rest-example");
p.setProperty(EJBContainer.PROVIDER, "tomee-embedded"); // need web feature
p.setProperty(EJBContainer.MODULES, webApp.getAbsolutePath());
@@ -59,41 +58,23 @@ public class UserServiceTest {
if (container != null) {
container.close();
}
- if (webApp != null) {
- try {
- FileUtils.forceDelete(webApp);
- } catch (IOException e) {
- FileUtils.deleteQuietly(webApp);
- }
- }
}
@Test
public void create() throws NamingException {
- UserDAO dao = (UserDAO) container.getContext().lookup("java:global/rest-example/UserDAO");
- User user = dao.create("foo", "dummy", "foo@dummy.org");
+ final UserDAO dao = (UserDAO) container.getContext().lookup("java:global/rest-example/UserDAO");
+ final User user = dao.create("foo", "dummy", "foo@dummy.org");
assertNotNull(dao.find(user.getId()));
- String uri = "http://127.0.0.1:" + System.getProperty(EmbeddedTomEEContainer.TOMEE_EJBCONTAINER_HTTP_PORT) + "/rest-example";
- UserServiceClientAPI client = JAXRSClientFactory.create(uri, UserServiceClientAPI.class);
- User retrievedUser = client.show(user.getId());
+ final String uri = "http://127.0.0.1:" + System.getProperty(EmbeddedTomEEContainer.TOMEE_EJBCONTAINER_HTTP_PORT) + "/rest-example";
+ final UserServiceClientAPI client = JAXRSClientFactory.create(uri, UserServiceClientAPI.class);
+ final User retrievedUser = client.show(user.getId());
assertNotNull(retrievedUser);
assertEquals("foo", retrievedUser.getFullname());
assertEquals("dummy", retrievedUser.getPassword());
assertEquals("foo@dummy.org", retrievedUser.getEmail());
}
- private static File createWebApp() throws IOException {
- File file = new File(System.getProperty("java.io.tmpdir") + "/tomee-" + Math.random());
- if (!file.mkdirs() && !file.exists()) {
- throw new RuntimeException("can't create " + file.getAbsolutePath());
- }
-
- FileUtils.copyDirectory(JarLocation.jarLocation(UserDAO.class), new File(file, "WEB-INF/classes"));
-
- return file;
- }
-
/**
* a simple copy of the unique method i want to use from my service.
* It allows to use cxf proxy to call remotely our rest service.