Re: svn commit: r501955 - /incubator/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestPersistence.java

[Craig L Russell]

Hi Kevin,

Sorry for commenting before reading this...

On Jan 31, 2007, at 11:39 AM, Kevin Sutter wrote:

Sorry about the "whole changed file" thing again. I thought I had found the problem with a doubly defined [miscellany] section in my svn config file. But, I changed that and I still have the problem. Like I mentioned before, this only seems to happen after using the SVN Eclipse plugin to do a merge

of a patch.

Do you review the diff in Eclipse before committing?

Maybe I should just use the SVN command line to do the commit?

That works.

Or, maybe I have to manually do the Windows->Linux line ending conversion before committing any changes? Seems kind of error prone, especially as my

memory continues to grow older...  :-)

This also works.

on two of the OpenJPA sub-projects that supposedly helps with this
situation.  Is this operation "permanent"?

I looked back in our dev mailing list and Craig had performed an operation

Yes. For existing files that should have the eol-style, svn automatically normalizes the files upon commit.

That is, if I run this on each

thing?

sub-project and push the changes out, will that clean up this line ending

Yes. When you first apply the property to a file, it might give you one of those 100% changed commits, but that will not happen on subsequent commits.

The problem with this approach is that it seems to only work with

operation again.

existing files. Any new files and we would have to remember to run this

Craig

Yes, IIRC this is true. New files need to have the property added. There is a property that you can set in your environment but there's nothing that I can recall to set an entire directory tree permanently to this status.

look consistent with everybody else's.   When I do my diffs before

picks up the whole file.

Thank you and, again, my apologies!
Kevin

On 1/31/07, [EMAIL PROTECTED] <[EMAIL PROTECTED]> wrote:

Any other ideas? I would like to get this cleaned up so that my commits committing, only the changed lines show up. It's the commit processing that

Author: kwsutter
Date: Wed Jan 31 11:27:11 2007
New Revision: 501955

URL: http://svn.apache.org/viewvc?view=rev&rev=501955
Log:

when the EM is closed.

Modified:



Modified:

URL:

Simple test for OPENJPA-116. Just modified the simple TestPersistence testcase with a new variation for testing the exception on getDelegate() incubator/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/ org/apache/openjpa/persistence/simple/TestPersistence.java incubator/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/ apache/openjpa/persistence/simple/TestPersistence.java http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa- persistence-jdbc/src/test/java/org/apache/openjpa/persistence/ simple/TestPersistence.java?view=diff&rev=501955&r1=501954&r2=501955

---

(original)
+++

