You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2013/07/18 22:16:14 UTC
svn commit: r1504630 -
/qpid/proton/trunk/proton-j/proton-api/src/test/java/org/apache/qpid/proton/logging/CategoryLoggerDiscoveryTest.java
Author: rgodfrey
Date: Thu Jul 18 20:16:13 2013
New Revision: 1504630
URL: http://svn.apache.org/r1504630
Log:
PROTON-358 : [Proton-j] CategoryLoggerDiscoveryTest fails when run on Java 7 due to tests being run in a different order
Modified:
qpid/proton/trunk/proton-j/proton-api/src/test/java/org/apache/qpid/proton/logging/CategoryLoggerDiscoveryTest.java
Modified: qpid/proton/trunk/proton-j/proton-api/src/test/java/org/apache/qpid/proton/logging/CategoryLoggerDiscoveryTest.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton-api/src/test/java/org/apache/qpid/proton/logging/CategoryLoggerDiscoveryTest.java?rev=1504630&r1=1504629&r2=1504630&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/proton-api/src/test/java/org/apache/qpid/proton/logging/CategoryLoggerDiscoveryTest.java (original)
+++ qpid/proton/trunk/proton-j/proton-api/src/test/java/org/apache/qpid/proton/logging/CategoryLoggerDiscoveryTest.java Thu Jul 18 20:16:13 2013
@@ -23,11 +23,28 @@ import static org.junit.Assert.assertSam
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
public class CategoryLoggerDiscoveryTest
{
private final CategoryLoggerDiscovery _discovery = new CategoryLoggerDiscovery();
+ private ProtonCategoryLogger _protonCategoryLogger;
+
+ @Before
+ public void setUp() throws Exception
+ {
+ _protonCategoryLogger = CategoryLoggerDiscovery.getEffectiveDefaultLogger();
+
+ }
+
+ @After
+ public void tearDown() throws Exception
+ {
+ CategoryLoggerDiscovery.setDefault(_protonCategoryLogger);
+
+ }
@Test
public void testDefaultLogger_isStdOutLogger()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org