svn commit: r602851 - in /struts/sandbox/trunk/jpa-mailreader/src: main/java/entity/ main/java/entity/user/ test/java/action/user/ test/java/hello/

[husted]

Author: husted
Date: Mon Dec 10 02:41:53 2007
New Revision: 602851

URL: http://svn.apache.org/viewvc?rev=602851&view=rev
Log:
WW-1399 

Added:
    
struts/sandbox/trunk/jpa-mailreader/src/test/java/action/user/AuthenticateTest.java
      - copied, changed from r599722, 
struts/sandbox/trunk/jpa-mailreader/src/test/java/action/user/autenticateTest.java
    struts/sandbox/trunk/jpa-mailreader/src/test/java/hello/MessageTestCase.java
      - copied, changed from r600483, 
struts/sandbox/trunk/jpa-mailreader/src/test/java/hello/MessageTest.java
Removed:
    
struts/sandbox/trunk/jpa-mailreader/src/test/java/action/user/autenticateTest.java
Modified:
    
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityManagerHelper.java
    
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserServiceImpl.java

Modified: 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityManagerHelper.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityManagerHelper.java?rev=602851&r1=602850&r2=602851&view=diff
==============================================================================
--- 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityManagerHelper.java
 (original)
+++ 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/EntityManagerHelper.java
 Mon Dec 10 02:41:53 2007
@@ -50,12 +50,12 @@
      */
     static final String PERSISTENCE_UNIT = "entity";
 
-    private static final EntityManagerFactory emf;
+    private static final EntityManagerFactory factory;
     private static final ThreadLocal<EntityManager> threadLocal;
     private static final Log logger;
 
     static {
-        emf = Persistence.createEntityManagerFactory(PERSISTENCE_UNIT);
+        factory = Persistence.createEntityManagerFactory(PERSISTENCE_UNIT);
         threadLocal = new ThreadLocal<EntityManager>();
         logger = LogFactory.getLog(EntityManagerHelper.class);
     }
@@ -74,7 +74,7 @@
     public static EntityManager getEntityManager() {
         EntityManager manager = threadLocal.get();
         if (manager == null || !manager.isOpen()) {
-            manager = emf.createEntityManager();
+            manager = factory.createEntityManager();
             threadLocal.set(manager);
         }
         return manager;

Modified: 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserServiceImpl.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserServiceImpl.java?rev=602851&r1=602850&r2=602851&view=diff
==============================================================================
--- 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserServiceImpl.java
 (original)
+++ 
struts/sandbox/trunk/jpa-mailreader/src/main/java/entity/user/UserServiceImpl.java
 Mon Dec 10 02:41:53 2007
@@ -50,9 +50,9 @@
         return result;
     }
 
-    public UserImpl findByName(String value) {
-        UserImpl result = (UserImpl) singleResult(UserImpl.FIND_BY_NAME,
-                UserImpl.NAME, value);
+    public User findByName(String value) {
+        UserImpl result = (UserImpl) singleResult(User.FIND_BY_NAME,
+                User.NAME, value);
         return result;
     }
 

Copied: 
struts/sandbox/trunk/jpa-mailreader/src/test/java/action/user/AuthenticateTest.java
 (from r599722, 
struts/sandbox/trunk/jpa-mailreader/src/test/java/action/user/autenticateTest.java)
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/test/java/action/user/AuthenticateTest.java?p2=struts/sandbox/trunk/jpa-mailreader/src/test/java/action/user/AuthenticateTest.java&p1=struts/sandbox/trunk/jpa-mailreader/src/test/java/action/user/autenticateTest.java&r1=599722&r2=602851&rev=602851&view=diff
==============================================================================
--- 
struts/sandbox/trunk/jpa-mailreader/src/test/java/action/user/autenticateTest.java
 (original)
+++ 
struts/sandbox/trunk/jpa-mailreader/src/test/java/action/user/AuthenticateTest.java
 Mon Dec 10 02:41:53 2007
@@ -5,7 +5,7 @@
 import entity.user.UserService;
 import entity.user.UserServiceImpl;
 
-public class autenticateTest extends TestCase {
+public class AuthenticateTest extends TestCase {
 
     UserService helper;
 

Copied: 
struts/sandbox/trunk/jpa-mailreader/src/test/java/hello/MessageTestCase.java 
(from r600483, 
struts/sandbox/trunk/jpa-mailreader/src/test/java/hello/MessageTest.java)
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/jpa-mailreader/src/test/java/hello/MessageTestCase.java?p2=struts/sandbox/trunk/jpa-mailreader/src/test/java/hello/MessageTestCase.java&p1=struts/sandbox/trunk/jpa-mailreader/src/test/java/hello/MessageTest.java&r1=600483&r2=602851&rev=602851&view=diff
==============================================================================
--- struts/sandbox/trunk/jpa-mailreader/src/test/java/hello/MessageTest.java 
(original)
+++ 
struts/sandbox/trunk/jpa-mailreader/src/test/java/hello/MessageTestCase.java 
Mon Dec 10 02:41:53 2007
@@ -6,7 +6,7 @@
 import junit.framework.TestCase;
 import entity.EntityManagerHelper;
 
-public class MessageTest extends TestCase {
+public class MessageTestCase extends TestCase {
 
     protected EntityManager manager;
 
@@ -30,7 +30,11 @@
         return result;
     }
 
-    public void testCreateMessage() throws Exception {
+    public void testTestCase() throws Exception {
+        assertTrue(true);
+    }
+
+    public void testCreate() throws Exception {
         final String MESSAGE = "Hello World!";
 
         Message message = new Message(MESSAGE);
@@ -38,10 +42,14 @@
         String text = message.getText();
         assertEquals(MESSAGE, text);
 
-        manager.persist(message);
+        int beginCount = count();
+          manager.persist(message);
+        int endCount = count();
+
+        assertTrue("Expected count to increase!", endCount > beginCount);
     }
 
-    public void testCreateWithNextMessage() throws Exception {
+    public void testCreateWithNext() throws Exception {
         final String MESSAGE = "Greeting Earthling!";
         final String NEXT_MESSAGE = "Take me to your leader.";