Wed Jan 31 11:27:11 2007
@@ -1,114 +1,134 @@
-/*
- * Copyright 2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *

- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.

- * limitations under the License.
- */
-package org.apache.openjpa.persistence.simple;
-
-import java.util.HashMap;
-import java.util.Map;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.Persistence;
-
-import junit.framework.TestCase;
-import junit.textui.TestRunner;
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
-
-/**
- * Simple test case to get an EntityManager and perform some basic
operations.
- *
- * @author Marc Prud'hommeaux
- */
-public class TestPersistence
-    extends TestCase {
-
-    private EntityManagerFactory emf;
-
-    public void setUp() {
-        Map props = new HashMap(System.getProperties());
-        props.put("openjpa.MetaDataFactory",
-            "jpa(Types=" + AllFieldTypes.class.getName() + ")");
-        emf = Persistence.createEntityManagerFactory("test", props);
-    }
-
-    public void tearDown() {
-        if (emf == null)
-            return;
-        try {
-            EntityManager em = emf.createEntityManager();
-            em.getTransaction().begin();

-            em.getTransaction().commit();
-            em.close();
-            emf.close();
-        } catch (Exception e) {
-        }
-    }
-
-    public void testCreateEntityManager() {
-        EntityManager em = emf.createEntityManager();
-
-        EntityTransaction t = em.getTransaction();
-        assertNotNull(t);
-        t.begin();
-        t.setRollbackOnly();
-        t.rollback();
-
-        // openjpa-facade test
-        assertTrue(em instanceof OpenJPAEntityManager);
-        OpenJPAEntityManager ojem = (OpenJPAEntityManager) em;
-        ojem.getFetchPlan().setMaxFetchDepth(1);
-        assertEquals(1, ojem.getFetchPlan().getMaxFetchDepth());
-        em.close();
-    }
-
-    public void testPersist() {
-        EntityManager em = emf.createEntityManager();
-        em.getTransaction().begin();
-        em.persist(new AllFieldTypes());
-        em.getTransaction().commit();
-        em.close();
-    }
-
-    public void testQuery() {
-        EntityManager em = emf.createEntityManager();
-        em.getTransaction().begin();
-        AllFieldTypes aft = new AllFieldTypes();
-        aft.setStringField("foo");
-        aft.setIntField(10);
-        em.persist(aft);
-        em.getTransaction().commit();
-        em.close();
-
-        em = emf.createEntityManager();
-        em.getTransaction().begin();
-        assertEquals(1, em.createQuery
-            ("select x from AllFieldTypes x where x.stringField =
'foo'").
-            getResultList().size());
-        assertEquals(0, em.createQuery
-            ("select x from AllFieldTypes x where x.stringField =
'bar'").
-            getResultList().size());
-        assertEquals(1, em.createQuery

-            getResultList().size());
-        em.getTransaction().rollback();
-        em.close();
-    }
-
-    public static void main(String[] args) {
-        TestRunner.run(TestPersistence.class);
-    }
-}
-
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *

+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.

+ * limitations under the License.
+ */
+package org.apache.openjpa.persistence.simple;
+
+import java.util.HashMap;
+import java.util.Map;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.EntityTransaction;
+import javax.persistence.Persistence;
+
+import junit.framework.TestCase;
+import junit.textui.TestRunner;
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
+
+/**
+ * Simple test case to get an EntityManager and perform some basic
operations.
+ *
+ * @author Marc Prud'hommeaux
+ */
+public class TestPersistence
+    extends TestCase {
+
+    private EntityManagerFactory emf;
+
+    public void setUp() {
+        Map props = new HashMap(System.getProperties());
+        props.put("openjpa.MetaDataFactory",
+            "jpa(Types=" + AllFieldTypes.class.getName() + ")");
+        emf = Persistence.createEntityManagerFactory("test", props);
+    }
+
+    public void tearDown() {
+        if (emf == null)
+            return;
+        try {
+            EntityManager em = emf.createEntityManager();
+            em.getTransaction().begin();

+            em.getTransaction().commit();
+            em.close();
+            emf.close();
+        } catch (Exception e) {
+        }
+    }
+
+    public void testCreateEntityManager() {
+        EntityManager em = emf.createEntityManager();
+
+        EntityTransaction t = em.getTransaction();
+        assertNotNull(t);
+        t.begin();
+        t.setRollbackOnly();
+        t.rollback();
+
+        // openjpa-facade test
+        assertTrue(em instanceof OpenJPAEntityManager);
+        OpenJPAEntityManager ojem = (OpenJPAEntityManager) em;
+        ojem.getFetchPlan().setMaxFetchDepth(1);
+        assertEquals(1, ojem.getFetchPlan().getMaxFetchDepth());
+        em.close();
+    }
+
+    public void testPersist() {
+        EntityManager em = emf.createEntityManager();
+        em.getTransaction().begin();
+        em.persist(new AllFieldTypes());
+        em.getTransaction().commit();
+        em.close();
+    }
+
+    public void testQuery() {
+        EntityManager em = emf.createEntityManager();
+        em.getTransaction().begin();
+        AllFieldTypes aft = new AllFieldTypes();
+        aft.setStringField("foo");
+        aft.setIntField(10);
+        em.persist(aft);
+        em.getTransaction().commit();
+        em.close();
+
+        em = emf.createEntityManager();
+        em.getTransaction().begin();
+        assertEquals(1, em.createQuery
+            ("select x from AllFieldTypes x where x.stringField =
'foo'").
+            getResultList().size());
+        assertEquals(0, em.createQuery
+            ("select x from AllFieldTypes x where x.stringField =
'bar'").
+            getResultList().size());
+        assertEquals(1, em.createQuery

+            getResultList().size());
+        em.getTransaction().rollback();
+        em.close();
+    }
+
+    /**

called
+     * after closing the EntityManager.
+     */
+    public void testGetDelegateAfterClose() {
+        EntityManager em = emf.createEntityManager();
+
+        em.close();
+
+        try {
+            Object o = em.getDelegate();
+            fail();
+        }
+        catch(IllegalStateException ise) {
+            /*

+             */
+        }
+    }
+
+    public static void main(String[] args) {
+        TestRunner.run(TestPersistence.class);
+    }
+}
+

===================================================================== ========= incubator/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/ apache/openjpa/persistence/simple/TestPersistence.java incubator/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/ apache/openjpa/persistence/simple/TestPersistence.java - * Unless required by applicable law or agreed to in writing, software - * See the License for the specific language governing permissions and - em.createQuery("delete from AllFieldTypes").executeUpdate(); - ("select x from AllFieldTypes x where x.intField >= 10"). + * Unless required by applicable law or agreed to in writing, software + * See the License for the specific language governing permissions and + em.createQuery("delete from AllFieldTypes").executeUpdate(); + ("select x from AllFieldTypes x where x.intField >= 10"). + * Ensures that an IllegalStateException is thrown if getDelegate is + * An IllegalStateException is expected. Nothing to do here.

Craig Russell
Architect, Sun Java Enterprise System http://java.sun.com/products/jdo
408 276-5638 mailto:[EMAIL PROTECTED]
P.S. A good JDO? O, Gasp!

smime.p7s
Description: S/MIME cryptographic signature