[P-unit-devel] SF.net SVN: p-unit: [48] trunk/punit.test/src/tests/api/org/punit

[<zha...@us...>]

Revision: 48
          http://p-unit.svn.sourceforge.net/p-unit/?rev=48&view=rev
Author:   zhanghuangzhu
Date:     2007-05-13 14:36:39 -0700 (Sun, 13 May 2007)

Log Message:
-----------
Andrew Zhang: refactored org.punit.reporter package.

Modified Paths:
--------------
    trunk/punit.test/src/tests/api/org/punit/all/AllTests.java

Added Paths:
-----------
    trunk/punit.test/src/tests/api/org/punit/reporter/
    trunk/punit.test/src/tests/api/org/punit/reporter/logger/
    trunk/punit.test/src/tests/api/org/punit/reporter/logger/PUnitLoggerTest.java

Removed Paths:
-------------
    trunk/punit.test/src/tests/api/org/punit/reporter/logger/PUnitLoggerTest.java

Modified: trunk/punit.test/src/tests/api/org/punit/all/AllTests.java
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/all/AllTests.java	2007-05-13 21:35:42 UTC (rev 47)
+++ trunk/punit.test/src/tests/api/org/punit/all/AllTests.java	2007-05-13 21:36:39 UTC (rev 48)
@@ -3,7 +3,7 @@
 import junit.framework.*;
 import tests.api.org.punit.builder.*;
 import tests.api.org.punit.exception.*;
-import tests.api.org.punit.logger.*;
+import tests.api.org.punit.reporter.logger.*;
 import tests.api.org.punit.runner.*;
 import tests.api.org.punit.util.*;
 import tests.api.org.punit.watcher.*;

Copied: trunk/punit.test/src/tests/api/org/punit/reporter/logger (from rev 28, trunk/punit.test/src/tests/api/org/punit/logger)

Deleted: trunk/punit.test/src/tests/api/org/punit/reporter/logger/PUnitLoggerTest.java
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/logger/PUnitLoggerTest.java	2007-05-12 13:13:40 UTC (rev 28)
+++ trunk/punit.test/src/tests/api/org/punit/reporter/logger/PUnitLoggerTest.java	2007-05-13 21:36:39 UTC (rev 48)
@@ -1,67 +0,0 @@
-package tests.api.org.punit.logger;
-
-import java.io.*;
-import java.util.logging.*;
-
-import junit.framework.*;
-
-import org.punit.logger.*;
-
-public class PUnitLoggerTest extends TestCase {
-	private static MockPrintStream _mockPrintStream = new MockPrintStream(
-			System.err);
-
-	static {
-		PUnitLogger.setOutputStream(_mockPrintStream);
-	}
-
-	protected void setUp() throws Exception {
-		reset();
-	}
-	
-	protected void tearDown() {
-		PUnitLogger.reset();
-	}
-
-	public void test() {
-		PUnitLogger.setLogLevel(Level.ALL);
-		PUnitLogger.log(null, Level.INFO);
-		assertPrinted();
-		
-		PUnitLogger.setLogLevel(Level.INFO);
-		reset();
-		PUnitLogger.log(null, Level.SEVERE);
-		assertPrinted();
-		
-		reset();
-		PUnitLogger.log(null, Level.FINE);
-		assertNotPrinted();
-
-	}
-
-	private void reset() {
-		_mockPrintStream._printed = false;
-	}
-
-	private void assertPrinted() {
-		assertTrue(_mockPrintStream._printed);
-	}
-	
-	private void assertNotPrinted() {
-		assertFalse(_mockPrintStream._printed);
-	}
-
-	private static class MockPrintStream extends PrintStream {
-
-		public boolean _printed;
-
-		public MockPrintStream(OutputStream out) {
-			super(out);
-		}
-
-		public void print(String s) {
-			_printed = true;
-		}
-
-	}
-}

Copied: trunk/punit.test/src/tests/api/org/punit/reporter/logger/PUnitLoggerTest.java (from rev 36, trunk/punit.test/src/tests/api/org/punit/logger/PUnitLoggerTest.java)
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/reporter/logger/PUnitLoggerTest.java	                        (rev 0)
+++ trunk/punit.test/src/tests/api/org/punit/reporter/logger/PUnitLoggerTest.java	2007-05-13 21:36:39 UTC (rev 48)
@@ -0,0 +1,59 @@
+package tests.api.org.punit.reporter.logger;
+
+import java.io.*;
+import java.util.logging.*;
+
+import junit.framework.*;
+
+import org.punit.reporter.logger.*;
+
+public class PUnitLoggerTest extends TestCase {
+	ConsoleLoggerListener _logger = new ConsoleLoggerListener();
+
+	private MockPrintStream _mockPrintStream;
+
+	protected void setUp() throws Exception {
+		_mockPrintStream = new MockPrintStream(System.err);
+		_logger.setOutputStream(_mockPrintStream);
+	}
+
+	public void test1() {
+		_logger.setLogLevel(Level.ALL);
+		_logger.log(null, Level.INFO);
+		assertPrinted();
+	}
+	
+	public void test2() {
+		_logger.setLogLevel(Level.INFO);
+		_logger.log(null, Level.SEVERE);
+		assertPrinted();
+	}
+	
+	public void test3() {
+		_logger.setLogLevel(Level.FINE);
+		_logger.log(null, Level.FINER);
+		assertNotPrinted();
+	}
+
+	private void assertPrinted() {
+		assertTrue(_mockPrintStream._printed);
+	}
+
+	private void assertNotPrinted() {
+		assertFalse(_mockPrintStream._printed);
+	}
+
+	private static class MockPrintStream extends PrintStream {
+
+		public boolean _printed;
+
+		public MockPrintStream(OutputStream out) {
+			super(out);
+		}
+
+		public void print(String s) {
+			_printed = true;
+		}
+
+	}
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.