You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2014/05/18 03:48:52 UTC
svn commit: r1595558 - in
/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core:
SimplePerfTest.java ThreadedPerfTest.java
appender/db/jdbc/AbstractJdbcAppenderTest.java
appender/db/jpa/AbstractJpaAppenderTest.java
Author: mattsicker
Date: Sun May 18 01:48:51 2014
New Revision: 1595558
URL: http://svn.apache.org/r1595558
Log:
Add more tests to PerformanceTests category.
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/SimplePerfTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/ThreadedPerfTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/SimplePerfTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/SimplePerfTest.java?rev=1595558&r1=1595557&r2=1595558&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/SimplePerfTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/SimplePerfTest.java Sun May 18 01:48:51 2014
@@ -22,14 +22,17 @@ import java.util.Random;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.categories.PerformanceTests;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.DefaultConfiguration;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(PerformanceTests.class)
public class SimplePerfTest {
private static org.apache.logging.log4j.Logger logger = LogManager.getLogger(SimplePerfTest.class.getName());
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/ThreadedPerfTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/ThreadedPerfTest.java?rev=1595558&r1=1595557&r2=1595558&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/ThreadedPerfTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/ThreadedPerfTest.java Sun May 18 01:48:51 2014
@@ -21,11 +21,14 @@ import java.util.concurrent.Executors;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.categories.PerformanceTests;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
*
*/
+@Category(PerformanceTests.class)
public class ThreadedPerfTest {
private static org.apache.logging.log4j.Logger logger = LogManager.getLogger(ThreadedPerfTest.class.getName());
@@ -78,4 +81,4 @@ public class ThreadedPerfTest {
}
}
}
-}
\ No newline at end of file
+}
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java?rev=1595558&r1=1595557&r2=1595558&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java Sun May 18 01:48:51 2014
@@ -38,6 +38,7 @@ import javax.sql.DataSource;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.categories.PerformanceTests;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
@@ -48,6 +49,7 @@ import org.easymock.IAnswer;
import org.h2.util.IOUtils;
import org.junit.After;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.mockejb.jndi.MockContextFactory;
public abstract class AbstractJdbcAppenderTest {
@@ -226,6 +228,7 @@ public abstract class AbstractJdbcAppend
}
@Test
+ @Category(PerformanceTests.class)
public void testPerformanceOfAppenderWith1000Events() throws Exception {
this.setUp("fmLogEntry", "log4j2-" + this.databaseType + "-factory-method.xml");
Modified: logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java?rev=1595558&r1=1595557&r2=1595558&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java Sun May 18 01:48:51 2014
@@ -32,12 +32,14 @@ import java.util.Map;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.categories.PerformanceTests;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
import org.apache.logging.log4j.core.config.DefaultConfiguration;
import org.apache.logging.log4j.status.StatusLogger;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
public abstract class AbstractJpaAppenderTest {
private final String databaseType;
@@ -217,6 +219,7 @@ public abstract class AbstractJpaAppende
}
@Test
+ @Category(PerformanceTests.class)
public void testPerformanceOfAppenderWith10000EventsUsingBasicEntity() throws SQLException {
try {
this.setUp("log4j2-" + this.databaseType + "-jpa-basic.xml");