logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ggreg...@apache.org
Subject svn commit: r1492902 - in /logging/log4j/log4j2/trunk: core/src/test/java/org/apache/logging/log4j/core/appender/rolling/ core/src/test/java/org/apache/logging/log4j/core/async/perftest/ core/src/test/java/org/apache/logging/log4j/core/config/ src/chan...
Date Thu, 13 Jun 2013 23:24:12 GMT
Author: ggregory
Date: Thu Jun 13 23:24:12 2013
New Revision: 1492902

URL: http://svn.apache.org/r1492902
Log:
[LOG4J2-277] Wasted work in RollingAppenderSizeTest.testAppender() and others.

Modified:
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderTimeAndSizeTest.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderTimeTest.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTest.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/config/AdvertiserTest.java
    logging/log4j/log4j2/trunk/src/changes/changes.xml

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java?rev=1492902&r1=1492901&r2=1492902&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderSizeTest.java
Thu Jun 13 23:24:12 2013
@@ -69,6 +69,7 @@ public class RollingAppenderSizeTest {
         for (final File file : files) {
             if (file.getName().endsWith(".gz")) {
                 found = true;
+                break;
             }
         }
         assertTrue("No compressed files found", found);

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderTimeAndSizeTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderTimeAndSizeTest.java?rev=1492902&r1=1492901&r2=1492902&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderTimeAndSizeTest.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderTimeAndSizeTest.java
Thu Jun 13 23:24:12 2013
@@ -72,6 +72,7 @@ public class RollingAppenderTimeAndSizeT
         for (final File file : files) {
             if (file.getName().endsWith(".gz")) {
                 found = true;
+                break;
             }
         }
         assertTrue("No compressed files found", found);

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderTimeTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderTimeTest.java?rev=1492902&r1=1492901&r2=1492902&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderTimeTest.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderTimeTest.java
Thu Jun 13 23:24:12 2013
@@ -72,6 +72,7 @@ public class RollingAppenderTimeTest {
         for (final File file : files) {
             if (file.getName().endsWith(".gz")) {
                 found = true;
+                break;
             }
         }
         assertTrue("No compressed files found", found);

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java?rev=1492902&r1=1492901&r2=1492902&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java
Thu Jun 13 23:24:12 2013
@@ -70,6 +70,7 @@ public class RollingAppenderUncompressed
             final String name = file.getName();
             if (name.startsWith("test1") && name.endsWith(".log")) {
                 found = true;
+                break;
             }
         }
         assertTrue("No archived files found", found);

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTest.java?rev=1492902&r1=1492901&r2=1492902&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTest.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/async/perftest/PerfTest.java
Thu Jun 13 23:24:12 2013
@@ -71,6 +71,9 @@ public class PerfTest {
 		String name = args[1];
 		String resultFile = args.length > 2 ? args[2] : null;
 		for (String arg : args) {
+			if (verbose && throughput) { 
+			   break;
+			}
 			if ("-verbose".equalsIgnoreCase(arg)) {
 				verbose = true;
 			}

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/config/AdvertiserTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/config/AdvertiserTest.java?rev=1492902&r1=1492901&r2=1492902&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/config/AdvertiserTest.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/config/AdvertiserTest.java
Thu Jun 13 23:24:12 2013
@@ -69,6 +69,9 @@ public class AdvertiserTest {
         boolean foundSocket1 = false;
         boolean foundSocket2 = false;
         for (Map<String, String>entry:entries.values()) {
+            if (foundFile1 && foundFile2 && foundSocket1 && foundSocket2)
{
+               break;
+            }
             if (entry.get("name").equals("File1")) {
                 foundFile1 = true;
             }

Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1492902&r1=1492901&r2=1492902&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/changes.xml (original)
+++ logging/log4j/log4j2/trunk/src/changes/changes.xml Thu Jun 13 23:24:12 2013
@@ -23,6 +23,9 @@
   </properties>
   <body>
     <release version="2.0-beta8" date="2013-??-??" description="Bug fixes and enhancements">
+      <action issue="LOG4J2-277" dev="gregory" type="update">
+        Wasted work in RollingAppenderSizeTest.testAppender() and others.
+      </action>
       <action issue="LOG4J2-139" dev="rgoers" type="fix">
         Fix NullPointerException (regression due to fix for LOG4J2-228)
       </action>



Mime
View raw message