logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nickwilli...@apache.org
Subject svn commit: r1482468 - in /logging/log4j/log4j2/trunk/core/src/test: java/org/apache/logging/log4j/core/appender/db/jpa/ resources/META-INF/ resources/org/apache/logging/log4j/core/appender/db/jpa/
Date Tue, 14 May 2013 17:09:51 GMT
Author: nickwilliams
Date: Tue May 14 17:09:51 2013
New Revision: 1482468

URL: http://svn.apache.org/r1482468
Log:
Renaming a test class so that its name is less ambiguous.

Added:
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBaseEntity.java
      - copied, changed from r1481842, logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestEntity.java
Removed:
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestEntity.java
Modified:
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JPAAppenderTest.java
    logging/log4j/log4j2/trunk/core/src/test/resources/META-INF/persistence.xml
    logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-jpa-base.xml

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JPAAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JPAAppenderTest.java?rev=1482468&r1=1482467&r2=1482468&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JPAAppenderTest.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/JPAAppenderTest.java
Tue May 14 17:09:51 2013
@@ -106,7 +106,7 @@ public class JPAAppenderTest {
 
     @Test
     public void testNoPersistenceUnitName() {
-        final JPAAppender appender = JPAAppender.createAppender("name", null, null, null,
TestEntity.class.getName(),
+        final JPAAppender appender = JPAAppender.createAppender("name", null, null, null,
TestBaseEntity.class.getName(),
                 null);
 
         assertNull("The appender should be null.", appender);
@@ -145,7 +145,7 @@ public class JPAAppenderTest {
     }
 
     @Test
-    @Ignore("until Hibernate implements support for @Convert, @Converter")
+    @Ignore("Until Hibernate fixes https://hibernate.atlassian.net/browse/HHH-8111")
     public void testBaseJpaEntityAppender() throws SQLException {
         try {
             this.setUp("log4j2-jpa-base.xml");
@@ -208,7 +208,7 @@ public class JPAAppenderTest {
     }
 
     @Test
-    @Ignore("until Hibernate implements support for @Convert, @Converter")
+    @Ignore("Until Hibernate fixes https://hibernate.atlassian.net/browse/HHH-8111")
     public void testBasicJpaEntityAppender() throws SQLException {
         try {
             this.setUp("log4j2-jpa-basic.xml");
@@ -271,7 +271,7 @@ public class JPAAppenderTest {
     }
 
     @SuppressWarnings("unused")
-    public static class BadConstructorEntity1 extends TestEntity {
+    public static class BadConstructorEntity1 extends TestBaseEntity {
         private static final long serialVersionUID = 1L;
 
         public BadConstructorEntity1(final LogEvent wrappedEvent) {
@@ -280,7 +280,7 @@ public class JPAAppenderTest {
     }
 
     @SuppressWarnings("unused")
-    public static class BadConstructorEntity2 extends TestEntity {
+    public static class BadConstructorEntity2 extends TestBaseEntity {
         private static final long serialVersionUID = 1L;
 
         public BadConstructorEntity2() {

Copied: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBaseEntity.java
(from r1481842, logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestEntity.java)
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBaseEntity.java?p2=logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBaseEntity.java&p1=logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestEntity.java&r1=1481842&r2=1482468&rev=1482468&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestEntity.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/TestBaseEntity.java
Tue May 14 17:09:51 2013
@@ -16,14 +16,8 @@
  */
 package org.apache.logging.log4j.core.appender.db.jpa;
 
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.Marker;
-import org.apache.logging.log4j.ThreadContext;
-import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.appender.db.jpa.converter.MessageAttributeConverter;
-import org.apache.logging.log4j.core.appender.db.jpa.converter.ThrowableAttributeConverter;
-import org.apache.logging.log4j.message.Message;
-
+import java.util.Date;
+import java.util.Map;
 import javax.persistence.Basic;
 import javax.persistence.Column;
 import javax.persistence.Convert;
@@ -37,22 +31,28 @@ import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.Transient;
-import java.util.Date;
-import java.util.Map;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.Marker;
+import org.apache.logging.log4j.ThreadContext;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.appender.db.jpa.converter.MessageAttributeConverter;
+import org.apache.logging.log4j.core.appender.db.jpa.converter.ThrowableAttributeConverter;
+import org.apache.logging.log4j.message.Message;
 
 @Entity
 @Table(name = "jpaBaseLogEntry")
 @SuppressWarnings("unused")
-public class TestEntity extends AbstractLogEventWrapperEntity {
+public class TestBaseEntity extends AbstractLogEventWrapperEntity {
     private static final long serialVersionUID = 1L;
 
     private long id = 0L;
 
-    public TestEntity() {
+    public TestBaseEntity() {
         super();
     }
 
-    public TestEntity(final LogEvent wrappedEvent) {
+    public TestBaseEntity(final LogEvent wrappedEvent) {
         super(wrappedEvent);
     }
 

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/META-INF/persistence.xml?rev=1482468&r1=1482467&r2=1482468&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/META-INF/persistence.xml (original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/META-INF/persistence.xml Tue May 14
17:09:51 2013
@@ -24,8 +24,9 @@
 
   <persistence-unit name="jpaAppenderTestUnit">
     <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
-    <class>org.apache.logging.log4j.core.appender.db.jpa.TestEntity</class>
-    <!--<class>org.apache.logging.log4j.core.appender.db.jpa.TestBasicEntity</class>-->
+    <class>org.apache.logging.log4j.core.appender.db.jpa.TestBaseEntity</class>
+    <!--<class>org.apache.logging.log4j.core.appender.db.jpa.TestBasicEntity</class>
+      Until Hibernate fixes https://hibernate.atlassian.net/browse/HHH-8111-->
     <exclude-unlisted-classes>false</exclude-unlisted-classes>
     <properties>
       <property name="hibernate.connection.username" value="sa" />

Modified: logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-jpa-base.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-jpa-base.xml?rev=1482468&r1=1482467&r2=1482468&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-jpa-base.xml
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-jpa-base.xml
Tue May 14 17:09:51 2013
@@ -22,7 +22,7 @@
       <PatternLayout pattern="%C{1.} %m %level MDC%X%n"/>
     </Console>
     <Jpa name="databaseAppender" persistenceUnitName="jpaAppenderTestUnit"
-         entityClassName="org.apache.logging.log4j.core.appender.db.jpa.TestEntity" />
+         entityClassName="org.apache.logging.log4j.core.appender.db.jpa.TestBaseEntity" />
   </appenders>
 
   <loggers>



Mime
View raw message