You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2018/04/01 20:26:13 UTC
[06/30] qpid-broker-j git commit: QPID-8151: [Broker-J] [Unit tests]
Factor out QpidTestCase
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/QpidLoggerTurboFilterTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/QpidLoggerTurboFilterTest.java b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/QpidLoggerTurboFilterTest.java
index fbba1c1..0adb987 100644
--- a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/QpidLoggerTurboFilterTest.java
+++ b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/QpidLoggerTurboFilterTest.java
@@ -20,34 +20,38 @@
*/
package org.apache.qpid.server.logging.logback;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.LoggerContext;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
-import org.apache.qpid.server.logging.logback.LoggerNameAndLevelFilter;
-import org.apache.qpid.server.logging.logback.QpidLoggerTurboFilter;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class QpidLoggerTurboFilterTest extends QpidTestCase
+public class QpidLoggerTurboFilterTest extends UnitTestBase
{
private LoggerContext _loggerContext;
private QpidLoggerTurboFilter _turboFilter;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_loggerContext = new LoggerContext();
_turboFilter = QpidLoggerTurboFilter.installIfNecessary(_loggerContext);
}
- @Override
- public void tearDown() throws Exception
+ @After
+ public void tearDown() throws Exception
{
QpidLoggerTurboFilter.uninstall(_loggerContext);
- super.tearDown();
}
+ @Test
public void testDebugOffByDefault()
{
Logger fooLogger = _loggerContext.getLogger("foo");
@@ -58,6 +62,7 @@ public class QpidLoggerTurboFilterTest extends QpidTestCase
}
+ @Test
public void testInstallFilterWorksCorrectly()
{
Logger fooBarLogger = _loggerContext.getLogger("foo.bar");
@@ -106,11 +111,14 @@ public class QpidLoggerTurboFilterTest extends QpidTestCase
}
}
+ @Test
public void testUninstall()
{
Logger fooBarLogger = _loggerContext.getLogger("foo.bar");
- assertFalse("Debug should not be enabled when QpidLoggerTurboFilter is installed but no regular filter is set",
+ assertFalse(
+ "Debug should not be enabled when QpidLoggerTurboFilter is installed but no regular filter is set",
fooBarLogger.isDebugEnabled());
+
QpidLoggerTurboFilter.uninstall(_loggerContext);
assertTrue("Debug should be enabled as per test logback configuration", fooBarLogger.isDebugEnabled());
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/RollingPolicyDecoratorTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/RollingPolicyDecoratorTest.java b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/RollingPolicyDecoratorTest.java
index 2f19535..d6d798e 100644
--- a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/RollingPolicyDecoratorTest.java
+++ b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/RollingPolicyDecoratorTest.java
@@ -20,6 +20,7 @@
*/
package org.apache.qpid.server.logging.logback;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.argThat;
import static org.mockito.Matchers.eq;
@@ -44,16 +45,19 @@ import ch.qos.logback.core.rolling.helper.FileNamePattern;
import org.hamcrest.BaseMatcher;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.qpid.server.util.FileUtils;
-import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.test.utils.TestFileUtils;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class RollingPolicyDecoratorTest extends QpidTestCase
+public class RollingPolicyDecoratorTest extends UnitTestBase
{
private static final Logger LOGGER = LoggerFactory.getLogger(RollingPolicyDecoratorTest.class);
@@ -64,10 +68,9 @@ public class RollingPolicyDecoratorTest extends QpidTestCase
private File _testFile;
private Pattern _rolledFileRegExp;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_baseFolder = TestFileUtils.createTestDirectory("rollover", true);
_testFile = createTestFile("test.2015-06-25.0.gz");
@@ -85,10 +88,9 @@ public class RollingPolicyDecoratorTest extends QpidTestCase
LOGGER.debug("Rolled file reg exp: {} ", _rolledFileRegExp);
}
- @Override
+ @After
public void tearDown() throws Exception
{
- super.tearDown();
if (_baseFolder.exists())
{
FileUtils.delete(_baseFolder, true);
@@ -122,18 +124,21 @@ public class RollingPolicyDecoratorTest extends QpidTestCase
return executorService;
}
+ @Test
public void testRollover()
{
_policy.rollover();
verify(_delegate).rollover();
}
+ @Test
public void testRolloverListener() throws InterruptedException
{
_policy.rollover();
verify(_listener).onRollover(any(Path.class), any(String[].class));
}
+ @Test
public void testRolloverWithFile() throws IOException
{
_policy.rollover();
@@ -143,6 +148,7 @@ public class RollingPolicyDecoratorTest extends QpidTestCase
verify(_listener).onRollover(eq(_baseFolder.toPath()), argThat(matcher));
}
+ @Test
public void testRolloverRescanLimit() throws IOException
{
_policy.rollover();
@@ -154,6 +160,7 @@ public class RollingPolicyDecoratorTest extends QpidTestCase
verify(_listener).onNoRolloverDetected(eq(_baseFolder.toPath()), argThat(matcher));
}
+ @Test
public void testSequentialRollover() throws IOException
{
_policy.rollover();
@@ -187,18 +194,21 @@ public class RollingPolicyDecoratorTest extends QpidTestCase
};
}
+ @Test
public void testGetActiveFileName()
{
_policy.getActiveFileName();
verify(_delegate).getActiveFileName();
}
+ @Test
public void testGetCompressionMode()
{
_policy.getCompressionMode();
verify(_delegate).getCompressionMode();
}
+ @Test
public void testSetParent()
{
FileAppender appender = mock(FileAppender.class);
@@ -206,18 +216,21 @@ public class RollingPolicyDecoratorTest extends QpidTestCase
verify(_delegate).setParent(appender);
}
+ @Test
public void testStart()
{
_policy.start();
verify(_delegate).start();
}
+ @Test
public void testStop()
{
_policy.stop();
verify(_delegate).stop();
}
+ @Test
public void testIsStarted()
{
_policy.isStarted();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/RolloverWatcherTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/RolloverWatcherTest.java b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/RolloverWatcherTest.java
index 3b81dbf..8086034 100644
--- a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/RolloverWatcherTest.java
+++ b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/RolloverWatcherTest.java
@@ -21,55 +21,74 @@
package org.apache.qpid.server.logging.logback;
-import java.io.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
import java.nio.file.Path;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.logging.LogFileDetails;
import org.apache.qpid.server.logging.PathContent;
import org.apache.qpid.server.logging.ZippedContent;
import org.apache.qpid.server.model.Content;
-import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.test.utils.TestFileUtils;
import org.apache.qpid.server.util.FileUtils;
+import org.apache.qpid.test.utils.TestFileUtils;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class RolloverWatcherTest extends QpidTestCase
+public class RolloverWatcherTest extends UnitTestBase
{
private RolloverWatcher _rolloverWatcher;
private File _baseFolder;
private File _activeFile;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_baseFolder = TestFileUtils.createTestDirectory("rollover", true);
_activeFile = new File(_baseFolder, "test.log");
_rolloverWatcher = new RolloverWatcher(_activeFile.toString());
}
- @Override
+ @After
public void tearDown() throws Exception
{
- super.tearDown();
if (_baseFolder.exists())
{
FileUtils.delete(_baseFolder, true);
}
}
+ @Test
public void testOnRollover() throws Exception
{
String[] files = {"test1", "test2"};
_rolloverWatcher.onRollover(_baseFolder.toPath(), files);
assertEquals("Unexpected rolled files. Expected " + Arrays.toString(files) + " but got "
- + _rolloverWatcher.getRolledFiles(), new HashSet<>(Arrays.asList(files)),
- new HashSet<>(_rolloverWatcher.getRolledFiles()));
+ + _rolloverWatcher.getRolledFiles(),
+ new HashSet<>(Arrays.asList(files)),
+ new HashSet<>(_rolloverWatcher.getRolledFiles()));
+
}
+ @Test
public void testGetLogFileDetailsIsOrdered() throws Exception
{
@@ -93,7 +112,10 @@ public class RolloverWatcherTest extends QpidTestCase
List<LogFileDetails> orderedDetails = _rolloverWatcher.getLogFileDetails();
- assertEquals("Unexpected number of log file details", expectedOrder.size(), orderedDetails.size());
+ assertEquals("Unexpected number of log file details",
+ (long) expectedOrder.size(),
+ (long) orderedDetails.size());
+
for (int i = 0; i < expectedOrder.size(); i++)
{
@@ -103,6 +125,7 @@ public class RolloverWatcherTest extends QpidTestCase
}
}
+ @Test
public void testGetTypedContentForActiveFile() throws Exception
{
_rolloverWatcher.onRollover(_baseFolder.toPath(), new String[]{});
@@ -112,9 +135,12 @@ public class RolloverWatcherTest extends QpidTestCase
assertEquals("Unexpected content type", "text/plain", content.getContentType());
assertEquals("Unexpected data", "test", readContent(content));
- assertEquals("Unexpected content disposition", "attachment; filename=\"" + _activeFile.getName().toString() + "\"", content.getContentDisposition());
+ assertEquals("Unexpected content disposition",
+ "attachment; filename=\"" + _activeFile.getName().toString() + "\"",
+ content.getContentDisposition());
}
+ @Test
public void testGetTypedForNullFile() throws Exception
{
try
@@ -128,6 +154,7 @@ public class RolloverWatcherTest extends QpidTestCase
}
}
+ @Test
public void testGetTypedContentForExistingRolledFile() throws Exception
{
String[] files = {"test1.gz", "test2.gz"};
@@ -139,9 +166,12 @@ public class RolloverWatcherTest extends QpidTestCase
assertEquals("Unexpected content type", "application/x-gzip", content.getContentType());
assertEquals("Unexpected data", "test.gz", readContent(content));
- assertEquals("Unexpected content disposition", "attachment; filename=\"test1.gz\"", content.getContentDisposition());
+ assertEquals("Unexpected content disposition",
+ "attachment; filename=\"test1.gz\"",
+ content.getContentDisposition());
}
+ @Test
public void testGetTypedContentForNonExistingRolledFile() throws Exception
{
String[] files = {"test1.gz", "test2.gz"};
@@ -163,20 +193,30 @@ public class RolloverWatcherTest extends QpidTestCase
}
}
+ @Test
public void testGetContentType() throws Exception
{
- assertEquals("Unexpected content type for log file", "text/plain", _rolloverWatcher.getContentType("test.log"));
- assertEquals("Unexpected content type for gzip file", "application/x-gzip", _rolloverWatcher.getContentType("test.gz"));
- assertEquals("Unexpected content type for zip file", "application/x-zip", _rolloverWatcher.getContentType("test.zip"));
+ assertEquals("Unexpected content type for log file",
+ "text/plain",
+ _rolloverWatcher.getContentType("test.log"));
+ assertEquals("Unexpected content type for gzip file",
+ "application/x-gzip",
+ _rolloverWatcher.getContentType("test.gz"));
+ assertEquals("Unexpected content type for zip file",
+ "application/x-zip",
+ _rolloverWatcher.getContentType("test.zip"));
}
+ @Test
public void testGetLogFileDetails() throws Exception
{
String[] files = createTestRolledFilesAndNotifyWatcher();
List<LogFileDetails> logFileDetails = _rolloverWatcher.getLogFileDetails();
final int expectedNumberOfEntries = files.length + 1; // add one for the active file
- assertEquals("getLogFileDetails returned unexpected number of entries", expectedNumberOfEntries, logFileDetails.size());
+ assertEquals("getLogFileDetails returned unexpected number of entries",
+ (long) expectedNumberOfEntries,
+ (long) logFileDetails.size());
List<String> expectedFiles = new ArrayList<>(Arrays.asList(files));
expectedFiles.add(_activeFile.getName());
@@ -190,8 +230,12 @@ public class RolloverWatcherTest extends QpidTestCase
{
found = true;
final File file = new File(_baseFolder, expectedFileName);
- assertEquals("FileDetail for \"" + expectedFileName + "\" has unexpected lastModified time", file.lastModified(), details.getLastModified());
- assertEquals("FileDetail for \"" + expectedFileName + "\" has unexpected size", file.length(), details.getSize());
+ assertEquals("FileDetail for \"" + expectedFileName + "\" has unexpected lastModified time",
+ file.lastModified(),
+ details.getLastModified());
+ assertEquals("FileDetail for \"" + expectedFileName + "\" has unexpected size",
+ file.length(),
+ details.getSize());
break;
}
}
@@ -199,6 +243,7 @@ public class RolloverWatcherTest extends QpidTestCase
}
}
+ @Test
public void testGetFilesAsZippedContentWithNonLogFile() throws Exception
{
String[] fileNames = createTestRolledFilesAndNotifyWatcher();
@@ -212,6 +257,7 @@ public class RolloverWatcherTest extends QpidTestCase
assertZippedContent(expectedFiles, content);
}
+ @Test
public void testGetFilesAsZippedContent() throws Exception
{
String[] fileNames = createTestRolledFilesAndNotifyWatcher();
@@ -221,6 +267,7 @@ public class RolloverWatcherTest extends QpidTestCase
assertZippedContent(requestedFiles, content);
}
+ @Test
public void testGetFilesAsZippedContentWithNonExistingFile() throws Exception
{
String[] fileNames = createTestRolledFilesAndNotifyWatcher();
@@ -232,6 +279,7 @@ public class RolloverWatcherTest extends QpidTestCase
assertZippedContent(expectedFiles, content);
}
+ @Test
public void testGetAllFilesAsZippedContent() throws Exception
{
String[] fileNames = createTestRolledFilesAndNotifyWatcher();
@@ -273,11 +321,16 @@ public class RolloverWatcherTest extends QpidTestCase
unzippedContent.put(zipEntry.getName(), new String(output.toByteArray()));
}
- assertEquals("ZippedContent has unexpected number of entries.", expectedZipEntries.length, unzippedContent.size());
+ assertEquals("ZippedContent has unexpected number of entries.",
+ (long) expectedZipEntries.length,
+ (long) unzippedContent.size());
for (String fileName : expectedZipEntries)
{
- assertTrue("ZippedContent does not contain expected file \"" + fileName + "\".", unzippedContent.containsKey(fileName));
- assertEquals("ZippedContent entry \"" + fileName + "\" has unexpected content.", fileName, unzippedContent.get(fileName));
+ assertTrue("ZippedContent does not contain expected file \"" + fileName + "\".",
+ unzippedContent.containsKey(fileName));
+ assertEquals("ZippedContent entry \"" + fileName + "\" has unexpected content.",
+ fileName,
+ unzippedContent.get(fileName));
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/StartupAppenderTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/StartupAppenderTest.java b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/StartupAppenderTest.java
index db21af2..e80ed63 100644
--- a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/StartupAppenderTest.java
+++ b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/StartupAppenderTest.java
@@ -21,6 +21,8 @@
package org.apache.qpid.server.logging.logback;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -38,20 +40,22 @@ import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.Appender;
+import org.junit.Before;
+import org.junit.Test;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class StartupAppenderTest extends QpidTestCase
+public class StartupAppenderTest extends UnitTestBase
{
private StartupAppender _startupAppender;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_startupAppender = createAndStartStartupAppender();
}
+ @Test
public void testLogToConsole() throws Exception
{
ILoggingEvent event1 = createMockLoggingEvent("org.apache.qpid.Test", Level.WARN, "Test1", "Test-Thread-1");
@@ -65,12 +69,13 @@ public class StartupAppenderTest extends QpidTestCase
List<String> lines = logToConsoleAndCollectSystemOutputLines();
- assertEquals("Unexpected number of log events", 2, lines.size());
+ assertEquals("Unexpected number of log events", (long) 2, (long) lines.size());
assertTrue(lines.get(0).contains("Test1"));
assertTrue(lines.get(1).contains("Test3"));
}
- @SuppressWarnings(value = "unchecked")
+ @SuppressWarnings("unchecked")
+ @Test
public void testReplayAccumulatedEvents()
{
ILoggingEvent event1 = createMockLoggingEvent("org.apache.qpid.Test", Level.DEBUG, "Test1", "Test-Thread-1");
@@ -86,6 +91,7 @@ public class StartupAppenderTest extends QpidTestCase
}
+ @Test
public void testLogToConsoleWithOverriddenLogLevel() throws Exception
{
setTestSystemProperty(StartupAppender.PROPERTY_STARTUP_FAILOVER_CONSOLE_LOG_LEVEL, "DEBUG");
@@ -103,7 +109,7 @@ public class StartupAppenderTest extends QpidTestCase
List<String> lines = logToConsoleAndCollectSystemOutputLines();
- assertEquals("Unexpected number of log events", 4, lines.size());
+ assertEquals("Unexpected number of log events", (long) 4, (long) lines.size());
assertTrue(lines.get(0).contains("Test1"));
assertTrue(lines.get(1).contains("Test2"));
assertTrue(lines.get(2).contains("Test3"));
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLogEventExcludingFilterTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLogEventExcludingFilterTest.java b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLogEventExcludingFilterTest.java
index b6f686c..317e51d 100644
--- a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLogEventExcludingFilterTest.java
+++ b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLogEventExcludingFilterTest.java
@@ -20,6 +20,8 @@
*/
package org.apache.qpid.server.logging.logback;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -31,78 +33,99 @@ import javax.security.auth.Subject;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.spi.FilterReply;
+import org.junit.Before;
+import org.junit.Test;
-import org.apache.qpid.server.logging.logback.VirtualHostLogEventExcludingFilter;
import org.apache.qpid.server.model.BrokerLogger;
import org.apache.qpid.server.virtualhost.VirtualHostPrincipal;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class VirtualHostLogEventExcludingFilterTest extends QpidTestCase
+public class VirtualHostLogEventExcludingFilterTest extends UnitTestBase
{
private BrokerLogger<?> _brokerLogger;
private ILoggingEvent _loggingEvent;
private VirtualHostLogEventExcludingFilter _filter;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_brokerLogger = mock(BrokerLogger.class);
_loggingEvent = mock(ILoggingEvent.class);
_filter = new VirtualHostLogEventExcludingFilter(_brokerLogger);
}
+ @Test
public void testDecideOnNoVirtualHostPrincipalInSubjectAndVirtualHostLogEventNotExcluded() throws Exception
{
Subject subject = new Subject();
subject.getPrincipals().add(mock(Principal.class));
FilterReply reply = doTestDecide(subject);
- assertEquals("Unexpected reply for BrokerLogger#virtualHostLogEventExcluded=false and no VH principal in subject",
- FilterReply.NEUTRAL, reply);
+ assertEquals(
+ "Unexpected reply for BrokerLogger#virtualHostLogEventExcluded=false and no VH principal in subject",
+ FilterReply.NEUTRAL,
+ reply);
+
}
+ @Test
public void testDecideOnNoVirtualHostPrincipalInSubjectAndVirtualHostLogEventExcluded() throws Exception
{
when(_brokerLogger.isVirtualHostLogEventExcluded()).thenReturn(true);
Subject subject = new Subject();
subject.getPrincipals().add(mock(Principal.class));
FilterReply reply = doTestDecide(subject);
- assertEquals("Unexpected reply for BrokerLogger#virtualHostLogEventExcluded=true and no VH principal in subject",
- FilterReply.NEUTRAL, reply);
+ assertEquals(
+ "Unexpected reply for BrokerLogger#virtualHostLogEventExcluded=true and no VH principal in subject",
+ FilterReply.NEUTRAL,
+ reply);
}
+ @Test
public void testDecideOnVirtualHostPrincipalInSubjectAndVirtualHostLogEventNotExcluded() throws Exception
{
Subject subject = new Subject();
subject.getPrincipals().add(mock(VirtualHostPrincipal.class));
FilterReply reply = doTestDecide(subject);
- assertEquals("Unexpected reply for BrokerLogger#virtualHostLogEventExcluded=false and VH principal in subject",
- FilterReply.NEUTRAL, reply);
+ assertEquals(
+ "Unexpected reply for BrokerLogger#virtualHostLogEventExcluded=false and VH principal in subject",
+ FilterReply.NEUTRAL,
+ reply);
}
+ @Test
public void testDecideOnVirtualHostPrincipalInSubjectAndVirtualHostLogEventExcluded() throws Exception
{
when(_brokerLogger.isVirtualHostLogEventExcluded()).thenReturn(true);
Subject subject = new Subject();
subject.getPrincipals().add(mock(VirtualHostPrincipal.class));
FilterReply reply = doTestDecide(subject);
- assertEquals("Unexpected reply for BrokerLogger#virtualHostLogEventExcluded=true and VH principal in subject",
- FilterReply.DENY, reply);
+ assertEquals(
+ "Unexpected reply for BrokerLogger#virtualHostLogEventExcluded=true and VH principal in subject",
+ FilterReply.DENY,
+ reply);
}
+ @Test
public void testDecideOnVirtualHostLogEventNotExcludedAndNullSubject() throws Exception
{
FilterReply reply = _filter.decide(_loggingEvent);
- assertEquals(" BrokerLogger#virtualHostLogEventExcluded=false and subject=null", FilterReply.NEUTRAL, reply);
- assertNull("Subject should not be set in test environment", Subject.getSubject(AccessController.getContext()));
+ assertEquals(" BrokerLogger#virtualHostLogEventExcluded=false and subject=null",
+ FilterReply.NEUTRAL,
+ reply);
+ assertNull("Subject should not be set in test environment",
+ Subject.getSubject(AccessController.getContext()));
}
+ @Test
public void testDecideOnVirtualHostLogEventExcludedAndNullSubject() throws Exception
{
when(_brokerLogger.isVirtualHostLogEventExcluded()).thenReturn(true);
FilterReply reply = _filter.decide(_loggingEvent);
- assertEquals(" BrokerLogger#virtualHostLogEventExcluded=true and subject=null", FilterReply.NEUTRAL, reply);
- assertNull("Subject should not be set in test environment", Subject.getSubject(AccessController.getContext()));
+ assertEquals(" BrokerLogger#virtualHostLogEventExcluded=true and subject=null",
+ FilterReply.NEUTRAL,
+ reply);
+ assertNull("Subject should not be set in test environment",
+ Subject.getSubject(AccessController.getContext()));
}
private FilterReply doTestDecide(Subject subject)
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLoggerTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLoggerTest.java b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLoggerTest.java
index f3faffc..9cd651d 100644
--- a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLoggerTest.java
+++ b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostLoggerTest.java
@@ -20,6 +20,9 @@
*/
package org.apache.qpid.server.logging.logback;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -33,6 +36,9 @@ import java.util.Map;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.Appender;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -54,11 +60,11 @@ import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.security.AccessControl;
import org.apache.qpid.server.store.DurableConfigurationStore;
import org.apache.qpid.server.store.preferences.PreferenceStore;
-import org.apache.qpid.server.virtualhost.TestMemoryVirtualHost;
-import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.server.util.FileUtils;
+import org.apache.qpid.server.virtualhost.TestMemoryVirtualHost;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class VirtualHostLoggerTest extends QpidTestCase
+public class VirtualHostLoggerTest extends UnitTestBase
{
private VirtualHost<?> _virtualHost;
private TaskExecutor _taskExecutor;
@@ -66,10 +72,9 @@ public class VirtualHostLoggerTest extends QpidTestCase
private File _logFile;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_taskExecutor = new TaskExecutorImpl();
_taskExecutor.start();
@@ -105,7 +110,7 @@ public class VirtualHostLoggerTest extends QpidTestCase
// use real VH object rather then mock in order to test create/start/stop functionality
Map<String, Object> attributes = new HashMap<>();
- attributes.put(VirtualHost.NAME, getName());
+ attributes.put(VirtualHost.NAME, getTestName());
attributes.put(VirtualHost.TYPE, TestMemoryVirtualHost.VIRTUAL_HOST_TYPE);
_virtualHost = new TestMemoryVirtualHost(attributes, node);
_virtualHost.open();
@@ -118,24 +123,24 @@ public class VirtualHostLoggerTest extends QpidTestCase
}
}
- @Override
+ @After
public void tearDown() throws Exception
{
try
{
_virtualHost.close();
_taskExecutor.stopImmediately();
+ }
+ finally
+ {
if (_baseFolder != null && _baseFolder.exists())
{
FileUtils.delete(_baseFolder, true);
}
}
- finally
- {
- super.tearDown();
- }
}
+ @Test
public void testAddLoggerWithDefaultSettings()
{
VirtualHostLogger logger = createVirtualHostLogger();
@@ -150,6 +155,7 @@ public class VirtualHostLoggerTest extends QpidTestCase
assertTrue("Appender was not started", appender.isStarted());
}
+ @Test
public void testAddLoggerWithRollDailyOn()
{
VirtualHostLogger logger = createVirtualHostLogger(Collections.<String, Object>singletonMap("rollDaily", true));
@@ -164,6 +170,7 @@ public class VirtualHostLoggerTest extends QpidTestCase
assertTrue("Appender was not started", appender.isStarted());
}
+ @Test
public void testDeleteLogger()
{
VirtualHostLogger logger = createVirtualHostLogger();
@@ -180,6 +187,7 @@ public class VirtualHostLoggerTest extends QpidTestCase
}
+ @Test
public void testLoggersRemovedOnVirtualHostStop()
{
VirtualHostLogger logger = createVirtualHostLogger();
@@ -190,6 +198,7 @@ public class VirtualHostLoggerTest extends QpidTestCase
assertNull("Appender was not deleted", appender);
}
+ @Test
public void testLoggersRemovedOnVirtualHostClose()
{
VirtualHostLogger logger = createVirtualHostLogger();
@@ -200,6 +209,7 @@ public class VirtualHostLoggerTest extends QpidTestCase
assertNull("Appender was not deleted", appender);
}
+ @Test
public void testGetLogFiles()
{
VirtualHostFileLogger logger = (VirtualHostFileLogger)createVirtualHostLogger();
@@ -215,6 +225,7 @@ public class VirtualHostLoggerTest extends QpidTestCase
}
}
+ @Test
public void testGetLogFilesOnResolutionErrors()
{
VirtualHostFileLogger logger = createErrorredLogger();
@@ -223,6 +234,7 @@ public class VirtualHostLoggerTest extends QpidTestCase
assertTrue("File details should be empty", logFileDetails.isEmpty());
}
+ @Test
public void testStopLoggingLoggerInErroredState()
{
VirtualHostFileLogger logger = createErrorredLogger();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRuleImplTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRuleImplTest.java b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRuleImplTest.java
index 2c6135a..56db726 100644
--- a/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRuleImplTest.java
+++ b/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/VirtualHostNameAndLevelLogInclusionRuleImplTest.java
@@ -20,6 +20,9 @@
*/
package org.apache.qpid.server.logging.logback;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -31,33 +34,31 @@ import java.util.Map;
import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.filter.Filter;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.configuration.updater.TaskExecutorImpl;
import org.apache.qpid.server.logging.LogLevel;
-import org.apache.qpid.server.logging.logback.BrokerNameAndLevelLogInclusionRule;
-import org.apache.qpid.server.logging.logback.LoggerNameAndLevelFilter;
-import org.apache.qpid.server.logging.logback.VirtualHostNameAndLevelLogInclusionRule;
-import org.apache.qpid.server.logging.logback.VirtualHostNameAndLevelLogInclusionRuleImpl;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.Model;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.VirtualHostLogger;
import org.apache.qpid.server.model.VirtualHostNode;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class VirtualHostNameAndLevelLogInclusionRuleImplTest extends QpidTestCase
+public class VirtualHostNameAndLevelLogInclusionRuleImplTest extends UnitTestBase
{
private VirtualHostLogger _virtualHostLogger;
private TaskExecutor _taskExecutor;
private final VirtualHost _virtualhost = mock(VirtualHost.class);
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_taskExecutor = new TaskExecutorImpl();
_taskExecutor.start();
@@ -86,7 +87,7 @@ public class VirtualHostNameAndLevelLogInclusionRuleImplTest extends QpidTestCas
doReturn(VirtualHostLogger.class).when(_virtualHostLogger).getCategoryClass();
}
- @Override
+ @After
public void tearDown() throws Exception
{
try
@@ -95,24 +96,26 @@ public class VirtualHostNameAndLevelLogInclusionRuleImplTest extends QpidTestCas
}
finally
{
- super.tearDown();
}
}
+ @Test
public void testAsFilter()
{
VirtualHostNameAndLevelLogInclusionRule<?> rule = createRule("org.apache.qpid", LogLevel.INFO);
Filter<ILoggingEvent> filter = rule.asFilter();
- assertTrue("Unexpected filter instance", filter instanceof LoggerNameAndLevelFilter);
+ final boolean condition = filter instanceof LoggerNameAndLevelFilter;
+ assertTrue("Unexpected filter instance", condition);
LoggerNameAndLevelFilter f = (LoggerNameAndLevelFilter)filter;
assertEquals("Unexpected log level", Level.INFO, f.getLevel());
assertEquals("Unexpected logger name", "org.apache.qpid", f.getLoggerName());
}
+ @Test
public void testLevelChangeAffectsFilter()
{
VirtualHostNameAndLevelLogInclusionRule<?> rule = createRule("org.apache.qpid", LogLevel.INFO);
@@ -125,6 +128,7 @@ public class VirtualHostNameAndLevelLogInclusionRuleImplTest extends QpidTestCas
assertEquals("Unexpected log level attribute", Level.DEBUG, filter.getLevel());
}
+ @Test
public void testLoggerNameChangeNotAllowed()
{
VirtualHostNameAndLevelLogInclusionRule<?> rule = createRule("org.apache.qpid", LogLevel.INFO);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/GunzipOutputStreamTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/GunzipOutputStreamTest.java b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/GunzipOutputStreamTest.java
index cc03067..3711d1c 100644
--- a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/GunzipOutputStreamTest.java
+++ b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/GunzipOutputStreamTest.java
@@ -21,17 +21,19 @@
package org.apache.qpid.server.management.plugin;
import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
import java.io.ByteArrayOutputStream;
import java.nio.ByteBuffer;
import javax.xml.bind.DatatypeConverter;
-import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.server.util.GZIPUtils;
+import org.junit.Test;
+import org.apache.qpid.server.util.GZIPUtils;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class GunzipOutputStreamTest extends QpidTestCase
+public class GunzipOutputStreamTest extends UnitTestBase
{
// base64 encoded content of 'gzip -N test.txt' containing text: This is test
private static final String GZIP_CONTENT_WITH_EMBEDDED_FILE_NAME =
@@ -45,6 +47,7 @@ public class GunzipOutputStreamTest extends QpidTestCase
private static final String TEST_TEXT = "This is test";
private static final String TEST_TEXT2 = "Another test text";
+ @Test
public void testDecompressing() throws Exception
{
final byte[] originalUncompressedInput = generateTestBytes();
@@ -58,6 +61,7 @@ public class GunzipOutputStreamTest extends QpidTestCase
assertArrayEquals("Unexpected content", originalUncompressedInput, outputStream.toByteArray());
}
+ @Test
public void testDecompressingWithEmbeddedFileName() throws Exception
{
byte[] data = DatatypeConverter.parseBase64Binary(GZIP_CONTENT_WITH_EMBEDDED_FILE_NAME);
@@ -70,6 +74,7 @@ public class GunzipOutputStreamTest extends QpidTestCase
assertEquals("Unexpected content", TEST_TEXT, new String(outputStream.toByteArray()));
}
+ @Test
public void testDecompressingMultipleMembers() throws Exception
{
byte[] data = DatatypeConverter.parseBase64Binary(GZIP_CONTENT_WITH_MULTIPLE_MEMBERS);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java
index 443a92f..8f88cec 100644
--- a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java
+++ b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java
@@ -20,6 +20,7 @@
*/
package org.apache.qpid.server.management.plugin;
+import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -27,6 +28,9 @@ import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.configuration.updater.TaskExecutorImpl;
import org.apache.qpid.server.logging.EventLogger;
@@ -36,18 +40,17 @@ import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.ConfiguredObjectFactory;
import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
import org.apache.qpid.server.model.State;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class HttpManagementTest extends QpidTestCase
+public class HttpManagementTest extends UnitTestBase
{
private UUID _id;
private Broker _broker;
private HttpManagement _management;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_id = UUID.randomUUID();
_broker = mock(Broker.class);
ConfiguredObjectFactory objectFactory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance());
@@ -75,37 +78,49 @@ public class HttpManagementTest extends QpidTestCase
_management.open();
}
+ @Test
public void testGetSessionTimeout()
{
- assertEquals("Unexpected session timeout", 10000l, _management.getSessionTimeout());
+ assertEquals("Unexpected session timeout", 10000l, (long) _management.getSessionTimeout());
}
+ @Test
public void testGetName()
{
assertEquals("Unexpected name", getTestName(), _management.getName());
}
+ @Test
public void testIsHttpsSaslAuthenticationEnabled()
{
- assertEquals("Unexpected value for the https sasl enabled attribute", true,
- _management.isHttpsSaslAuthenticationEnabled());
+ assertEquals("Unexpected value for the https sasl enabled attribute",
+ true,
+ _management.isHttpsSaslAuthenticationEnabled());
+
}
+ @Test
public void testIsHttpSaslAuthenticationEnabled()
{
- assertEquals("Unexpected value for the http sasl enabled attribute", false, _management.isHttpSaslAuthenticationEnabled());
+ assertEquals("Unexpected value for the http sasl enabled attribute",
+ false,
+ _management.isHttpSaslAuthenticationEnabled());
}
+ @Test
public void testIsHttpsBasicAuthenticationEnabled()
{
- assertEquals("Unexpected value for the https basic authentication enabled attribute", true,
- _management.isHttpsBasicAuthenticationEnabled());
+ assertEquals("Unexpected value for the https basic authentication enabled attribute",
+ true,
+ _management.isHttpsBasicAuthenticationEnabled());
}
+ @Test
public void testIsHttpBasicAuthenticationEnabled()
{
- assertEquals("Unexpected value for the http basic authentication enabled attribute", false,
- _management.isHttpBasicAuthenticationEnabled());
+ assertEquals("Unexpected value for the http basic authentication enabled attribute",
+ false,
+ _management.isHttpBasicAuthenticationEnabled());
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementUtilTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementUtilTest.java b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementUtilTest.java
index 28b0bc7..060b067 100644
--- a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementUtilTest.java
+++ b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementUtilTest.java
@@ -21,12 +21,19 @@
package org.apache.qpid.server.management.plugin;
-import org.apache.qpid.test.utils.QpidTestCase;
+import static org.junit.Assert.assertEquals;
-public class HttpManagementUtilTest extends QpidTestCase
+import org.junit.Test;
+
+import org.apache.qpid.test.utils.UnitTestBase;
+
+public class HttpManagementUtilTest extends UnitTestBase
{
+ @Test
public void testEnsureFilenameIsRfc2183()
{
- assertEquals("Unexpected conversion", "aBC8-d.json", HttpManagementUtil.ensureFilenameIsRfc2183("aBC8-d.json\n\r\t:/\\"));
+ assertEquals("Unexpected conversion",
+ "aBC8-d.json",
+ HttpManagementUtil.ensureFilenameIsRfc2183("aBC8-d.json\n\r\t:/\\"));
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2InteractiveAuthenticatorTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2InteractiveAuthenticatorTest.java b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2InteractiveAuthenticatorTest.java
index c0045ef..0b5f88a 100644
--- a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2InteractiveAuthenticatorTest.java
+++ b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2InteractiveAuthenticatorTest.java
@@ -20,6 +20,9 @@
*/
package org.apache.qpid.server.management.plugin.auth;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyString;
@@ -51,6 +54,8 @@ import javax.servlet.http.HttpSession;
import org.eclipse.jetty.http.HttpURI;
import org.eclipse.jetty.util.MultiMap;
+import org.junit.Before;
+import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -67,9 +72,9 @@ import org.apache.qpid.server.security.auth.AuthenticationResult;
import org.apache.qpid.server.security.auth.SubjectAuthenticationResult;
import org.apache.qpid.server.security.auth.UsernamePrincipal;
import org.apache.qpid.server.security.auth.manager.oauth2.OAuth2AuthenticationProvider;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class OAuth2InteractiveAuthenticatorTest extends QpidTestCase
+public class OAuth2InteractiveAuthenticatorTest extends UnitTestBase
{
private static final String TEST_AUTHORIZATION_ENDPOINT = "testAuthEndpoint";
private static final int TEST_PORT = 64756;
@@ -94,10 +99,9 @@ public class OAuth2InteractiveAuthenticatorTest extends QpidTestCase
private OAuth2AuthenticationProvider<?> _mockAuthProvider;
private HttpPort _mockPort;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_mockPort = mock(HttpPort.class);
_mockAuthProvider = createMockOAuth2AuthenticationProvider(_mockPort);
@@ -108,6 +112,7 @@ public class OAuth2InteractiveAuthenticatorTest extends QpidTestCase
_authenticator = new OAuth2InteractiveAuthenticator();
}
+ @Test
public void testInitialRedirect() throws Exception
{
Map<String, Object> sessionAttributes = new HashMap<>();
@@ -115,8 +120,11 @@ public class OAuth2InteractiveAuthenticatorTest extends QpidTestCase
Collections.singletonMap("baz", "fnord"), sessionAttributes);
HttpRequestInteractiveAuthenticator.AuthenticationHandler authenticationHandler = _authenticator.getAuthenticationHandler(mockRequest,
_mockConfiguration);
+
assertNotNull("Authenticator does not feel responsible", authenticationHandler);
- assertTrue("Authenticator has failed unexpectedly", !(authenticationHandler instanceof OAuth2InteractiveAuthenticator.FailedAuthenticationHandler));
+ final boolean condition =
+ !(authenticationHandler instanceof OAuth2InteractiveAuthenticator.FailedAuthenticationHandler);
+ assertTrue("Authenticator has failed unexpectedly", condition);
HttpServletResponse mockResponse = mock(HttpServletResponse.class);
authenticationHandler.handleAuthentication(mockResponse);
@@ -131,13 +139,11 @@ public class OAuth2InteractiveAuthenticatorTest extends QpidTestCase
assertEquals("Wrong redirect_uri", TEST_REQUEST_HOST, params.get("redirect_uri"));
assertEquals("Wrong scope", TEST_OAUTH2_SCOPE, params.get("scope"));
String stateAttrName = HttpManagementUtil.getRequestSpecificAttributeName(OAuth2InteractiveAuthenticator.STATE_NAME, mockRequest);
- assertNotNull("State was not set on the session",
- sessionAttributes.get(stateAttrName));
- assertEquals("Wrong state",
- (String) sessionAttributes.get(stateAttrName),
- params.get("state"));
+ assertNotNull("State was not set on the session", sessionAttributes.get(stateAttrName));
+ assertEquals("Wrong state", (String) sessionAttributes.get(stateAttrName), params.get("state"));
}
+ @Test
public void testValidLogin() throws Exception
{
Map<String, Object> sessionAttributes = new HashMap<>();
@@ -152,7 +158,9 @@ public class OAuth2InteractiveAuthenticatorTest extends QpidTestCase
HttpRequestInteractiveAuthenticator.AuthenticationHandler authenticationHandler = _authenticator.getAuthenticationHandler(mockRequest,
_mockConfiguration);
assertNotNull("Authenticator does not feel responsible", authenticationHandler);
- assertTrue("Authenticator has failed unexpectedly", !(authenticationHandler instanceof OAuth2InteractiveAuthenticator.FailedAuthenticationHandler));
+ final boolean condition1 =
+ !(authenticationHandler instanceof OAuth2InteractiveAuthenticator.FailedAuthenticationHandler);
+ assertTrue("Authenticator has failed unexpectedly", condition1);
HttpServletResponse mockResponse = mock(HttpServletResponse.class);
authenticationHandler.handleAuthentication(mockResponse);
@@ -163,11 +171,15 @@ public class OAuth2InteractiveAuthenticatorTest extends QpidTestCase
assertEquals("Wrong redirect", TEST_REQUEST, argument.getValue());
String attrSubject = HttpManagementUtil.getRequestSpecificAttributeName(ATTR_SUBJECT, mockRequest);
assertNotNull("No subject on session", sessionAttributes.get(attrSubject));
- assertTrue("Subject on session is no a Subject", sessionAttributes.get(attrSubject) instanceof Subject);
+ final boolean condition = sessionAttributes.get(attrSubject) instanceof Subject;
+ assertTrue("Subject on session is no a Subject", condition);
final Set<Principal> principals = ((Subject) sessionAttributes.get(attrSubject)).getPrincipals();
- assertEquals("Subject created with unexpected principal", TEST_AUTHORIZED_USER, principals.iterator().next().getName());
+ assertEquals("Subject created with unexpected principal",
+ TEST_AUTHORIZED_USER,
+ principals.iterator().next().getName());
}
+ @Test
public void testNoStateOnSession() throws Exception
{
Map<String, Object> sessionAttributes = new HashMap<>();
@@ -181,9 +193,12 @@ public class OAuth2InteractiveAuthenticatorTest extends QpidTestCase
HttpRequestInteractiveAuthenticator.AuthenticationHandler authenticationHandler = _authenticator.getAuthenticationHandler(mockRequest,
_mockConfiguration);
assertNotNull("Authenticator does not feel responsible", authenticationHandler);
- assertTrue("Authenticator did not fail with no state on session", authenticationHandler instanceof OAuth2InteractiveAuthenticator.FailedAuthenticationHandler);
+ final boolean condition =
+ authenticationHandler instanceof OAuth2InteractiveAuthenticator.FailedAuthenticationHandler;
+ assertTrue("Authenticator did not fail with no state on session", condition);
}
+ @Test
public void testNoStateOnRequest() throws Exception
{
Map<String, Object> sessionAttributes = new HashMap<>();
@@ -197,9 +212,12 @@ public class OAuth2InteractiveAuthenticatorTest extends QpidTestCase
HttpRequestInteractiveAuthenticator.AuthenticationHandler authenticationHandler = _authenticator.getAuthenticationHandler(mockRequest,
_mockConfiguration);
assertNotNull("Authenticator does not feel responsible", authenticationHandler);
- assertTrue("Authenticator did not fail with no state on request", authenticationHandler instanceof OAuth2InteractiveAuthenticator.FailedAuthenticationHandler);
+ final boolean condition =
+ authenticationHandler instanceof OAuth2InteractiveAuthenticator.FailedAuthenticationHandler;
+ assertTrue("Authenticator did not fail with no state on request", condition);
}
+ @Test
public void testWrongStateOnRequest() throws Exception
{
Map<String, Object> sessionAttributes = new HashMap<>();
@@ -214,9 +232,12 @@ public class OAuth2InteractiveAuthenticatorTest extends QpidTestCase
HttpRequestInteractiveAuthenticator.AuthenticationHandler authenticationHandler = _authenticator.getAuthenticationHandler(mockRequest,
_mockConfiguration);
assertNotNull("Authenticator does not feel responsible", authenticationHandler);
- assertTrue("Authenticator did not fail with wrong state on request", authenticationHandler instanceof OAuth2InteractiveAuthenticator.FailedAuthenticationHandler);
+ final boolean condition =
+ authenticationHandler instanceof OAuth2InteractiveAuthenticator.FailedAuthenticationHandler;
+ assertTrue("Authenticator did not fail with wrong state on request", condition);
}
+ @Test
public void testInvalidAuthorizationCode() throws Exception
{
Map<String, Object> sessionAttributes = new HashMap<>();
@@ -230,8 +251,11 @@ public class OAuth2InteractiveAuthenticatorTest extends QpidTestCase
HttpRequestInteractiveAuthenticator.AuthenticationHandler authenticationHandler = _authenticator.getAuthenticationHandler(mockRequest,
_mockConfiguration);
+
assertNotNull("Authenticator does not feel responsible", authenticationHandler);
- assertTrue("Authenticator has failed unexpectedly", !(authenticationHandler instanceof OAuth2InteractiveAuthenticator.FailedAuthenticationHandler));
+ final boolean condition =
+ !(authenticationHandler instanceof OAuth2InteractiveAuthenticator.FailedAuthenticationHandler);
+ assertTrue("Authenticator has failed unexpectedly", condition);
HttpServletResponse mockResponse = mock(HttpServletResponse.class);
authenticationHandler.handleAuthentication(mockResponse);
@@ -239,6 +263,7 @@ public class OAuth2InteractiveAuthenticatorTest extends QpidTestCase
}
+ @Test
public void testUnauthorizedAuthorizationCode() throws Exception
{
Map<String, Object> sessionAttributes = new HashMap<>();
@@ -253,7 +278,9 @@ public class OAuth2InteractiveAuthenticatorTest extends QpidTestCase
HttpRequestInteractiveAuthenticator.AuthenticationHandler authenticationHandler = _authenticator.getAuthenticationHandler(mockRequest,
_mockConfiguration);
assertNotNull("Authenticator does not feel responsible", authenticationHandler);
- assertTrue("Authenticator has failed unexpectedly", !(authenticationHandler instanceof OAuth2InteractiveAuthenticator.FailedAuthenticationHandler));
+ final boolean condition =
+ !(authenticationHandler instanceof OAuth2InteractiveAuthenticator.FailedAuthenticationHandler);
+ assertTrue("Authenticator has failed unexpectedly", condition);
HttpServletResponse mockResponse = mock(HttpServletResponse.class);
authenticationHandler.handleAuthentication(mockResponse);
@@ -269,7 +296,10 @@ public class OAuth2InteractiveAuthenticatorTest extends QpidTestCase
Map<String,String> parameters = new HashMap<>(parameterMap.size());
for (Map.Entry<String, List<String>> paramEntry : parameterMap.entrySet())
{
- assertEquals(String.format("param '%s' specified more than once", paramEntry.getKey()), 1, paramEntry.getValue().size());
+ assertEquals(String.format("param '%s' specified more than once", paramEntry.getKey()),
+ (long) 1,
+ (long) paramEntry.getValue().size());
+
parameters.put(paramEntry.getKey(), paramEntry.getValue().get(0));
}
return parameters;
@@ -349,7 +379,7 @@ public class OAuth2InteractiveAuthenticatorTest extends QpidTestCase
public Object answer(final InvocationOnMock invocationOnMock) throws Throwable
{
final Object[] arguments = invocationOnMock.getArguments();
- assertEquals("Unexpected number of arguments", 1, arguments.length);
+ assertEquals("Unexpected number of arguments", (long) 1, (long) arguments.length);
final String paramName = (String) arguments[0];
return new String[]{query.get(paramName)};
}
@@ -383,7 +413,7 @@ public class OAuth2InteractiveAuthenticatorTest extends QpidTestCase
public Object answer(final InvocationOnMock invocation) throws Throwable
{
final Object[] arguments = invocation.getArguments();
- assertEquals(2, arguments.length);
+ assertEquals((long) 2, (long) arguments.length);
sessionAttributes.put((String) arguments[0], arguments[1]);
return null;
}
@@ -394,7 +424,7 @@ public class OAuth2InteractiveAuthenticatorTest extends QpidTestCase
public Object answer(final InvocationOnMock invocation) throws Throwable
{
final Object[] arguments = invocation.getArguments();
- assertEquals(1, arguments.length);
+ assertEquals((long) 1, (long) arguments.length);
return sessionAttributes.get((String) arguments[0]);
}
}).when(httpSession).getAttribute(any(String.class));
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2PreemptiveAuthenticatorTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2PreemptiveAuthenticatorTest.java b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2PreemptiveAuthenticatorTest.java
index f2b1c78..ba8f6ee 100644
--- a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2PreemptiveAuthenticatorTest.java
+++ b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/auth/OAuth2PreemptiveAuthenticatorTest.java
@@ -18,6 +18,9 @@
*/
package org.apache.qpid.server.management.plugin.auth;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
@@ -31,6 +34,9 @@ import java.util.Set;
import javax.security.auth.Subject;
import javax.servlet.http.HttpServletRequest;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.management.plugin.HttpManagementConfiguration;
import org.apache.qpid.server.model.port.HttpPort;
import org.apache.qpid.server.security.SubjectCreator;
@@ -39,9 +45,9 @@ import org.apache.qpid.server.security.auth.AuthenticationResult;
import org.apache.qpid.server.security.auth.SubjectAuthenticationResult;
import org.apache.qpid.server.security.auth.UsernamePrincipal;
import org.apache.qpid.server.security.auth.manager.oauth2.OAuth2AuthenticationProvider;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class OAuth2PreemptiveAuthenticatorTest extends QpidTestCase
+public class OAuth2PreemptiveAuthenticatorTest extends UnitTestBase
{
private static final String TEST_AUTHORIZED_USER = "testAuthorizedUser";
private static final String TEST_UNAUTHORIZED_USER = "testUnauthorizedUser";
@@ -53,10 +59,9 @@ public class OAuth2PreemptiveAuthenticatorTest extends QpidTestCase
private HttpManagementConfiguration _mockConfiguration;
private HttpPort _mockPort;
- @Override
- protected void setUp() throws Exception
+ @Before
+ public void setUp() throws Exception
{
- super.setUp();
_mockPort = mock(HttpPort.class);
_mockConfiguration = mock(HttpManagementConfiguration.class);
OAuth2AuthenticationProvider<?> mockAuthProvider = createMockOAuth2AuthenticationProvider(_mockPort);
@@ -66,6 +71,7 @@ public class OAuth2PreemptiveAuthenticatorTest extends QpidTestCase
_authenticator = new OAuth2PreemptiveAuthenticator();
}
+ @Test
public void testAttemptAuthenticationSuccessful() throws Exception
{
HttpServletRequest mockRequest = mock(HttpServletRequest.class);
@@ -73,9 +79,13 @@ public class OAuth2PreemptiveAuthenticatorTest extends QpidTestCase
Subject subject = _authenticator.attemptAuthentication(mockRequest, _mockConfiguration);
assertNotNull("Authenticator failed unexpectedly", subject);
final Set<Principal> principals = subject.getPrincipals();
- assertEquals("Subject created with unexpected principal", TEST_AUTHORIZED_USER, principals.iterator().next().getName());
+ assertEquals("Subject created with unexpected principal",
+ TEST_AUTHORIZED_USER,
+ principals.iterator().next().getName());
+
}
+ @Test
public void testAttemptAuthenticationUnauthorizedUser() throws Exception
{
HttpServletRequest mockRequest = mock(HttpServletRequest.class);
@@ -83,9 +93,12 @@ public class OAuth2PreemptiveAuthenticatorTest extends QpidTestCase
Subject subject = _authenticator.attemptAuthentication(mockRequest, _mockConfiguration);
assertNotNull("Authenticator failed unexpectedly", subject);
final Set<Principal> principals = subject.getPrincipals();
- assertEquals("Subject created with unexpected principal", TEST_UNAUTHORIZED_USER, principals.iterator().next().getName());
+ assertEquals("Subject created with unexpected principal",
+ TEST_UNAUTHORIZED_USER,
+ principals.iterator().next().getName());
}
+ @Test
public void testAttemptAuthenticationInvalidToken() throws Exception
{
HttpServletRequest mockRequest = mock(HttpServletRequest.class);
@@ -94,6 +107,7 @@ public class OAuth2PreemptiveAuthenticatorTest extends QpidTestCase
assertNull("Authenticator did not fail with invalid access token", subject);
}
+ @Test
public void testAttemptAuthenticationMissingHeader() throws Exception
{
HttpServletRequest mockRequest = mock(HttpServletRequest.class);
@@ -101,6 +115,7 @@ public class OAuth2PreemptiveAuthenticatorTest extends QpidTestCase
assertNull("Authenticator did not failed without authentication header", subject);
}
+ @Test
public void testAttemptAuthenticationMalformedHeader() throws Exception
{
HttpServletRequest mockRequest = mock(HttpServletRequest.class);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/csv/CSVFormatTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/csv/CSVFormatTest.java b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/csv/CSVFormatTest.java
index 2e68c40..036e286 100644
--- a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/csv/CSVFormatTest.java
+++ b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/csv/CSVFormatTest.java
@@ -20,26 +20,32 @@
*/
package org.apache.qpid.server.management.plugin.csv;
+import static org.junit.Assert.assertEquals;
+
import java.io.StringWriter;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.junit.Test;
+
+import org.apache.qpid.test.utils.UnitTestBase;
-public class CSVFormatTest extends QpidTestCase
+public class CSVFormatTest extends UnitTestBase
{
+ @Test
public void testPrintRecord() throws Exception
{
CSVFormat csvFormat = new CSVFormat();
final StringWriter out = new StringWriter();
csvFormat.printRecord(out, Arrays.asList("test", 1, true, "\"quoted\" test"));
assertEquals("Unexpected format",
- String.format("%s,%d,%b,%s%s", "test", 1, true, "\"\"\"quoted\"\" test\"", "\r\n"),
- out.toString());
+ String.format("%s,%d,%b,%s%s", "test", 1, true, "\"\"\"quoted\"\" test\"", "\r\n"),
+ out.toString());
}
+ @Test
public void testPrintRecords() throws Exception
{
CSVFormat csvFormat = new CSVFormat();
@@ -48,11 +54,12 @@ public class CSVFormatTest extends QpidTestCase
Arrays.asList("delimeter,test", 1.0f, false,
"quote\" in the middle")));
assertEquals("Unexpected format",
- String.format("%s,%d,%b,%s%s%s,%s,%b,%s%s", "test", 1, true, "\"\"\"quoted\"\" test\"", "\r\n",
- "\"delimeter,test\"", "1.0", false, "\"quote\"\" in the middle\"", "\r\n"),
- out.toString());
+ String.format("%s,%d,%b,%s%s%s,%s,%b,%s%s", "test", 1, true, "\"\"\"quoted\"\" test\"", "\r\n",
+ "\"delimeter,test\"", "1.0", false, "\"quote\"\" in the middle\"", "\r\n"),
+ out.toString());
}
+ @Test
public void testPrintln() throws Exception
{
CSVFormat csvFormat = new CSVFormat();
@@ -61,6 +68,7 @@ public class CSVFormatTest extends QpidTestCase
assertEquals("Unexpected new line", "\r\n", out.toString());
}
+ @Test
public void testPrint() throws Exception
{
CSVFormat csvFormat = new CSVFormat();
@@ -70,10 +78,11 @@ public class CSVFormatTest extends QpidTestCase
csvFormat.print(out, true, false);
csvFormat.print(out, "\"quoted\" test", false);
assertEquals("Unexpected format ",
- String.format("%s,%d,%b,%s", "test", 1, true, "\"\"\"quoted\"\" test\""),
- out.toString());
+ String.format("%s,%d,%b,%s", "test", 1, true, "\"\"\"quoted\"\" test\""),
+ out.toString());
}
+ @Test
public void testDate() throws Exception
{
Date date = new Date();
@@ -81,18 +90,17 @@ public class CSVFormatTest extends QpidTestCase
CSVFormat csvFormat = new CSVFormat();
final StringWriter out = new StringWriter();
csvFormat.print(out, date, true);
- assertEquals("Unexpected format ",
- simpleDateFormat.format(date),
- out.toString());
+ assertEquals("Unexpected format ", simpleDateFormat.format(date), out.toString());
}
+ @Test
public void testPrintComments() throws Exception
{
CSVFormat csvFormat = new CSVFormat();
final StringWriter out = new StringWriter();
csvFormat.printComments(out, "comment1", "comment2");
assertEquals("Unexpected format of comments",
- String.format("# %s%s# %s%s", "comment1", "\r\n", "comment2", "\r\n"),
- out.toString());
+ String.format("# %s%s# %s%s", "comment1", "\r\n", "comment2", "\r\n"),
+ out.toString());
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/portunification/TlsOrPlainConnectionFactoryTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/portunification/TlsOrPlainConnectionFactoryTest.java b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/portunification/TlsOrPlainConnectionFactoryTest.java
index 0f7c24a..a278fac 100644
--- a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/portunification/TlsOrPlainConnectionFactoryTest.java
+++ b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/portunification/TlsOrPlainConnectionFactoryTest.java
@@ -22,6 +22,8 @@
package org.apache.qpid.server.management.plugin.portunification;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
@@ -44,12 +46,14 @@ import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.util.BufferUtil;
import org.eclipse.jetty.util.Callback;
import org.eclipse.jetty.util.ssl.SslContextFactory;
+import org.junit.Before;
+import org.junit.Test;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class TlsOrPlainConnectionFactoryTest extends QpidTestCase
+public class TlsOrPlainConnectionFactoryTest extends UnitTestBase
{
private SslContextFactory _sslContextFactory;
private Connector _connector;
@@ -58,10 +62,9 @@ public class TlsOrPlainConnectionFactoryTest extends QpidTestCase
private TlsOrPlainConnectionFactory _factory;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_sslContextFactory = mock(SslContextFactory.class);
SSLEngine sslEngine = mock(SSLEngine.class);
@@ -83,6 +86,7 @@ public class TlsOrPlainConnectionFactoryTest extends QpidTestCase
_endPoint = mock(EndPoint.class);
}
+ @Test
public void testOnFillableForTLS() throws Exception
{
AtomicBoolean firstPart = new AtomicBoolean(true);
@@ -118,17 +122,18 @@ public class TlsOrPlainConnectionFactoryTest extends QpidTestCase
ByteBuffer buffer = BufferUtil.allocate(4);
int result = connection.getEndPoint().fill(buffer);
- assertEquals(4, result);
+ assertEquals((long) 4, (long) result);
assertTrue(Arrays.equals(new byte[]{(byte) 22, (byte) 3, (byte) 1, (byte) 0}, buffer.array()));
buffer = BufferUtil.allocate(2);
result = connection.getEndPoint().fill(buffer);
- assertEquals(2, result);
+ assertEquals((long) 2, (long) result);
assertTrue(Arrays.equals(new byte[]{(byte) 0, (byte) 1}, buffer.array()));
verify(_endPoint, times(3)).fill(any());
}
+ @Test
public void testOnFillableForPlain() throws Exception
{
AtomicBoolean firstPart = new AtomicBoolean(true);
@@ -157,13 +162,13 @@ public class TlsOrPlainConnectionFactoryTest extends QpidTestCase
ByteBuffer buffer = BufferUtil.allocate(4);
int result = connection.getEndPoint().fill(buffer);
- assertEquals(4, result);
+ assertEquals((long) 4, (long) result);
assertEquals("HTTP", new String(buffer.array()));
buffer = BufferUtil.allocate(6);
result = connection.getEndPoint().fill(buffer);
- assertEquals(6, result);
+ assertEquals((long) 6, (long) result);
assertEquals(" 1.1\n\n", new String(buffer.array()));
verify(_endPoint, times(2)).fill(any());
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d0dcd3fc/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/report/ReportRunnerTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/report/ReportRunnerTest.java b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/report/ReportRunnerTest.java
index 7c85f39..f99eb69 100644
--- a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/report/ReportRunnerTest.java
+++ b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/report/ReportRunnerTest.java
@@ -20,6 +20,9 @@
*/
package org.apache.qpid.server.management.plugin.report;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -31,6 +34,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -41,10 +45,11 @@ import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.queue.QueueEntry;
import org.apache.qpid.server.queue.QueueEntryVisitor;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class ReportRunnerTest extends QpidTestCase
+public class ReportRunnerTest extends UnitTestBase
{
+ @Test
public void testTextReportCountsMessages()
{
ReportRunner<String> runner = (ReportRunner<String>) ReportRunner.createRunner(TestTextReport.NAME,
@@ -73,6 +78,7 @@ public class ReportRunnerTest extends QpidTestCase
return message;
}
+ @Test
public void testTextReportSingleStringParam()
{
Queue queue2 = createMockQueue(createMockMessageForQueue(), createMockMessageForQueue());
@@ -84,6 +90,7 @@ public class ReportRunnerTest extends QpidTestCase
assertEquals("There are 2 messages on the queue. stringParam = hello world.", runner.runReport(queue2));
}
+ @Test
public void testTextReportSingleStringArrayParam()
{
Queue queue = createMockQueue();
@@ -91,11 +98,13 @@ public class ReportRunnerTest extends QpidTestCase
Map<String, String[]> parameterMap = new HashMap<>();
parameterMap.put("stringArrayParam", new String[] { "hello world", "goodbye"});
ReportRunner<String> runner = (ReportRunner<String>) ReportRunner.createRunner(TestTextReport.NAME, parameterMap);
- assertEquals("There are 0 messages on the queue. stringArrayParam = [hello world, goodbye].", runner.runReport(queue));
+ assertEquals("There are 0 messages on the queue. stringArrayParam = [hello world, goodbye].",
+ runner.runReport(queue));
}
+ @Test
public void testTextReportBothParams()
{
Queue queue = createMockQueue();
@@ -104,10 +113,12 @@ public class ReportRunnerTest extends QpidTestCase
parameterMap.put("stringParam", new String[]{"hello world"});
parameterMap.put("stringArrayParam", new String[] { "hello world", "goodbye"});
ReportRunner<String> runner = (ReportRunner<String>) ReportRunner.createRunner(TestTextReport.NAME, parameterMap);
- assertEquals("There are 0 messages on the queue. stringParam = hello world. stringArrayParam = [hello world, goodbye].", runner.runReport(queue));
-
+ assertEquals(
+ "There are 0 messages on the queue. stringParam = hello world. stringArrayParam = [hello world, goodbye].",
+ runner.runReport(queue));
}
+ @Test
public void testInvalidReportName()
{
try
@@ -121,6 +132,7 @@ public class ReportRunnerTest extends QpidTestCase
}
}
+ @Test
public void testBinaryReportWithLimit() throws Exception
{
Queue queue = createMockQueue(createMessageWithAppProperties(Collections.<String,Object>singletonMap("key",1)),
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org