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:12 UTC
[05/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/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectQueryTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectQueryTest.java b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectQueryTest.java
index a660ec7..670bad8 100644
--- a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectQueryTest.java
+++ b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/query/ConfiguredObjectQueryTest.java
@@ -20,6 +20,8 @@
package org.apache.qpid.server.management.plugin.servlet.query;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -38,13 +40,14 @@ import javax.xml.bind.DatatypeConverter;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
+import org.junit.Test;
import org.apache.qpid.server.filter.OrderByExpression;
import org.apache.qpid.server.filter.SelectorParsingException;
import org.apache.qpid.server.model.ConfiguredObject;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class ConfiguredObjectQueryTest extends QpidTestCase
+public class ConfiguredObjectQueryTest extends UnitTestBase
{
private static final String NUMBER_ATTR = "numberAttr";
private static final String DATE_ATTR = "dateAttr";
@@ -61,6 +64,7 @@ public class ConfiguredObjectQueryTest extends QpidTestCase
private final List<ConfiguredObject<?>> _objects = new ArrayList<>();
private ConfiguredObjectQuery _query;
+ @Test
public void testNoClauses_SingleResult()
{
final UUID objectUuid = UUID.randomUUID();
@@ -77,15 +81,19 @@ public class ConfiguredObjectQueryTest extends QpidTestCase
_query = new ConfiguredObjectQuery(_objects, null, null);
final List<String> headers = _query.getHeaders();
- assertEquals("Unexpected headers", Lists.newArrayList(ConfiguredObject.ID, ConfiguredObject.NAME), headers);
+ assertEquals("Unexpected headers",
+ Lists.newArrayList(ConfiguredObject.ID, ConfiguredObject.NAME),
+ headers);
+
List<List<Object>> results = _query.getResults();
- assertEquals("Unexpected number of results", 1, results.size());
+ assertEquals("Unexpected number of results", (long) 1, (long) results.size());
List<Object> row = results.iterator().next();
assertEquals("Unexpected row", Lists.newArrayList(objectUuid, objectName), row);
}
+ @Test
public void testArithmeticStatementInOrderBy()
{
final List<OrderByExpression> orderByExpressions;
@@ -95,7 +103,7 @@ public class ConfiguredObjectQueryTest extends QpidTestCase
try
{
orderByExpressions = parser.parseOrderBy(orderByClause);
- assertEquals(1, orderByExpressions.size());
+ assertEquals((long) 1, (long) orderByExpressions.size());
}
catch (ParseException | TokenMgrError e)
{
@@ -104,6 +112,7 @@ public class ConfiguredObjectQueryTest extends QpidTestCase
}
+ @Test
public void testInvalidStatementInOrderBy()
{
String orderByClause = "a + b foo";
@@ -120,6 +129,7 @@ public class ConfiguredObjectQueryTest extends QpidTestCase
}
}
+ @Test
public void testNoClauses_TwoResult()
{
final UUID object1Uuid = UUID.randomUUID();
@@ -147,7 +157,7 @@ public class ConfiguredObjectQueryTest extends QpidTestCase
_query = new ConfiguredObjectQuery(_objects, null, null);
List<List<Object>> results = _query.getResults();
- assertEquals("Unexpected number of results", 2, results.size());
+ assertEquals("Unexpected number of results", (long) 2, (long) results.size());
final Iterator<List<Object>> iterator = results.iterator();
List<Object> row1 = iterator.next();
@@ -157,6 +167,7 @@ public class ConfiguredObjectQueryTest extends QpidTestCase
assertEquals("Unexpected row", Lists.newArrayList(object2Uuid, object2Name), row2);
}
+ @Test
public void testSelectClause()
{
final UUID objectUuid = UUID.randomUUID();
@@ -174,7 +185,7 @@ public class ConfiguredObjectQueryTest extends QpidTestCase
null);
List<List<Object>> results = _query.getResults();
- assertEquals("Unexpected number of results", 1, results.size());
+ assertEquals("Unexpected number of results", (long) 1, (long) results.size());
final List<String> headers = _query.getHeaders();
assertEquals("Unexpected headers", Lists.newArrayList(ConfiguredObject.ID, NUMBER_ATTR), headers);
@@ -184,6 +195,7 @@ public class ConfiguredObjectQueryTest extends QpidTestCase
assertEquals("Unexpected row", Lists.newArrayList(objectUuid, 1234), row);
}
+ @Test
public void testSelectClause_NonExistingColumn()
{
ConfiguredObject obj = createCO(new HashMap<String, Object>()
@@ -194,11 +206,12 @@ public class ConfiguredObjectQueryTest extends QpidTestCase
_query = new ConfiguredObjectQuery(_objects, "foo", null);
List<List<Object>> results = _query.getResults();
- assertEquals("Unexpected number of results", 1, results.size());
+ assertEquals("Unexpected number of results", (long) 1, (long) results.size());
assertEquals("Unexpected headers", Collections.singletonList("foo"), _query.getHeaders());
assertEquals("Unexpected row", Collections.singletonList(null), results.get(0));
}
+ @Test
public void testSelectClause_ColumnAliases()
{
final UUID objectUuid = UUID.randomUUID();
@@ -217,7 +230,7 @@ public class ConfiguredObjectQueryTest extends QpidTestCase
null);
List<List<Object>> results = _query.getResults();
- assertEquals("Unexpected number of results", 1, results.size());
+ assertEquals("Unexpected number of results", (long) 1, (long) results.size());
final List<String> headers = _query.getHeaders();
assertEquals("Unexpected headers", Lists.newArrayList(ConfiguredObject.ID, "alias"), headers);
@@ -227,6 +240,7 @@ public class ConfiguredObjectQueryTest extends QpidTestCase
assertEquals("Unexpected row", Lists.newArrayList(objectUuid, "myObj1234"), row);
}
+ @Test
public void testQuery_StringEquality()
{
final UUID objectUuid = UUID.randomUUID();
@@ -250,16 +264,19 @@ public class ConfiguredObjectQueryTest extends QpidTestCase
_query = new ConfiguredObjectQuery(_objects, null, String.format("name = '%s'", objectName));
final List<String> headers = _query.getHeaders();
- assertEquals("Unexpected headers", Lists.newArrayList(ConfiguredObject.ID, ConfiguredObject.NAME), headers);
+ assertEquals("Unexpected headers",
+ Lists.newArrayList(ConfiguredObject.ID, ConfiguredObject.NAME),
+ headers);
List<List<Object>> results = _query.getResults();
- assertEquals("Unexpected number of results", 1, results.size());
+ assertEquals("Unexpected number of results", (long) 1, (long) results.size());
final Iterator<List<Object>> iterator = results.iterator();
List<Object> row = iterator.next();
assertEquals("Unexpected row", objectUuid, row.get(0));
}
+ @Test
public void testQuery_DateInequality()
{
final long now = System.currentTimeMillis();
@@ -288,13 +305,14 @@ public class ConfiguredObjectQueryTest extends QpidTestCase
String.format("%s > NOW()", DATE_ATTR));
List<List<Object>> results = _query.getResults();
- assertEquals("Unexpected number of results", 1, results.size());
+ assertEquals("Unexpected number of results", (long) 1, (long) results.size());
final Iterator<List<Object>> iterator = results.iterator();
List<Object> row = iterator.next();
assertEquals("Unexpected row", objectUuid, row.get(0));
}
+ @Test
public void testQuery_DateEquality()
{
final long now = System.currentTimeMillis();
@@ -325,13 +343,14 @@ public class ConfiguredObjectQueryTest extends QpidTestCase
nowIso8601Str));
List<List<Object>> results = _query.getResults();
- assertEquals("Unexpected number of results", 1, results.size());
+ assertEquals("Unexpected number of results", (long) 1, (long) results.size());
final Iterator<List<Object>> iterator = results.iterator();
List<Object> row = iterator.next();
assertEquals("Unexpected row", objectUuid, row.get(0));
}
+ @Test
public void testQuery_DateExpressions()
{
final UUID objectUuid = UUID.randomUUID();
@@ -352,13 +371,14 @@ public class ConfiguredObjectQueryTest extends QpidTestCase
"-PT10H"));
List<List<Object>> results = _query.getResults();
- assertEquals("Unexpected number of results", 1, results.size());
+ assertEquals("Unexpected number of results", (long) 1, (long) results.size());
final Iterator<List<Object>> iterator = results.iterator();
List<Object> row = iterator.next();
assertEquals("Unexpected row", objectUuid, row.get(0));
}
+ @Test
public void testDateToString()
{
final UUID objectUuid = UUID.randomUUID();
@@ -376,13 +396,14 @@ public class ConfiguredObjectQueryTest extends QpidTestCase
null);
List<List<Object>> results = _query.getResults();
- assertEquals("Unexpected number of results", 1, results.size());
+ assertEquals("Unexpected number of results", (long) 1, (long) results.size());
final Iterator<List<Object>> iterator = results.iterator();
List<Object> row = iterator.next();
assertEquals("Unexpected row", Lists.newArrayList(objectUuid, "1970-01-01T00:00:00Z"), row);
}
+ @Test
public void testDateToFormattedString()
{
final UUID objectUuid = UUID.randomUUID();
@@ -403,13 +424,14 @@ public class ConfiguredObjectQueryTest extends QpidTestCase
null);
List<List<Object>> results = _query.getResults();
- assertEquals("Unexpected number of results", 1, results.size());
+ assertEquals("Unexpected number of results", (long) 1, (long) results.size());
final Iterator<List<Object>> iterator = results.iterator();
List<Object> row = iterator.next();
assertEquals("Unexpected row", Lists.newArrayList(objectUuid, "1970-01-01 UTC"), row);
}
+ @Test
public void testQuery_EnumEquality()
{
final UUID objectUuid = UUID.randomUUID();
@@ -428,7 +450,9 @@ public class ConfiguredObjectQueryTest extends QpidTestCase
String.format("%s = '%s'", ENUM_ATTR, Snakes.PYTHON));
List<List<Object>> results = _query.getResults();
- assertEquals("Unexpected number of results - enumAttr equality with enum constant", 1, results.size());
+ assertEquals("Unexpected number of results - enumAttr equality with enum constant",
+ (long) 1,
+ (long) results.size());
List<Object> row = _query.getResults().iterator().next();
assertEquals("Unexpected row", objectUuid, row.get(0));
@@ -438,7 +462,9 @@ public class ConfiguredObjectQueryTest extends QpidTestCase
String.format("'%s' = %s", Snakes.PYTHON, ENUM_ATTR));
results = _query.getResults();
- assertEquals("Unexpected number of results - enum constant equality with enumAttr", 1, results.size());
+ assertEquals("Unexpected number of results - enum constant equality with enumAttr",
+ (long) 1,
+ (long) results.size());
row = _query.getResults().iterator().next();
assertEquals("Unexpected row", objectUuid, row.get(0));
@@ -448,17 +474,21 @@ public class ConfiguredObjectQueryTest extends QpidTestCase
String.format("%s <> '%s'", ENUM_ATTR, "toad"));
results = _query.getResults();
- assertEquals("Unexpected number of results - enumAttr not equal enum constant", 1, results.size());
+ assertEquals("Unexpected number of results - enumAttr not equal enum constant",
+ (long) 1,
+ (long) results.size());
_query = new ConfiguredObjectQuery(_objects,
String.format("%s", ConfiguredObject.ID),
String.format("%s = %s", ENUM_ATTR, ENUM2_ATTR));
results = _query.getResults();
- assertEquals("Unexpected number of results - two attributes of type enum", 1, results.size());
-
+ assertEquals("Unexpected number of results - two attributes of type enum",
+ (long) 1,
+ (long) results.size());
}
+ @Test
public void testQuery_EnumEquality_InExpresssions()
{
final UUID objectUuid = UUID.randomUUID();
@@ -479,23 +509,28 @@ public class ConfiguredObjectQueryTest extends QpidTestCase
"toad", Snakes.VIPER, Snakes.PYTHON));
List<List<Object>> results = _query.getResults();
- assertEquals("Unexpected number of results - emumAttr with set including the enum's constants", 1, results.size());
+ assertEquals("Unexpected number of results - emumAttr with set including the enum's constants",
+ (long) 1,
+ (long) results.size());
_query = new ConfiguredObjectQuery(_objects,
String.format("%s", ConfiguredObject.ID),
String.format("%s in (%s)", ENUM_ATTR, ENUM2_ATTR));
results = _query.getResults();
- assertEquals("Unexpected number of results - enumAttr with set including enum2Attr", 1, results.size());
+ assertEquals("Unexpected number of results - enumAttr with set including enum2Attr",
+ (long) 1,
+ (long) results.size());
_query = new ConfiguredObjectQuery(_objects,
String.format("%s", ConfiguredObject.ID),
String.format("'%s' in (%s)", Snakes.PYTHON, ENUM_ATTR));
results = _query.getResults();
- assertEquals("Unexpected number of results - attribute within the set", 1, results.size());
+ assertEquals("Unexpected number of results - attribute within the set", (long) 1, (long) results.size());
}
+ @Test
public void testFunctionActualParameterMismatch()
{
try
@@ -511,6 +546,7 @@ public class ConfiguredObjectQueryTest extends QpidTestCase
}
}
+ @Test
public void testSingleOrderByClause()
{
final int NUMBER_OF_OBJECTS = 3;
@@ -547,6 +583,7 @@ public class ConfiguredObjectQueryTest extends QpidTestCase
assertQueryResults(new Object[][]{{null}, {0}, {1}, {2}}, results);
}
+ @Test
public void testAliasInOrderByClause()
{
_objects.add(createCO(new HashMap<String, Object>()
@@ -568,6 +605,7 @@ public class ConfiguredObjectQueryTest extends QpidTestCase
assertQueryResults(new Object[][]{{1}, {2}, {4}}, _query.getResults());
}
+ @Test
public void testExpressionToTermsOfAliasInOrderByClause()
{
_objects.add(createCO(new HashMap<String, Object>()
@@ -586,6 +624,7 @@ public class ConfiguredObjectQueryTest extends QpidTestCase
assertQueryResults(new Object[][]{{"A", "A"}, {"A", "B"}}, _query.getResults());
}
+ @Test
public void testDelimitedAliasInOrderByClause()
{
_objects.add(createCO(new HashMap<String, Object>()
@@ -607,6 +646,7 @@ public class ConfiguredObjectQueryTest extends QpidTestCase
assertQueryResults(new Object[][]{{4}, {2}, {1}}, _query.getResults());
}
+ @Test
public void testTwoOrderByClauses()
{
ConfiguredObject object;
@@ -669,6 +709,7 @@ public class ConfiguredObjectQueryTest extends QpidTestCase
assertQueryResults(new Object[][]{{1, 2}, {1, 1}, {2, 0}}, _query.getResults());
}
+ @Test
public void testOrderByWithInvalidColumnIndex()
{
try
@@ -693,6 +734,7 @@ public class ConfiguredObjectQueryTest extends QpidTestCase
}
+ @Test
public void testLimitWithoutOffset()
{
int numberOfTestObjects = 3;
@@ -735,13 +777,13 @@ public class ConfiguredObjectQueryTest extends QpidTestCase
final List<List<Object>> results)
{
final int rows = expectedAttributes.length;
- assertEquals("Unexpected number of result rows", rows, results.size());
+ assertEquals("Unexpected number of result rows", (long) rows, (long) results.size());
if (rows > 0)
{
final int cols = expectedAttributes[0].length;
for (int row = 0; row < rows; ++row)
{
- assertEquals("Unexpected number of result columns", cols, results.get(row).size());
+ assertEquals("Unexpected number of result columns", (long) cols, (long) results.get(row).size());
for (int col = 0; col < cols; ++col)
{
assertEquals("Unexpected row order", expectedAttributes[row][col], results.get(row).get(col));
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/servlet/rest/ConfiguredObjectToMapConverterTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java
index be224eb..6f26f3e 100644
--- a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java
+++ b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java
@@ -20,6 +20,9 @@
package org.apache.qpid.server.management.plugin.servlet.rest;
import static org.apache.qpid.server.management.plugin.servlet.rest.ConfiguredObjectToMapConverter.STATISTICS_MAP_KEY;
+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.eq;
@@ -36,6 +39,9 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.ConfiguredObjectAttribute;
import org.apache.qpid.server.model.ConfiguredObjectMethodAttribute;
@@ -44,9 +50,9 @@ import org.apache.qpid.server.model.Model;
import org.apache.qpid.server.model.testmodels.hierarchy.TestCar;
import org.apache.qpid.server.model.testmodels.hierarchy.TestElecEngineImpl;
import org.apache.qpid.server.model.testmodels.hierarchy.TestEngine;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class ConfiguredObjectToMapConverterTest extends QpidTestCase
+public class ConfiguredObjectToMapConverterTest extends UnitTestBase
{
private static final String TEST_SYSTEM_PROPERTY1_NAME = "qpid.test.name";
private static final String TEST_SYSTEM_PROPERTY1_ACTUAL_VALUE = "context-test";
@@ -68,12 +74,12 @@ public class ConfiguredObjectToMapConverterTest extends QpidTestCase
private ConfiguredObjectToMapConverter _converter = new ConfiguredObjectToMapConverter();
private ConfiguredObject _configuredObject = mock(ConfiguredObject.class);
- @Override
- protected void setUp() throws Exception
+ @Before
+ public void setUp() throws Exception
{
- super.setUp();
}
+ @Test
public void testConfiguredObjectWithSingleStatistics() throws Exception
{
final String statisticName = "statisticName";
@@ -91,10 +97,11 @@ public class ConfiguredObjectToMapConverterTest extends QpidTestCase
false));
Map<String, Object> statsAsMap = (Map<String, Object>) resultMap.get(STATISTICS_MAP_KEY);
assertNotNull("Statistics should be part of map", statsAsMap);
- assertEquals("Unexpected number of statistics", 1, statsAsMap.size());
+ assertEquals("Unexpected number of statistics", (long) 1, (long) statsAsMap.size());
assertEquals("Unexpected statistic value", statisticValue, statsAsMap.get(statisticName));
}
+ @Test
public void testConfiguredObjectWithSingleNonConfiguredObjectAttribute() throws Exception
{
final String attributeName = "attribute";
@@ -111,7 +118,7 @@ public class ConfiguredObjectToMapConverterTest extends QpidTestCase
120,
false,
false));
- assertEquals("Unexpected number of attributes", 1, resultMap.size());
+ assertEquals("Unexpected number of attributes", (long) 1, (long) resultMap.size());
assertEquals("Unexpected attribute value", attributeValue, resultMap.get(attributeName));
}
@@ -119,6 +126,7 @@ public class ConfiguredObjectToMapConverterTest extends QpidTestCase
* For now, it is the name of the configured object is returned as the attribute value, rather than the
* configured object itself
*/
+ @Test
public void testConfiguredObjectWithSingleConfiguredObjectAttribute() throws Exception
{
final String attributeName = "attribute";
@@ -135,10 +143,12 @@ public class ConfiguredObjectToMapConverterTest extends QpidTestCase
120,
false,
false));
- assertEquals("Unexpected number of attributes", 1, resultMap.size());
+ assertEquals("Unexpected number of attributes", (long) 1, (long) resultMap.size());
assertEquals("Unexpected attribute value", "attributeConfiguredObjectName", resultMap.get(attributeName));
+
}
+ @Test
public void testConfiguredObjectWithChildAndDepth1()
{
final String childAttributeName = "childattribute";
@@ -160,17 +170,18 @@ public class ConfiguredObjectToMapConverterTest extends QpidTestCase
120,
false,
false));
- assertEquals("Unexpected parent map size", 1, resultMap.size());
+ assertEquals("Unexpected parent map size", (long) 1, (long) resultMap.size());
final List<Map<String, Object>> childList = (List<Map<String, Object>>) resultMap.get("testchilds");
- assertEquals("Unexpected number of children", 1, childList.size());
+ assertEquals("Unexpected number of children", (long) 1, (long) childList.size());
final Map<String, Object> childMap = childList.get(0);
- assertEquals("Unexpected child map size", 1, childMap.size());
+ assertEquals("Unexpected child map size", (long) 1, (long) childMap.size());
assertNotNull(childMap);
assertEquals("Unexpected child attribute value", childAttributeValue, childMap.get(childAttributeName));
}
+ @Test
public void testActuals()
{
final String childAttributeName = "childattribute";
@@ -204,15 +215,17 @@ public class ConfiguredObjectToMapConverterTest extends QpidTestCase
120,
false,
true));
- assertEquals("Unexpected parent map size", 2, resultMap.size());
+ assertEquals("Unexpected parent map size", (long) 2, (long) resultMap.size());
assertEquals("Incorrect context", resultMap.get(ConfiguredObject.CONTEXT), actualContext);
List<Map<String, Object>> childList = (List<Map<String, Object>>) resultMap.get("testchilds");
- assertEquals("Unexpected number of children", 1, childList.size());
+ assertEquals("Unexpected number of children", (long) 1, (long) childList.size());
Map<String, Object> childMap = childList.get(0);
assertNotNull(childMap);
- assertEquals("Unexpected child map size", 1, childMap.size());
+ assertEquals("Unexpected child map size", (long) 1, (long) childMap.size());
- assertEquals("Unexpected child attribute value", childActualAttributeValue, childMap.get(childAttributeName));
+ assertEquals("Unexpected child attribute value",
+ childActualAttributeValue,
+ childMap.get(childAttributeName));
resultMap = _converter.convertObjectToMap(_configuredObject,
ConfiguredObject.class,
@@ -221,20 +234,20 @@ public class ConfiguredObjectToMapConverterTest extends QpidTestCase
120,
false,
true));
- assertEquals("Unexpected parent map size", 2, resultMap.size());
+ assertEquals("Unexpected parent map size", (long) 2, (long) resultMap.size());
Map<String, Object> effectiveContext = new HashMap<>();
effectiveContext.put("key","value");
assertEquals("Incorrect context", effectiveContext, resultMap.get(ConfiguredObject.CONTEXT));
childList = (List<Map<String, Object>>) resultMap.get("testchilds");
- assertEquals("Unexpected number of children", 1, childList.size());
+ assertEquals("Unexpected number of children", (long) 1, (long) childList.size());
childMap = childList.get(0);
- assertEquals("Unexpected child map size", 1, childMap.size());
+ assertEquals("Unexpected child map size", (long) 1, (long) childMap.size());
assertNotNull(childMap);
assertEquals("Unexpected child attribute value", childAttributeValue, childMap.get(childAttributeName));
-
}
+ @Test
public void testOversizedAttributes()
{
@@ -264,14 +277,14 @@ public class ConfiguredObjectToMapConverterTest extends QpidTestCase
false));
Object children = resultMap.get("testchilds");
assertNotNull(children);
- assertTrue(children instanceof Collection);
- assertTrue(((Collection)children).size()==1);
+ final boolean condition5 = children instanceof Collection;
+ assertTrue(condition5);
+ assertTrue(((Collection)children).size() == 1);
Object attrs = ((Collection)children).iterator().next();
- assertTrue(attrs instanceof Map);
+ final boolean condition4 = attrs instanceof Map;
+ assertTrue(condition4);
assertEquals("this is not long", ((Map) attrs).get("longAttr"));
-
-
resultMap = _converter.convertObjectToMap(_configuredObject,
ConfiguredObject.class,
new ConfiguredObjectToMapConverter.ConverterOptions(1,
@@ -282,15 +295,14 @@ public class ConfiguredObjectToMapConverterTest extends QpidTestCase
children = resultMap.get("testchilds");
assertNotNull(children);
- assertTrue(children instanceof Collection);
- assertTrue(((Collection)children).size()==1);
+ final boolean condition3 = children instanceof Collection;
+ assertTrue(condition3);
+ assertTrue(((Collection)children).size() == 1);
attrs = ((Collection)children).iterator().next();
- assertTrue(attrs instanceof Map);
+ final boolean condition2 = attrs instanceof Map;
+ assertTrue(condition2);
assertEquals("this...", ((Map) attrs).get("longAttr"));
-
-
-
when(longAttr.getOversizedAltText()).thenReturn("test alt text");
resultMap = _converter.convertObjectToMap(_configuredObject,
@@ -303,15 +315,16 @@ public class ConfiguredObjectToMapConverterTest extends QpidTestCase
children = resultMap.get("testchilds");
assertNotNull(children);
- assertTrue(children instanceof Collection);
- assertTrue(((Collection)children).size()==1);
+ final boolean condition1 = children instanceof Collection;
+ assertTrue(condition1);
+ assertTrue(((Collection)children).size() == 1);
attrs = ((Collection)children).iterator().next();
- assertTrue(attrs instanceof Map);
+ final boolean condition = attrs instanceof Map;
+ assertTrue(condition);
assertEquals("test alt text", ((Map) attrs).get("longAttr"));
-
-
}
+ @Test
public void testSecureAttributes()
{
@@ -347,10 +360,12 @@ public class ConfiguredObjectToMapConverterTest extends QpidTestCase
false));
Object children = resultMap.get("testchilds");
assertNotNull(children);
- assertTrue(children instanceof Collection);
- assertTrue(((Collection)children).size()==1);
+ final boolean condition3 = children instanceof Collection;
+ assertTrue(condition3);
+ assertTrue(((Collection)children).size() == 1);
Object attrs = ((Collection)children).iterator().next();
- assertTrue(attrs instanceof Map);
+ final boolean condition2 = attrs instanceof Map;
+ assertTrue(condition2);
assertEquals("*****", ((Map) attrs).get("secureAttribute"));
resultMap = _converter.convertObjectToMap(_configuredObject,
@@ -363,13 +378,16 @@ public class ConfiguredObjectToMapConverterTest extends QpidTestCase
children = resultMap.get("testchilds");
assertNotNull(children);
- assertTrue(children instanceof Collection);
- assertTrue(((Collection)children).size()==1);
+ final boolean condition1 = children instanceof Collection;
+ assertTrue(condition1);
+ assertTrue(((Collection)children).size() == 1);
attrs = ((Collection)children).iterator().next();
- assertTrue(attrs instanceof Map);
+ final boolean condition = attrs instanceof Map;
+ assertTrue(condition);
assertEquals("*****", ((Map) attrs).get("secureAttribute"));
}
+ @Test
public void testIncludeInheritedContextAndEffective()
{
TestEngine engine = createEngineWithContext();
@@ -384,21 +402,23 @@ public class ConfiguredObjectToMapConverterTest extends QpidTestCase
assertTrue("Unexpected size of context", context.size() >= 5);
assertEquals("Unexpected engine context content",
- CHILD_CONTEXT_PROPERTY_EFFECTIVE_VALUE,
- context.get(CHILD_CONTEXT_PROPERTY_NAME));
+ CHILD_CONTEXT_PROPERTY_EFFECTIVE_VALUE,
+ context.get(CHILD_CONTEXT_PROPERTY_NAME));
assertEquals("Unexpected car context content",
- PARENT_CONTEXT_PROPERTY1_ACTUAL_VALUE, context.get(PARENT_CONTEXT_PROPERTY1_NAME));
+ PARENT_CONTEXT_PROPERTY1_ACTUAL_VALUE,
+ context.get(PARENT_CONTEXT_PROPERTY1_NAME));
assertEquals("Unexpected car context content",
- PARENT_CONTEXT_PROPERTY2_EFFECTIVE_VALUE,
- context.get(PARENT_CONTEXT_PROPERTY2_NAME));
+ PARENT_CONTEXT_PROPERTY2_EFFECTIVE_VALUE,
+ context.get(PARENT_CONTEXT_PROPERTY2_NAME));
assertEquals("Unexpected system context content",
- TEST_SYSTEM_PROPERTY1_ACTUAL_VALUE,
- context.get(TEST_SYSTEM_PROPERTY1_NAME));
+ TEST_SYSTEM_PROPERTY1_ACTUAL_VALUE,
+ context.get(TEST_SYSTEM_PROPERTY1_NAME));
assertEquals("Unexpected system context content",
- TEST_SYSTEM_PROPERTY2_EFFECTIVE_VALUE,
- context.get(TEST_SYSTEM_PROPERTY2_NAME));
+ TEST_SYSTEM_PROPERTY2_EFFECTIVE_VALUE,
+ context.get(TEST_SYSTEM_PROPERTY2_NAME));
}
+ @Test
public void testIncludeInheritedContextAndActual()
{
TestEngine engine = createEngineWithContext();
@@ -412,21 +432,23 @@ public class ConfiguredObjectToMapConverterTest extends QpidTestCase
Map<String, String> context = getContext(resultMap);
assertTrue("Unexpected size of context", context.size() >= 5);
assertEquals("Unexpected engine context content",
- CHILD_CONTEXT_PROPERTY_ACTUAL_VALUE,
- context.get(CHILD_CONTEXT_PROPERTY_NAME));
+ CHILD_CONTEXT_PROPERTY_ACTUAL_VALUE,
+ context.get(CHILD_CONTEXT_PROPERTY_NAME));
assertEquals("Unexpected car context content",
- PARENT_CONTEXT_PROPERTY1_ACTUAL_VALUE, context.get(PARENT_CONTEXT_PROPERTY1_NAME));
+ PARENT_CONTEXT_PROPERTY1_ACTUAL_VALUE,
+ context.get(PARENT_CONTEXT_PROPERTY1_NAME));
assertEquals("Unexpected car context content",
- PARENT_CONTEXT_PROPERTY2_ACTUAL_VALUE,
- context.get(PARENT_CONTEXT_PROPERTY2_NAME));
+ PARENT_CONTEXT_PROPERTY2_ACTUAL_VALUE,
+ context.get(PARENT_CONTEXT_PROPERTY2_NAME));
assertEquals("Unexpected system context content",
- TEST_SYSTEM_PROPERTY1_ACTUAL_VALUE,
- context.get(TEST_SYSTEM_PROPERTY1_NAME));
+ TEST_SYSTEM_PROPERTY1_ACTUAL_VALUE,
+ context.get(TEST_SYSTEM_PROPERTY1_NAME));
assertEquals("Unexpected system context content",
- TEST_SYSTEM_PROPERTY2_ACTUAL_VALUE,
- context.get(TEST_SYSTEM_PROPERTY2_NAME));
+ TEST_SYSTEM_PROPERTY2_ACTUAL_VALUE,
+ context.get(TEST_SYSTEM_PROPERTY2_NAME));
}
+ @Test
public void testExcludeInheritedContextAndEffective()
{
TestEngine engine = createEngineWithContext();
@@ -438,12 +460,13 @@ public class ConfiguredObjectToMapConverterTest extends QpidTestCase
true);
Map<String, Object> resultMap = _converter.convertObjectToMap(engine, TestEngine.class, options);
Map<String, String> context = getContext(resultMap);
- assertEquals("Unexpected size of context", 1, context.size());
+ assertEquals("Unexpected size of context", (long) 1, (long) context.size());
assertEquals("Unexpected context content",
- CHILD_CONTEXT_PROPERTY_EFFECTIVE_VALUE,
- context.get(CHILD_CONTEXT_PROPERTY_NAME));
+ CHILD_CONTEXT_PROPERTY_EFFECTIVE_VALUE,
+ context.get(CHILD_CONTEXT_PROPERTY_NAME));
}
+ @Test
public void testExcludeInheritedContextAndActual()
{
TestEngine engine = createEngineWithContext();
@@ -455,16 +478,17 @@ public class ConfiguredObjectToMapConverterTest extends QpidTestCase
true);
Map<String, Object> resultMap = _converter.convertObjectToMap(engine, TestEngine.class, options);
Map<String, String> context = getContext(resultMap);
- assertEquals("Unexpected size of context", 1, context.size());
+ assertEquals("Unexpected size of context", (long) 1, (long) context.size());
assertEquals("Unexpected context content",
- CHILD_CONTEXT_PROPERTY_ACTUAL_VALUE,
- context.get(CHILD_CONTEXT_PROPERTY_NAME));
+ CHILD_CONTEXT_PROPERTY_ACTUAL_VALUE,
+ context.get(CHILD_CONTEXT_PROPERTY_NAME));
}
private Map<String, String> getContext(final Map<String, Object> resultMap)
{
Object contextValue = resultMap.get(ConfiguredObject.CONTEXT);
- assertTrue("Unexpected type of context", contextValue instanceof Map);
+ final boolean condition = contextValue instanceof Map;
+ assertTrue("Unexpected type of context", condition);
Map<String, String> context = (Map<String, String>) contextValue;
return context;
}
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/servlet/rest/RequestInfoParserTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/RequestInfoParserTest.java b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/RequestInfoParserTest.java
index dbfad86..e18ff34 100644
--- a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/RequestInfoParserTest.java
+++ b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/RequestInfoParserTest.java
@@ -19,6 +19,10 @@
package org.apache.qpid.server.management.plugin.servlet.rest;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -30,15 +34,18 @@ import java.util.Collections;
import javax.servlet.http.HttpServletRequest;
+import org.junit.Test;
+
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.VirtualHostNode;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class RequestInfoParserTest extends QpidTestCase
+public class RequestInfoParserTest extends UnitTestBase
{
private HttpServletRequest _request = mock(HttpServletRequest.class);
+ @Test
public void testGetNoHierarchy()
{
RequestInfoParser parser = new RequestInfoParser();
@@ -51,6 +58,7 @@ public class RequestInfoParserTest extends QpidTestCase
assertEquals("Unexpected model parts", Collections.emptyList(), info.getModelParts());
}
+ @Test
public void testGetWithHierarchy()
{
RequestInfoParser parser = new RequestInfoParser(VirtualHostNode.class, VirtualHost.class);
@@ -68,6 +76,7 @@ public class RequestInfoParserTest extends QpidTestCase
assertTrue("Expected exact object request", info.isSingletonRequest());
}
+ @Test
public void testGetParent()
{
RequestInfoParser parser = new RequestInfoParser(VirtualHostNode.class, VirtualHost.class);
@@ -81,6 +90,7 @@ public class RequestInfoParserTest extends QpidTestCase
assertFalse("Expected exact object request", info.isSingletonRequest());
}
+ @Test
public void testGetTooManyParts()
{
RequestInfoParser parser = new RequestInfoParser(VirtualHostNode.class);
@@ -98,11 +108,13 @@ public class RequestInfoParserTest extends QpidTestCase
}
}
+ @Test
public void testGetOperation()
{
doOperationTest("GET");
}
+ @Test
public void testPostToParent()
{
RequestInfoParser parser = new RequestInfoParser(VirtualHostNode.class, VirtualHost.class);
@@ -119,6 +131,7 @@ public class RequestInfoParserTest extends QpidTestCase
}
+ @Test
public void testPostToObject()
{
RequestInfoParser parser = new RequestInfoParser(VirtualHostNode.class, VirtualHost.class);
@@ -135,6 +148,7 @@ public class RequestInfoParserTest extends QpidTestCase
assertEquals("Unexpected model parts", Arrays.asList(vhnName, vhName), info.getModelParts());
}
+ @Test
public void testPostTooFewParts()
{
RequestInfoParser parser = new RequestInfoParser(VirtualHostNode.class, VirtualHost.class, Queue.class);
@@ -152,6 +166,7 @@ public class RequestInfoParserTest extends QpidTestCase
}
}
+ @Test
public void testPostTooManyParts()
{
RequestInfoParser parser = new RequestInfoParser(VirtualHostNode.class, VirtualHost.class, Queue.class);
@@ -169,11 +184,13 @@ public class RequestInfoParserTest extends QpidTestCase
}
}
+ @Test
public void testPostOperation()
{
doOperationTest("POST");
}
+ @Test
public void testPutToObject()
{
RequestInfoParser parser = new RequestInfoParser(VirtualHostNode.class, VirtualHost.class);
@@ -190,6 +207,7 @@ public class RequestInfoParserTest extends QpidTestCase
assertEquals("Unexpected model parts", Arrays.asList(vhnName, vhName), info.getModelParts());
}
+ @Test
public void testPutToParent()
{
RequestInfoParser parser = new RequestInfoParser(VirtualHostNode.class, VirtualHost.class, Queue.class);
@@ -204,6 +222,7 @@ public class RequestInfoParserTest extends QpidTestCase
assertEquals("Unexpected model parts", Arrays.asList(vhnName, vhName), info.getModelParts());
}
+ @Test
public void testPutTooFewParts()
{
RequestInfoParser parser = new RequestInfoParser(VirtualHostNode.class, VirtualHost.class, Queue.class);
@@ -221,6 +240,7 @@ public class RequestInfoParserTest extends QpidTestCase
}
}
+ @Test
public void testPutTooManyParts()
{
RequestInfoParser parser = new RequestInfoParser(VirtualHostNode.class, VirtualHost.class, Queue.class);
@@ -238,6 +258,7 @@ public class RequestInfoParserTest extends QpidTestCase
}
}
+ @Test
public void testDeleteObject()
{
RequestInfoParser parser = new RequestInfoParser(VirtualHostNode.class, VirtualHost.class);
@@ -255,6 +276,7 @@ public class RequestInfoParserTest extends QpidTestCase
}
+ @Test
public void testDeleteParent()
{
RequestInfoParser parser = new RequestInfoParser(VirtualHostNode.class, VirtualHost.class, Queue.class);
@@ -269,6 +291,7 @@ public class RequestInfoParserTest extends QpidTestCase
assertEquals("Unexpected model parts", Arrays.asList(vhnName, vhName), info.getModelParts());
}
+ @Test
public void testDeleteTooManyParts()
{
RequestInfoParser parser = new RequestInfoParser(VirtualHostNode.class, VirtualHost.class, Queue.class);
@@ -286,6 +309,7 @@ public class RequestInfoParserTest extends QpidTestCase
}
}
+ @Test
public void testParseWithURLEncodedName() throws UnsupportedEncodingException
{
RequestInfoParser parser = new RequestInfoParser(VirtualHostNode.class);
@@ -300,6 +324,7 @@ public class RequestInfoParserTest extends QpidTestCase
assertEquals("Unexpected model parts", Arrays.asList(vhnName), info.getModelParts());
}
+ @Test
public void testWildHierarchy()
{
RequestInfoParser parser = new RequestInfoParser(VirtualHostNode.class, VirtualHost.class);
@@ -338,6 +363,5 @@ public class RequestInfoParserTest extends QpidTestCase
assertEquals("Unexpected model parts", Arrays.asList(vhnName), info.getModelParts());
assertEquals("Unexpected operation name", operationName, info.getOperationName());
assertTrue("Expected exact object request", info.isSingletonRequest());
-
}
}
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/servlet/rest/RestUserPreferenceHandlerTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/RestUserPreferenceHandlerTest.java b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/RestUserPreferenceHandlerTest.java
index cb82a4a..bd2937e 100644
--- a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/RestUserPreferenceHandlerTest.java
+++ b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/RestUserPreferenceHandlerTest.java
@@ -21,6 +21,10 @@ package org.apache.qpid.server.management.plugin.servlet.rest;
import static org.apache.qpid.server.management.plugin.HttpManagementConfiguration.DEFAULT_PREFERENCE_OPERATION_TIMEOUT;
import static org.apache.qpid.server.model.preferences.PreferenceTestHelper.awaitPreferenceFuture;
import static org.apache.qpid.server.model.preferences.PreferenceTestHelper.createPreferenceAttributes;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -38,6 +42,9 @@ import java.util.UUID;
import javax.security.auth.Subject;
import com.google.common.collect.Lists;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
@@ -51,9 +58,9 @@ import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
import org.apache.qpid.server.security.auth.TestPrincipalUtils;
import org.apache.qpid.server.security.group.GroupPrincipal;
import org.apache.qpid.server.store.preferences.PreferenceStore;
-import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class RestUserPreferenceHandlerTest extends QpidTestCase
+public class RestUserPreferenceHandlerTest extends UnitTestBase
{
private static final String MYGROUP = "mygroup";
@@ -70,10 +77,9 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
private PreferenceStore _preferenceStore;
private TaskExecutor _preferenceTaskExecutor;
- @Override
+ @Before
public void setUp() throws Exception
{
- super.setUp();
_configuredObject = mock(ConfiguredObject.class);
_preferenceStore = mock(PreferenceStore.class);
_preferenceTaskExecutor = new CurrentThreadTaskExecutor();
@@ -88,13 +94,13 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
when(_configuredObject.getUserPreferences()).thenReturn(_userPreferences);
}
- @Override
+ @After
public void tearDown() throws Exception
{
_preferenceTaskExecutor.stop();
- super.tearDown();
}
+ @Test
public void testPutWithVisibilityList_ValidGroup() throws Exception
{
@@ -115,10 +121,14 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
_handler.handlePUT(_configuredObject, requestInfo, pref);
Set<Preference> preferences = awaitPreferenceFuture(_userPreferences.getPreferences());
- assertEquals("Unexpected number of preferences", 1, preferences.size());
+ assertEquals("Unexpected number of preferences",
+ (long) 1,
+ (long) preferences.size());
Preference prefModel = preferences.iterator().next();
final Set<Principal> visibilityList = prefModel.getVisibilityList();
- assertEquals("Unexpected number of principals in visibility list", 1, visibilityList.size());
+ assertEquals("Unexpected number of principals in visibility list",
+ (long) 1,
+ (long) visibilityList.size());
Principal principal = visibilityList.iterator().next();
assertEquals("Unexpected member of visibility list", MYGROUP, principal.getName());
return null;
@@ -127,6 +137,7 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
);
}
+ @Test
public void testPutWithVisibilityList_InvalidGroup() throws Exception
{
@@ -159,6 +170,7 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
);
}
+ @Test
public void testPutByTypeAndName() throws Exception
{
final String prefName = "myprefname";
@@ -177,7 +189,9 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
_handler.handlePUT(_configuredObject, requestInfo, pref);
Set<Preference> preferences = awaitPreferenceFuture(_userPreferences.getPreferences());
- assertEquals("Unexpected number of preferences", 1, preferences.size());
+ assertEquals("Unexpected number of preferences",
+ (long) 1,
+ (long) preferences.size());
Preference prefModel = preferences.iterator().next();
assertEquals("Unexpected preference name", prefName, prefModel.getName());
return null;
@@ -186,6 +200,7 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
);
}
+ @Test
public void testReplaceViaPutByTypeAndName() throws Exception
{
final String prefName = "myprefname";
@@ -203,10 +218,15 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
{
_handler.handlePUT(_configuredObject, requestInfo, pref);
- Set<Preference> preferences = awaitPreferenceFuture(_userPreferences.getPreferences());
- assertEquals("Unexpected number of preferences", 1, preferences.size());
+ Set<Preference> preferences = awaitPreferenceFuture
+ (_userPreferences.getPreferences());
+ assertEquals("Unexpected number of preferences",
+ (long) 1,
+ (long) preferences.size());
Preference prefModel = preferences.iterator().next();
- assertEquals("Unexpected preference name", prefName, prefModel.getName());
+ assertEquals("Unexpected preference name",
+ prefName,
+ prefModel.getName());
return prefModel;
}
}
@@ -226,11 +246,17 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
_handler.handlePUT(_configuredObject, requestInfo, replacementPref);
Set<Preference> preferences = awaitPreferenceFuture(_userPreferences.getPreferences());
- assertEquals("Unexpected number of preferences after update", 1, preferences.size());
+ assertEquals("Unexpected number of preferences after update",
+ (long) 1,
+ (long) preferences.size());
Preference updatedPref = preferences.iterator().next();
- assertEquals("Unexpected preference id", createdPreference.getId(), updatedPref.getId());
+ assertEquals("Unexpected preference id",
+ createdPreference.getId(),
+ updatedPref.getId());
assertEquals("Unexpected preference name", prefName, updatedPref.getName());
- assertEquals("Unexpected preference description", changedDescription, updatedPref.getDescription());
+ assertEquals("Unexpected preference description",
+ changedDescription,
+ updatedPref.getDescription());
return null;
}
}
@@ -248,18 +274,24 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
_handler.handlePUT(_configuredObject, requestInfo, replacementPref);
Set<Preference> preferences = awaitPreferenceFuture(_userPreferences.getPreferences());
- assertEquals("Unexpected number of preferences after update", 1, preferences.size());
+ assertEquals("Unexpected number of preferences after update",
+ (long) 1,
+ (long) preferences.size());
Preference updatedPref = preferences.iterator().next();
assertFalse("Replace without id should create new id",
- createdPreference.getId().equals(updatedPref.getId()));
+ createdPreference.getId().equals(updatedPref.getId()));
+
assertEquals("Unexpected preference name", prefName, updatedPref.getName());
- assertEquals("Unexpected preference description", changedDescription2, updatedPref.getDescription());
+ assertEquals("Unexpected preference description",
+ changedDescription2,
+ updatedPref.getDescription());
return null;
}
}
);
}
+ @Test
public void testReplaceViaPutByType() throws Exception
{
final String prefName = "myprefname";
@@ -279,7 +311,9 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
_handler.handlePUT(_configuredObject, requestInfo, Lists.newArrayList(pref));
Set<Preference> preferences = awaitPreferenceFuture(_userPreferences.getPreferences());
- assertEquals("Unexpected number of preferences", 1, preferences.size());
+ assertEquals("Unexpected number of preferences",
+ (long) 1,
+ (long) preferences.size());
Preference prefModel = preferences.iterator().next();
assertEquals("Unexpected preference name", prefName, prefModel.getName());
return null;
@@ -306,20 +340,26 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
_handler.handlePUT(_configuredObject, requestInfo, Lists.newArrayList(replacementPref1, replacementPref2));
Set<Preference> preferences = awaitPreferenceFuture(_userPreferences.getPreferences());
- assertEquals("Unexpected number of preferences after update", 2, preferences.size());
+ assertEquals("Unexpected number of preferences after update",
+ (long) 2,
+ (long) preferences.size());
Set<String> prefNames = new HashSet<>(preferences.size());
for (Preference pref : preferences)
{
prefNames.add(pref.getName());
}
- assertTrue("Replacement preference " + replacementPref1Name + " not found.", prefNames.contains(replacementPref1Name));
- assertTrue("Replacement preference " + replacementPref2Name + " not found.", prefNames.contains(replacementPref2Name));
+ assertTrue("Replacement preference " + replacementPref1Name + " not found.",
+ prefNames.contains(replacementPref1Name));
+
+ assertTrue("Replacement preference " + replacementPref2Name + " not found.",
+ prefNames.contains(replacementPref2Name));
return null;
}
}
);
}
+ @Test
public void testReplaceAllViaPut() throws Exception
{
final String pref1Name = "mypref1name";
@@ -353,7 +393,9 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
_handler.handlePUT(_configuredObject, requestInfo, payload);
Set<Preference> preferences = awaitPreferenceFuture(_userPreferences.getPreferences());
- assertEquals("Unexpected number of preferences", 2, preferences.size());
+ assertEquals("Unexpected number of preferences",
+ (long) 2,
+ (long) preferences.size());
return null;
}
}
@@ -377,16 +419,21 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
_handler.handlePUT(_configuredObject, requestInfo, payload);
Set<Preference> preferences = awaitPreferenceFuture(_userPreferences.getPreferences());
- assertEquals("Unexpected number of preferences after update", 1, preferences.size());
+ assertEquals("Unexpected number of preferences after update",
+ (long) 1,
+ (long) preferences.size());
Preference prefModel = preferences.iterator().next();
- assertEquals("Unexpected preference name", replacementPref1Name, prefModel.getName());
+ assertEquals("Unexpected preference name",
+ replacementPref1Name,
+ prefModel.getName());
return null;
}
}
);
}
+ @Test
public void testPostToTypeWithVisibilityList_ValidGroup() throws Exception
{
final RequestInfo typeRequestInfo = RequestInfo.createPreferencesRequestInfo(Collections.<String>emptyList(),
@@ -406,10 +453,14 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
_handler.handlePOST(_configuredObject, typeRequestInfo, Collections.singletonList(pref));
Set<Preference> preferences = awaitPreferenceFuture(_userPreferences.getPreferences());
- assertEquals("Unexpected number of preferences", 1, preferences.size());
+ assertEquals("Unexpected number of preferences",
+ (long) 1,
+ (long) preferences.size());
Preference prefModel = preferences.iterator().next();
final Set<Principal> visibilityList = prefModel.getVisibilityList();
- assertEquals("Unexpected number of principals in visibility list", 1, visibilityList.size());
+ assertEquals("Unexpected number of principals in visibility list",
+ (long) 1,
+ (long) visibilityList.size());
Principal principal = visibilityList.iterator().next();
assertEquals("Unexpected member of visibility list", MYGROUP, principal.getName());
return null;
@@ -418,6 +469,7 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
);
}
+ @Test
public void testPostToRootWithVisibilityList_ValidGroup() throws Exception
{
final RequestInfo rootRequestInfo = RequestInfo.createPreferencesRequestInfo(Collections.<String>emptyList(),
@@ -438,10 +490,14 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
_handler.handlePOST(_configuredObject, rootRequestInfo, payload);
Set<Preference> preferences = awaitPreferenceFuture(_userPreferences.getPreferences());
- assertEquals("Unexpected number of preferences", 1, preferences.size());
+ assertEquals("Unexpected number of preferences",
+ (long) 1,
+ (long) preferences.size());
Preference prefModel = preferences.iterator().next();
final Set<Principal> visibilityList = prefModel.getVisibilityList();
- assertEquals("Unexpected number of principals in visibility list", 1, visibilityList.size());
+ assertEquals("Unexpected number of principals in visibility list",
+ (long) 1,
+ (long) visibilityList.size());
Principal principal = visibilityList.iterator().next();
assertEquals("Unexpected member of visibility list", MYGROUP, principal.getName());
@@ -451,6 +507,7 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
);
}
+ @Test
public void testPostToTypeWithVisibilityList_InvalidGroup() throws Exception
{
final RequestInfo requestInfo = RequestInfo.createPreferencesRequestInfo(Collections.<String>emptyList(),
@@ -483,6 +540,7 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
);
}
+ @Test
public void testPostToRootWithVisibilityList_InvalidGroup() throws Exception
{
final RequestInfo requestInfo = RequestInfo.createPreferencesRequestInfo(Collections.<String>emptyList(),
@@ -516,6 +574,7 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
);
}
+ @Test
public void testGetHasCorrectVisibilityList() throws Exception
{
final RequestInfo rootRequestInfo = RequestInfo.createPreferencesRequestInfo(Collections.<String>emptyList(),
@@ -541,22 +600,31 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
awaitPreferenceFuture(_userPreferences.updateOrAppend(Collections.singleton(preference)));
Map<String, List<Map<String, Object>>> typeToPreferenceListMap =
- (Map<String, List<Map<String, Object>>>) _handler.handleGET(_userPreferences, rootRequestInfo);
- assertEquals("Unexpected preference map size", 1, typeToPreferenceListMap.size());
+ (Map<String, List<Map<String, Object>>>) _handler.handleGET(_userPreferences,
+ rootRequestInfo);
+ assertEquals("Unexpected preference map size",
+ (long) 1,
+ (long) typeToPreferenceListMap.size());
assertEquals("Unexpected type in preference map",
- type,
- typeToPreferenceListMap.keySet().iterator().next());
+ type,
+ typeToPreferenceListMap.keySet().iterator().next());
List<Map<String, Object>> preferences = typeToPreferenceListMap.get(type);
- assertEquals("Unexpected number of preferences", 1, preferences.size());
+ assertEquals("Unexpected number of preferences",
+ (long) 1,
+ (long) preferences.size());
Set<Principal> visibilityList = (Set<Principal>) preferences.get(0).get("visibilityList");
- assertEquals("Unexpected number of principals in visibility list", 1, visibilityList.size());
- assertTrue("Unexpected principal in visibility list", GenericPrincipal.principalsEqual(_groupPrincipal, visibilityList.iterator().next()));
+ assertEquals("Unexpected number of principals in visibility list",
+ (long) 1,
+ (long) visibilityList.size());
+ assertTrue("Unexpected principal in visibility list",
+ GenericPrincipal.principalsEqual(_groupPrincipal, visibilityList.iterator().next()));
return null;
}
}
);
}
+ @Test
public void testGetById() throws Exception
{
Subject.doAs(_subject, new PrivilegedAction<Void>()
@@ -597,12 +665,15 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
Map<String, List<Map<String, Object>>> typeToPreferenceListMap =
(Map<String, List<Map<String, Object>>>) _handler.handleGET(_userPreferences, rootRequestInfo);
- assertEquals("Unexpected p1 map size", 1, typeToPreferenceListMap.size());
- assertEquals("Unexpected type in p1 map",
- type,
- typeToPreferenceListMap.keySet().iterator().next());
+ assertEquals("Unexpected p1 map size",
+ (long) 1,
+ (long) typeToPreferenceListMap.size());
+ assertEquals("Unexpected type in p1 map", type, typeToPreferenceListMap.keySet()
+ .iterator().next());
List<Map<String, Object>> preferences = typeToPreferenceListMap.get(type);
- assertEquals("Unexpected number of preferences", 1, preferences.size());
+ assertEquals("Unexpected number of preferences",
+ (long) 1,
+ (long) preferences.size());
assertEquals("Unexpected id", id, preferences.get(0).get(Preference.ID_ATTRIBUTE));
return null;
}
@@ -610,6 +681,7 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
);
}
+ @Test
public void testDeleteById() throws Exception
{
Subject.doAs(_subject, new PrivilegedAction<Void>()
@@ -651,7 +723,9 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
_handler.handleDELETE(_userPreferences, rootRequestInfo);
final Set<Preference> retrievedPreferences = awaitPreferenceFuture(_userPreferences.getPreferences());
- assertEquals("Unexpected number of preferences", 1, retrievedPreferences.size());
+ assertEquals("Unexpected number of preferences",
+ (long) 1,
+ (long) retrievedPreferences.size());
assertTrue("Unexpected type in p1 map", retrievedPreferences.contains(p2));
return null;
}
@@ -659,6 +733,7 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
);
}
+ @Test
public void testDeleteByTypeAndName() throws Exception
{
final String preferenceType = "X-testtype";
@@ -674,6 +749,7 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
doTestDelete(preferenceType, preferenceName, requestInfo);
}
+ @Test
public void testDeleteByType() throws Exception
{
final String preferenceType = "X-testtype";
@@ -688,6 +764,7 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
doTestDelete(preferenceType, preferenceName, requestInfo);
}
+ @Test
public void testDeleteByRoot() throws Exception
{
final String preferenceType = "X-testtype";
@@ -702,6 +779,7 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
doTestDelete(preferenceType, preferenceName, requestInfo);
}
+ @Test
public void testGetVisiblePreferencesByRoot() throws Exception
{
final String prefName = "testpref";
@@ -754,28 +832,35 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
{
Map<String, List<Map<String, Object>>> typeToPreferenceListMap =
(Map<String, List<Map<String, Object>>>) _handler.handleGET(_userPreferences, rootRequestInfo);
- assertEquals("Unexpected preference map size", 1, typeToPreferenceListMap.size());
+ assertEquals("Unexpected preference map size",
+ (long) 1,
+ (long) typeToPreferenceListMap.size());
assertEquals("Unexpected prefType in preference map",
- prefType,
- typeToPreferenceListMap.keySet().iterator().next());
+ prefType,
+ typeToPreferenceListMap.keySet().iterator().next());
List<Map<String, Object>> preferences = typeToPreferenceListMap.get(prefType);
- assertEquals("Unexpected number of preferences", 1, preferences.size());
+ assertEquals("Unexpected number of preferences",
+ (long) 1,
+ (long) preferences.size());
assertEquals("Unexpected name of preferences",
- prefName,
- preferences.get(0).get(Preference.NAME_ATTRIBUTE));
+ prefName,
+ preferences.get(0).get(Preference.NAME_ATTRIBUTE));
Set<Principal> visibilityList = (Set<Principal>) preferences.get(0).get(Preference.VISIBILITY_LIST_ATTRIBUTE);
- assertEquals("Unexpected number of principals in visibility list", 1, visibilityList.size());
+ assertEquals("Unexpected number of principals in visibility list",
+ (long) 1,
+ (long) visibilityList.size());
assertTrue("Unexpected principal in visibility list",
- GenericPrincipal.principalsEqual(_groupPrincipal,
- visibilityList.iterator().next()));
+ GenericPrincipal.principalsEqual(_groupPrincipal,
+ visibilityList.iterator().next()));
assertTrue("Unexpected owner", GenericPrincipal.principalsEqual(_userPrincipal,
- (Principal) preferences.get(0).get(Preference.OWNER_ATTRIBUTE)));
+ (Principal) preferences.get(0).get(Preference.OWNER_ATTRIBUTE)));
return null;
}
}
);
}
+ @Test
public void testGetVisiblePreferencesByType() throws Exception
{
final String prefName = "testpref";
@@ -828,25 +913,29 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
{
List<Map<String, Object>> preferences =
(List<Map<String, Object>>) _handler.handleGET(_userPreferences, rootRequestInfo);
- assertEquals("Unexpected number of preferences", 1, preferences.size());
+ assertEquals("Unexpected number of preferences",
+ (long) 1,
+ (long) preferences.size());
assertEquals("Unexpected name of preferences",
- prefName,
- preferences.get(0).get(Preference.NAME_ATTRIBUTE));
+ prefName,
+ preferences.get(0).get(Preference.NAME_ATTRIBUTE));
Set<Principal> visibilityList = (Set<Principal>) preferences.get(0).get(Preference.VISIBILITY_LIST_ATTRIBUTE);
- assertEquals("Unexpected number of principals in visibility list", 1, visibilityList.size());
+ assertEquals("Unexpected number of principals in visibility list",
+ (long) 1,
+ (long) visibilityList.size());
assertTrue("Unexpected principal in visibility list",
- GenericPrincipal.principalsEqual(_groupPrincipal,
- visibilityList.iterator().next()));
- assertTrue("Unexpected owner",
- GenericPrincipal.principalsEqual(_userPrincipal,
- (Principal) preferences.get(0)
- .get(Preference.OWNER_ATTRIBUTE)));
+ GenericPrincipal.principalsEqual(_groupPrincipal,
+ visibilityList.iterator().next()));
+ assertTrue("Unexpected owner", GenericPrincipal.principalsEqual(_userPrincipal,
+ (Principal) preferences.get(0)
+ .get(Preference.OWNER_ATTRIBUTE)));
return null;
}
}
);
}
+ @Test
public void testGetVisiblePreferencesByTypeAndName() throws Exception
{
final String prefName = "testpref";
@@ -899,15 +988,18 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
{
Map<String, Object> preference =
(Map<String, Object>) _handler.handleGET(_userPreferences, rootRequestInfo);
- assertEquals("Unexpected name of preferences", prefName, preference.get(Preference.NAME_ATTRIBUTE));
+ assertEquals("Unexpected name of preferences",
+ prefName,
+ preference.get(Preference.NAME_ATTRIBUTE));
Set<Principal> visibilityList = (Set<Principal>) preference.get(Preference.VISIBILITY_LIST_ATTRIBUTE);
- assertEquals("Unexpected number of principals in visibility list", 1, visibilityList.size());
+ assertEquals("Unexpected number of principals in visibility list",
+ (long) 1,
+ (long) visibilityList.size());
assertTrue("Unexpected principal in visibility list",
- GenericPrincipal.principalsEqual(_groupPrincipal,
- visibilityList.iterator().next()));
- assertTrue("Unexpected owner",
- GenericPrincipal.principalsEqual(_userPrincipal,
- (Principal) preference.get(Preference.OWNER_ATTRIBUTE)));
+ GenericPrincipal.principalsEqual(_groupPrincipal,
+ visibilityList.iterator().next()));
+ assertTrue("Unexpected owner", GenericPrincipal.principalsEqual(_userPrincipal,
+ (Principal) preference.get(Preference.OWNER_ATTRIBUTE)));
return null;
}
}
@@ -934,12 +1026,14 @@ public class RestUserPreferenceHandlerTest extends QpidTestCase
preferenceAttributes);
awaitPreferenceFuture(_userPreferences.updateOrAppend(Collections.singleton(preference)));
Set<Preference> retrievedPreferences = awaitPreferenceFuture(_userPreferences.getPreferences());
- assertEquals("adding pref failed", 1, retrievedPreferences.size());
+ assertEquals("adding pref failed", (long) 1, (long) retrievedPreferences.size());
_handler.handleDELETE(_userPreferences, requestInfo);
retrievedPreferences = awaitPreferenceFuture(_userPreferences.getPreferences());
- assertEquals("Deletion of preference failed", 0, retrievedPreferences.size());
+ assertEquals("Deletion of preference failed",
+ (long) 0,
+ (long) retrievedPreferences.size());
// this should be a noop
_handler.handleDELETE(_userPreferences, requestInfo);
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/session/LoginLogoutReporterTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporterTest.java b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporterTest.java
index fc41dda..1a5277c 100644
--- a/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporterTest.java
+++ b/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/session/LoginLogoutReporterTest.java
@@ -20,32 +20,34 @@
package org.apache.qpid.server.management.plugin.session;
import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.argThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-import static org.mockito.Matchers.argThat;
import static org.mockito.Mockito.when;
import javax.security.auth.Subject;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentMatcher;
+
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.EventLoggerProvider;
import org.apache.qpid.server.logging.LogMessage;
import org.apache.qpid.server.logging.MessageLogger;
import org.apache.qpid.server.security.auth.AuthenticatedPrincipal;
import org.apache.qpid.server.security.auth.UsernamePrincipal;
-import org.apache.qpid.test.utils.QpidTestCase;
-import org.mockito.ArgumentMatcher;
+import org.apache.qpid.test.utils.UnitTestBase;
-public class LoginLogoutReporterTest extends QpidTestCase
+public class LoginLogoutReporterTest extends UnitTestBase
{
private LoginLogoutReporter _loginLogoutReport;
private Subject _subject = new Subject();
private MessageLogger _logger = mock(MessageLogger.class);
- @Override
- protected void setUp() throws Exception
+ @Before
+ public void setUp() throws Exception
{
- super.setUp();
_subject.getPrincipals().add(new AuthenticatedPrincipal(new UsernamePrincipal("mockusername", null)));
when(_logger.isEnabled()).thenReturn(true);
@@ -56,12 +58,14 @@ public class LoginLogoutReporterTest extends QpidTestCase
_loginLogoutReport = new LoginLogoutReporter(_subject, provider);
}
+ @Test
public void testLoginLogged()
{
_loginLogoutReport.valueBound(null);
verify(_logger).message(isLogMessageWithMessage("MNG-1007 : Open : User mockusername"));
}
+ @Test
public void testLogoutLogged()
{
_loginLogoutReport.valueUnbound(null);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org