Author: robbie Date: Tue Apr 22 14:50:53 2014 New Revision: 1589144 URL: http://svn.apache.org/r1589144 Log: QPID-5702: upgrade JUnit dependency from version 3.8.1 to 4.11, change imports etc to remove deprecation notices
Patch Supplied by Andrew MacBean <[email protected]>. Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SelfValidatingSortedQueueEntryList.java qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTestHelper.java qpid/trunk/qpid/java/build.deps qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/TextMessageTest.java qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/framing/FieldTableTest.java qpid/trunk/qpid/java/ivy.retrieve.xml qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantTestHelper.java qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigTestUtils.java qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/ControllerQueue.java qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MapMessageTest.java qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java?rev=1589144&r1=1589143&r2=1589144&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java (original) +++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/exchange/TopicExchangeTest.java Tue Apr 22 14:50:53 2014 @@ -28,7 +28,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.qpid.server.binding.BindingImpl; import org.apache.qpid.server.message.InstanceProperties; Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SelfValidatingSortedQueueEntryList.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SelfValidatingSortedQueueEntryList.java?rev=1589144&r1=1589143&r2=1589144&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SelfValidatingSortedQueueEntryList.java (original) +++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/queue/SelfValidatingSortedQueueEntryList.java Tue Apr 22 14:50:53 2014 @@ -19,7 +19,7 @@ */ package org.apache.qpid.server.queue; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.qpid.server.message.ServerMessage; import org.apache.qpid.server.queue.SortedQueueEntry.Colour; Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTestHelper.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTestHelper.java?rev=1589144&r1=1589143&r2=1589144&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTestHelper.java (original) +++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTestHelper.java Tue Apr 22 14:50:53 2014 @@ -23,7 +23,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; /** * Helper class for testing that sets of principals contain {@link AuthenticatedPrincipal}'s that wrap Modified: qpid/trunk/qpid/java/build.deps URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.deps?rev=1589144&r1=1589143&r2=1589144&view=diff ============================================================================== --- qpid/trunk/qpid/java/build.deps (original) +++ qpid/trunk/qpid/java/build.deps Tue Apr 22 14:50:53 2014 @@ -35,7 +35,7 @@ geronimo-kernel=lib/required/geronimo-ke geronimo-openejb=lib/required/geronimo-ejb_3.0_spec-1.0.1.jar geronimo-servlet=lib/required/geronimo-servlet_3.0_spec-1.0.jar -junit=lib/required/junit-3.8.1.jar +junit=lib/required/junit-4.11.jar mockito-all=lib/required/mockito-all-1.9.0.jar gson-all=lib/required/gson-2.0.jar Modified: qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java?rev=1589144&r1=1589143&r2=1589144&view=diff ============================================================================== --- qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java (original) +++ qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/MapMessageTest.java Tue Apr 22 14:50:53 2014 @@ -20,7 +20,7 @@ */ package org.apache.qpid.test.unit.client.message; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import org.apache.qpid.client.message.JMSMapMessage; @@ -132,7 +132,7 @@ public class MapMessageTest extends Test { JMSMapMessage mm = TestMessageHelper.newJMSMapMessage(); mm.setDouble("value", Double.MAX_VALUE); - Assert.assertEquals(Double.MAX_VALUE, mm.getDouble("value")); + Assert.assertEquals(Double.MAX_VALUE, mm.getDouble("value"), 0d); Assert.assertEquals("" + Double.MAX_VALUE, mm.getString("value")); } catch (JMSException e) @@ -147,8 +147,8 @@ public class MapMessageTest extends Test { JMSMapMessage mm = TestMessageHelper.newJMSMapMessage(); mm.setFloat("value", Float.MAX_VALUE); - Assert.assertEquals(Float.MAX_VALUE, mm.getFloat("value")); - Assert.assertEquals((double) Float.MAX_VALUE, mm.getDouble("value")); + Assert.assertEquals(Float.MAX_VALUE, mm.getFloat("value"), 0f); + Assert.assertEquals(Double.valueOf(Float.MAX_VALUE), mm.getDouble("value"), 0d); Assert.assertEquals("" + Float.MAX_VALUE, mm.getString("value")); } catch (JMSException e) Modified: qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/TextMessageTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/TextMessageTest.java?rev=1589144&r1=1589143&r2=1589144&view=diff ============================================================================== --- qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/TextMessageTest.java (original) +++ qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/TextMessageTest.java Tue Apr 22 14:50:53 2014 @@ -20,7 +20,7 @@ */ package org.apache.qpid.test.unit.client.message; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import org.apache.qpid.client.message.JMSMapMessage; @@ -111,7 +111,7 @@ public class TextMessageTest extends Tes { JMSMapMessage mm = TestMessageHelper.newJMSMapMessage(); mm.setDoubleProperty("value", Double.MAX_VALUE); - Assert.assertEquals(Double.MAX_VALUE, mm.getDoubleProperty("value")); + Assert.assertEquals(Double.MAX_VALUE, mm.getDoubleProperty("value"), 0d); Assert.assertEquals("" + Double.MAX_VALUE, mm.getStringProperty("value")); } catch (JMSException e) @@ -126,8 +126,8 @@ public class TextMessageTest extends Tes { JMSMapMessage mm = TestMessageHelper.newJMSMapMessage(); mm.setFloatProperty("value", Float.MAX_VALUE); - Assert.assertEquals(Float.MAX_VALUE, mm.getFloatProperty("value")); - Assert.assertEquals((double) Float.MAX_VALUE, mm.getDoubleProperty("value")); + Assert.assertEquals(Float.MAX_VALUE, mm.getFloatProperty("value"), 0f); + Assert.assertEquals(Double.valueOf(Float.MAX_VALUE), mm.getDoubleProperty("value"), 0d); Assert.assertEquals("" + Float.MAX_VALUE, mm.getStringProperty("value")); } catch (JMSException e) Modified: qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/framing/FieldTableTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/framing/FieldTableTest.java?rev=1589144&r1=1589143&r2=1589144&view=diff ============================================================================== --- qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/framing/FieldTableTest.java (original) +++ qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/framing/FieldTableTest.java Tue Apr 22 14:50:53 2014 @@ -20,7 +20,7 @@ */ package org.apache.qpid.framing; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import org.apache.qpid.AMQPInvalidClassException; @@ -107,7 +107,7 @@ public class FieldTableTest extends Test // Tests lookups we shouldn't get anything back for other gets // we should get right value back for this type .... Assert.assertEquals(null, table1.getBoolean("value")); - Assert.assertEquals(Byte.MAX_VALUE, (byte) table1.getByte("value")); + Assert.assertEquals(Byte.valueOf(Byte.MAX_VALUE), table1.getByte("value")); Assert.assertEquals(null, table1.getShort("value")); Assert.assertEquals(null, table1.getCharacter("value")); Assert.assertEquals(null, table1.getDouble("value")); @@ -141,7 +141,7 @@ public class FieldTableTest extends Test // we should get right value back for this type .... Assert.assertEquals(null, table1.getBoolean("value")); Assert.assertEquals(null, table1.getByte("value")); - Assert.assertEquals(Short.MAX_VALUE, (short) table1.getShort("value")); + Assert.assertEquals(Short.valueOf(Short.MAX_VALUE), table1.getShort("value")); Assert.assertEquals(null, table1.getCharacter("value")); Assert.assertEquals(null, table1.getDouble("value")); Assert.assertEquals(null, table1.getFloat("value")); @@ -175,7 +175,7 @@ public class FieldTableTest extends Test Assert.assertEquals(null, table1.getBoolean("value")); Assert.assertEquals(null, table1.getByte("value")); Assert.assertEquals(null, table1.getShort("value")); - Assert.assertEquals('c', (char) table1.getCharacter("value")); + Assert.assertEquals(Character.valueOf('c'), table1.getCharacter("value")); Assert.assertEquals(null, table1.getDouble("value")); Assert.assertEquals(null, table1.getFloat("value")); Assert.assertEquals(null, table1.getInteger("value")); @@ -210,7 +210,7 @@ public class FieldTableTest extends Test Assert.assertEquals(null, table1.getByte("value")); Assert.assertEquals(null, table1.getShort("value")); Assert.assertEquals(null, table1.getCharacter("value")); - Assert.assertEquals(Double.MAX_VALUE, (double) table1.getDouble("value")); + Assert.assertEquals(Double.valueOf(Double.MAX_VALUE), table1.getDouble("value")); Assert.assertEquals(null, table1.getFloat("value")); Assert.assertEquals(null, table1.getInteger("value")); Assert.assertEquals(null, table1.getLong("value")); @@ -246,7 +246,7 @@ public class FieldTableTest extends Test Assert.assertEquals(null, table1.getShort("value")); Assert.assertEquals(null, table1.getCharacter("value")); Assert.assertEquals(null, table1.getDouble("value")); - Assert.assertEquals(Float.MAX_VALUE, (float) table1.getFloat("value")); + Assert.assertEquals(Float.valueOf(Float.MAX_VALUE), table1.getFloat("value")); Assert.assertEquals(null, table1.getInteger("value")); Assert.assertEquals(null, table1.getLong("value")); Assert.assertEquals(null, table1.getBytes("value")); @@ -283,7 +283,7 @@ public class FieldTableTest extends Test Assert.assertEquals(null, table1.getCharacter("value")); Assert.assertEquals(null, table1.getDouble("value")); Assert.assertEquals(null, table1.getFloat("value")); - Assert.assertEquals(Integer.MAX_VALUE, (int) table1.getInteger("value")); + Assert.assertEquals(Integer.valueOf(Integer.MAX_VALUE), table1.getInteger("value")); Assert.assertEquals(null, table1.getLong("value")); Assert.assertEquals(null, table1.getBytes("value")); @@ -320,7 +320,7 @@ public class FieldTableTest extends Test Assert.assertEquals(null, table1.getDouble("value")); Assert.assertEquals(null, table1.getFloat("value")); Assert.assertEquals(null, table1.getInteger("value")); - Assert.assertEquals(Long.MAX_VALUE, (long) table1.getLong("value")); + Assert.assertEquals(Long.valueOf(Long.MAX_VALUE), table1.getLong("value")); Assert.assertEquals(null, table1.getBytes("value")); // ... and a the string value of it. @@ -476,17 +476,17 @@ public class FieldTableTest extends Test FieldTable extractedTable = extractedOuterTable.getFieldTable("innerTable"); - Assert.assertEquals((Boolean) true, extractedTable.getBoolean("bool")); - Assert.assertEquals((Byte) Byte.MAX_VALUE, extractedTable.getByte("byte")); + Assert.assertEquals(Boolean.TRUE, extractedTable.getBoolean("bool")); + Assert.assertEquals(Byte.valueOf(Byte.MAX_VALUE), extractedTable.getByte("byte")); assertBytesEqual(testBytes, extractedTable.getBytes("bytes")); - Assert.assertEquals((Character) 'c', extractedTable.getCharacter("char")); - Assert.assertEquals(Double.MAX_VALUE, extractedTable.getDouble("double")); - Assert.assertEquals(Float.MAX_VALUE, extractedTable.getFloat("float")); - Assert.assertEquals((Integer) Integer.MAX_VALUE, extractedTable.getInteger("int")); - Assert.assertEquals((Long) Long.MAX_VALUE, extractedTable.getLong("long")); - Assert.assertEquals((Short) Short.MAX_VALUE, extractedTable.getShort("short")); + Assert.assertEquals(Character.valueOf('c'), extractedTable.getCharacter("char")); + Assert.assertEquals(Double.valueOf(Double.MAX_VALUE), extractedTable.getDouble("double")); + Assert.assertEquals(Float.valueOf(Float.MAX_VALUE), extractedTable.getFloat("float")); + Assert.assertEquals(Integer.valueOf(Integer.MAX_VALUE), extractedTable.getInteger("int")); + Assert.assertEquals(Long.valueOf(Long.MAX_VALUE), extractedTable.getLong("long")); + Assert.assertEquals(Short.valueOf(Short.MAX_VALUE), extractedTable.getShort("short")); Assert.assertEquals("hello", extractedTable.getString("string")); - Assert.assertEquals(null, extractedTable.getString("null-string")); + Assert.assertNull(extractedTable.getString("null-string")); } catch (AMQFrameDecodingException e) { @@ -543,17 +543,17 @@ public class FieldTableTest extends Test AMQPInvalidClassException.INVALID_OBJECT_MSG + Exception.class, aice.getMessage()); } - Assert.assertEquals((Boolean) true, table.getBoolean("bool")); - Assert.assertEquals((Byte) Byte.MAX_VALUE, table.getByte("byte")); + Assert.assertEquals(Boolean.TRUE, table.getBoolean("bool")); + Assert.assertEquals(Byte.valueOf(Byte.MAX_VALUE), table.getByte("byte")); assertBytesEqual(bytes, table.getBytes("bytes")); - Assert.assertEquals((Character) 'c', table.getCharacter("char")); - Assert.assertEquals(Double.MAX_VALUE, table.getDouble("double")); - Assert.assertEquals(Float.MAX_VALUE, table.getFloat("float")); - Assert.assertEquals((Integer) Integer.MAX_VALUE, table.getInteger("int")); - Assert.assertEquals((Long) Long.MAX_VALUE, table.getLong("long")); - Assert.assertEquals((Short) Short.MAX_VALUE, table.getShort("short")); + Assert.assertEquals(Character.valueOf('c'), table.getCharacter("char")); + Assert.assertEquals(Double.valueOf(Double.MAX_VALUE), table.getDouble("double")); + Assert.assertEquals(Float.valueOf(Float.MAX_VALUE), table.getFloat("float")); + Assert.assertEquals(Integer.valueOf(Integer.MAX_VALUE), table.getInteger("int")); + Assert.assertEquals(Long.valueOf(Long.MAX_VALUE), table.getLong("long")); + Assert.assertEquals(Short.valueOf(Short.MAX_VALUE), table.getShort("short")); Assert.assertEquals("Hello", table.getString("string")); - Assert.assertEquals(null, table.getString("null-string")); + Assert.assertNull(table.getString("null-string")); Assert.assertEquals(true, table.getObject("object-bool")); Assert.assertEquals(Byte.MAX_VALUE, table.getObject("object-byte")); @@ -601,13 +601,13 @@ public class FieldTableTest extends Test Assert.assertEquals((Byte) Byte.MAX_VALUE, table2.getByte("byte")); assertBytesEqual(bytes, table2.getBytes("bytes")); Assert.assertEquals((Character) 'c', table2.getCharacter("char")); - Assert.assertEquals(Double.MAX_VALUE, table2.getDouble("double")); - Assert.assertEquals(Float.MAX_VALUE, table2.getFloat("float")); - Assert.assertEquals((Integer) Integer.MAX_VALUE, table2.getInteger("int")); - Assert.assertEquals((Long) Long.MAX_VALUE, table2.getLong("long")); - Assert.assertEquals((Short) Short.MAX_VALUE, table2.getShort("short")); + Assert.assertEquals(Double.valueOf(Double.MAX_VALUE), table2.getDouble("double")); + Assert.assertEquals(Float.valueOf(Float.MAX_VALUE), table2.getFloat("float")); + Assert.assertEquals(Integer.valueOf(Integer.MAX_VALUE), table2.getInteger("int")); + Assert.assertEquals(Long.valueOf(Long.MAX_VALUE), table2.getLong("long")); + Assert.assertEquals(Short.valueOf(Short.MAX_VALUE), table2.getShort("short")); Assert.assertEquals("hello", table2.getString("string")); - Assert.assertEquals(null, table2.getString("null-string")); + Assert.assertNull(table2.getString("null-string")); } public void testEncodingSize() Modified: qpid/trunk/qpid/java/ivy.retrieve.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/ivy.retrieve.xml?rev=1589144&r1=1589143&r2=1589144&view=diff ============================================================================== --- qpid/trunk/qpid/java/ivy.retrieve.xml (original) +++ qpid/trunk/qpid/java/ivy.retrieve.xml Tue Apr 22 14:50:53 2014 @@ -52,7 +52,7 @@ <dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="1.9.0" transitive="false"/> <dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="1.9.0" transitive="false"/> <dependency org="net.java.dev.javacc" name="javacc" rev="5.0" transitive="false"/> - <dependency org="junit" name="junit" rev="3.8.1" transitive="false"/> + <dependency org="junit" name="junit" rev="4.11" transitive="false"/> <dependency org="org.python" name="jython-standalone" rev="2.5.2" transitive="false"/> <dependency org="log4j" name="log4j" rev="1.2.16" transitive="false"/> <dependency org="org.apache.maven" name="maven-ant-tasks" rev="2.1.1" transitive="false"/> Modified: qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantTestHelper.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantTestHelper.java?rev=1589144&r1=1589143&r2=1589144&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantTestHelper.java (original) +++ qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/ParticipantTestHelper.java Tue Apr 22 14:50:53 2014 @@ -18,9 +18,9 @@ */ package org.apache.qpid.disttest.client; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import org.apache.qpid.disttest.message.ParticipantResult; Modified: qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigTestUtils.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigTestUtils.java?rev=1589144&r1=1589143&r2=1589144&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigTestUtils.java (original) +++ qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ConfigTestUtils.java Tue Apr 22 14:50:53 2014 @@ -19,8 +19,8 @@ */ package org.apache.qpid.disttest.controller.config; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.util.List; Modified: qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/ControllerQueue.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/ControllerQueue.java?rev=1589144&r1=1589143&r2=1589144&view=diff ============================================================================== --- qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/ControllerQueue.java (original) +++ qpid/trunk/qpid/java/qpid-perftests-systests/src/main/java/org/apache/qpid/systest/disttest/clientonly/ControllerQueue.java Tue Apr 22 14:50:53 2014 @@ -30,7 +30,7 @@ import javax.jms.MessageConsumer; import javax.jms.Session; import javax.naming.Context; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.qpid.disttest.DistributedTestConstants; import org.apache.qpid.disttest.jms.JmsMessageAdaptor; Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java?rev=1589144&r1=1589143&r2=1589144&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java Tue Apr 22 14:50:53 2014 @@ -21,7 +21,7 @@ package org.apache.qpid.server.queue; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.log4j.Logger; import org.apache.qpid.client.AMQConnection; Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java?rev=1589144&r1=1589143&r2=1589144&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java Tue Apr 22 14:50:53 2014 @@ -20,8 +20,8 @@ */ package org.apache.qpid.systest.rest; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotNull; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import java.util.Arrays; import java.util.Collection; Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java?rev=1589144&r1=1589143&r2=1589144&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java Tue Apr 22 14:50:53 2014 @@ -49,7 +49,7 @@ import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.TrustManagerFactory; import javax.servlet.http.HttpServletResponse; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.commons.codec.binary.Base64; import org.apache.log4j.Logger; import org.codehaus.jackson.JsonGenerationException; Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java?rev=1589144&r1=1589143&r2=1589144&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java Tue Apr 22 14:50:53 2014 @@ -18,10 +18,10 @@ */ package org.apache.qpid.test.client; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertNull; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java?rev=1589144&r1=1589143&r2=1589144&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java Tue Apr 22 14:50:53 2014 @@ -20,7 +20,7 @@ */ package org.apache.qpid.test.client.message; -import junit.framework.Assert; +import org.junit.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java?rev=1589144&r1=1589143&r2=1589144&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java Tue Apr 22 14:50:53 2014 @@ -19,7 +19,7 @@ */ package org.apache.qpid.test.unit.basic; -import junit.framework.Assert; +import org.junit.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MapMessageTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MapMessageTest.java?rev=1589144&r1=1589143&r2=1589144&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MapMessageTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/MapMessageTest.java Tue Apr 22 14:50:53 2014 @@ -20,7 +20,7 @@ */ package org.apache.qpid.test.unit.basic; -import junit.framework.Assert; +import org.junit.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -549,7 +549,7 @@ public class MapMessageTest extends Qpid // normal execution } - Assert.assertEquals(Double.MAX_VALUE, m.getDouble("double")); + Assert.assertEquals(Double.MAX_VALUE, m.getDouble("double"), 0d); // Try bad reads try @@ -630,9 +630,9 @@ public class MapMessageTest extends Qpid // normal execution } - Assert.assertEquals(Float.MAX_VALUE, m.getFloat("float")); + Assert.assertEquals(Float.MAX_VALUE, m.getFloat("float"), 0f); - Assert.assertEquals(_smallfloat, (float) m.getDouble("smallfloat")); + Assert.assertEquals(_smallfloat, m.getDouble("smallfloat"), 0f); // Try bad reads try Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java?rev=1589144&r1=1589143&r2=1589144&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java Tue Apr 22 14:50:53 2014 @@ -19,7 +19,7 @@ */ package org.apache.qpid.test.unit.basic; -import junit.framework.Assert; +import org.junit.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java?rev=1589144&r1=1589143&r2=1589144&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java Tue Apr 22 14:50:53 2014 @@ -39,7 +39,7 @@ import javax.jms.MessageProducer; import javax.jms.Queue; import javax.jms.Session; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQQueue; @@ -274,13 +274,13 @@ public class PropertyValueTest extends Q // Check Properties Assert.assertEquals("Check Boolean properties are correctly transported", true, m.getBooleanProperty("Bool")); - Assert.assertEquals("Check Byte properties are correctly transported", (byte) Byte.MAX_VALUE, + Assert.assertEquals("Check Byte properties are correctly transported", Byte.MAX_VALUE, m.getByteProperty("Byte")); - Assert.assertEquals("Check Double properties are correctly transported", (double) Double.MAX_VALUE, - m.getDoubleProperty("Double")); - Assert.assertEquals("Check Float properties are correctly transported", (float) Float.MAX_VALUE, - m.getFloatProperty("Float")); - Assert.assertEquals("Check Int properties are correctly transported", (int) Integer.MAX_VALUE, + Assert.assertEquals("Check Double properties are correctly transported", Double.MAX_VALUE, + m.getDoubleProperty("Double"), 0d); + Assert.assertEquals("Check Float properties are correctly transported", Float.MAX_VALUE, + m.getFloatProperty("Float"), 0f); + Assert.assertEquals("Check Int properties are correctly transported", Integer.MAX_VALUE, m.getIntProperty("Int")); Assert.assertEquals("Check CorrelationID properties are correctly transported", "Correlation", m.getJMSCorrelationID()); Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java?rev=1589144&r1=1589143&r2=1589144&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java Tue Apr 22 14:50:53 2014 @@ -20,7 +20,7 @@ */ package org.apache.qpid.test.unit.basic; -import junit.framework.Assert; +import org.junit.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
