Author: j16sdiz
Date: 2009-02-22 11:23:02 +0000 (Sun, 22 Feb 2009)
New Revision: 25763
Modified:
trunk/freenet/test/freenet/support/DoublyLinkedListImplTest.java
trunk/freenet/test/freenet/support/LRUHashtableTest.java
trunk/freenet/test/freenet/support/LRUQueueTest.java
Log:
Generic warning fix for junit (bug 2512)
Modified: trunk/freenet/test/freenet/support/DoublyLinkedListImplTest.java
===================================================================
--- trunk/freenet/test/freenet/support/DoublyLinkedListImplTest.java
2009-02-22 11:22:28 UTC (rev 25762)
+++ trunk/freenet/test/freenet/support/DoublyLinkedListImplTest.java
2009-02-22 11:23:02 UTC (rev 25763)
@@ -66,22 +66,22 @@
list.push(new T(3));
assertFalse("isEmpty()", list.isEmpty());
- ((T) list.pop()).assertV(3);
+ list.pop().assertV(3);
assertFalse("isEmpty()", list.isEmpty());
- ((T) list.pop()).assertV(2);
+ list.pop().assertV(2);
assertFalse("isEmpty()", list.isEmpty());
// add again
list.push(new T(4));
list.push(new T(5));
- ((T) list.pop()).assertV(5);
+ list.pop().assertV(5);
assertFalse("isEmpty()", list.isEmpty());
- ((T) list.pop()).assertV(4);
+ list.pop().assertV(4);
assertFalse("isEmpty()", list.isEmpty());
- ((T) list.pop()).assertV(1);
+ list.pop().assertV(1);
assertFalse("isEmpty()", list.isEmpty());
- ((T) list.pop()).assertV(0);
+ list.pop().assertV(0);
assertTrue("isEmpty()", list.isEmpty());
assertNull("pop()", list.pop());
@@ -95,22 +95,22 @@
list.unshift(new T(3));
assertFalse("isEmpty()", list.isEmpty());
- ((T) list.shift()).assertV(3);
+ list.shift().assertV(3);
assertFalse("isEmpty()", list.isEmpty());
- ((T) list.shift()).assertV(2);
+ list.shift().assertV(2);
assertFalse("isEmpty()", list.isEmpty());
// add again
list.unshift(new T(4));
list.unshift(new T(5));
- ((T) list.shift()).assertV(5);
+ list.shift().assertV(5);
assertFalse("isEmpty()", list.isEmpty());
- ((T) list.shift()).assertV(4);
+ list.shift().assertV(4);
assertFalse("isEmpty()", list.isEmpty());
- ((T) list.shift()).assertV(1);
+ list.shift().assertV(1);
assertFalse("isEmpty()", list.isEmpty());
- ((T) list.shift()).assertV(0);
+ list.shift().assertV(0);
assertTrue("isEmpty()", list.isEmpty());
assertNull("shift()", list.shift());
@@ -125,10 +125,10 @@
assertEquals("size()", 4, list.size());
assertFalse("isEmpty()", list.isEmpty());
- ((T) list.shift()).assertV(3);
+ list.shift().assertV(3);
assertEquals("size()", 3, list.size());
assertFalse("isEmpty()", list.isEmpty());
- ((T) list.shift()).assertV(2);
+ list.shift().assertV(2);
assertEquals("size()", 2, list.size());
assertFalse("isEmpty()", list.isEmpty());
@@ -143,8 +143,8 @@
assertEquals("size()", 2, list.size());
assertFalse("isEmpty()", list.isEmpty());
- ((T) list.shift()).assertV(5);
- ((T) list.shift()).assertV(4);
+ list.shift().assertV(5);
+ list.shift().assertV(4);
assertEquals("size()", 0, list.size());
assertTrue("isEmpty()", list.isEmpty());
@@ -178,17 +178,17 @@
DoublyLinkedList<T> list2 = list.shift(2);
assertEquals("list2.size()", 2, list2.size());
- ((T) list2.shift()).assertV(0);
- ((T) list2.shift()).assertV(1);
+ list2.shift().assertV(0);
+ list2.shift().assertV(1);
assertTrue("list2.isEmpty()", list2.isEmpty());
assertEquals("list.size()", 3, list.size());
- ((T) list.shift()).assertV(2);
+ list.shift().assertV(2);
list2 = list.shift(20);
assertTrue("list.isEmpty()", list.isEmpty());
- ((T) list2.shift()).assertV(3);
- ((T) list2.shift()).assertV(4);
+ list2.shift().assertV(3);
+ list2.shift().assertV(4);
assertTrue("list2.isEmpty()", list2.isEmpty());
list2 = list.shift(20);
@@ -204,17 +204,17 @@
DoublyLinkedList<T> list2 = list.pop(2);
assertEquals("list2.size()", 2, list2.size());
- ((T) list2.pop()).assertV(0);
- ((T) list2.pop()).assertV(1);
+ list2.pop().assertV(0);
+ list2.pop().assertV(1);
assertTrue("list2.isEmpty()", list2.isEmpty());
assertEquals("list.size()", 3, list.size());
- ((T) list.pop()).assertV(2);
+ list.pop().assertV(2);
list2 = list.pop(20);
assertTrue("list.isEmpty()", list.isEmpty());
- ((T) list2.pop()).assertV(3);
- ((T) list2.pop()).assertV(4);
+ list2.pop().assertV(3);
+ list2.pop().assertV(4);
assertTrue("list2.isEmpty()", list2.isEmpty());
list2 = list.pop(20);
@@ -260,7 +260,7 @@
}
// manual, forward
- T h = (T) list.head();
+ T h = list.head();
for (int i = 0; i < 5; i++) {
assertEquals("manual iternate, forward", array[i], h);
//assertEquals("DoublyLinkedList.next() ==
Item.next()", h.getNext(), list.next(h));
@@ -269,12 +269,12 @@
h.assertV(i);
- h = (T) list.next(h);
+ h = list.next(h);
}
assertEquals("h==null", null, h);
// manual, reverse
- T t = (T) list.tail();
+ T t = list.tail();
for (int i = 4; i >= 0; i--) {
assertEquals("manual iternate, reverse", array[i], t);
//assertEquals("DoublyLinkedList.prev() ==
Item.getPrev()", tail.getPrev(), list.prev(tail));
@@ -283,7 +283,7 @@
t.assertV(i);
- t = (T) list.prev(t);
+ t = list.prev(t);
}
assertNull("t==null", t);
@@ -321,11 +321,11 @@
// Remove non-identical (but equal) item -> give null
assertNull(list.remove(new T(2)));
- ((T) list.shift()).assertV(0);
- ((T) list.shift()).assertV(1);
- ((T) list.shift()).assertV(2);
- ((T) list.shift()).assertV(4);
- ((T) list.shift()).assertV(3);
+ list.shift().assertV(0);
+ list.shift().assertV(1);
+ list.shift().assertV(2);
+ list.shift().assertV(4);
+ list.shift().assertV(3);
assertNull(list.remove(new T(-1)));
}
@@ -339,12 +339,12 @@
list.unshift(new T(4));
list.unshift(new T(5));
- ((T) list.shift()).assertV(5);
- ((T) list.pop()).assertV(3);
- ((T) list.pop()).assertV(1);
- ((T) list.pop()).assertV(0);
- ((T) list.shift()).assertV(4);
- ((T) list.shift()).assertV(2);
+ list.shift().assertV(5);
+ list.pop().assertV(3);
+ list.pop().assertV(1);
+ list.pop().assertV(0);
+ list.shift().assertV(4);
+ list.shift().assertV(2);
}
public void testRandomInsert() {
@@ -419,15 +419,15 @@
} catch (VirginItemException vie) {
}
- ((T) list.shift()).assertV(100);
- ((T) list.shift()).assertV(0);
- ((T) list.shift()).assertV(1);
- ((T) list.shift()).assertV(102);
- ((T) list.shift()).assertV(2);
- ((T) list.shift()).assertV(3);
- ((T) list.shift()).assertV(4);
- ((T) list.shift()).assertV(105);
- ((T) list.shift()).assertV(104);
+ list.shift().assertV(100);
+ list.shift().assertV(0);
+ list.shift().assertV(1);
+ list.shift().assertV(102);
+ list.shift().assertV(2);
+ list.shift().assertV(3);
+ list.shift().assertV(4);
+ list.shift().assertV(105);
+ list.shift().assertV(104);
}
}
Modified: trunk/freenet/test/freenet/support/LRUHashtableTest.java
===================================================================
--- trunk/freenet/test/freenet/support/LRUHashtableTest.java 2009-02-22
11:22:28 UTC (rev 25762)
+++ trunk/freenet/test/freenet/support/LRUHashtableTest.java 2009-02-22
11:23:02 UTC (rev 25763)
@@ -200,7 +200,7 @@
* LRUHashtable.
*/
public void testPopValueFromEmpty() {
- LRUHashtable methodLRUht = new LRUHashtable();
+ LRUHashtable<?, ?> methodLRUht = new LRUHashtable<Object,
Object>();
assertNull(methodLRUht.popValue());
}
@@ -342,7 +342,7 @@
//pushing objects
for (int i=0; i<sampleObjects.length; i++)
methodLRUht.push(sampleObjects[i][0],sampleObjects[i][1]);
- Enumeration methodEnumeration = methodLRUht.keys();
+ Enumeration<Object> methodEnumeration = methodLRUht.keys();
int j=0;
while(methodEnumeration.hasMoreElements()) {
assertEquals(methodEnumeration.nextElement(),sampleObjects[j][0]);
Modified: trunk/freenet/test/freenet/support/LRUQueueTest.java
===================================================================
--- trunk/freenet/test/freenet/support/LRUQueueTest.java 2009-02-22
11:22:28 UTC (rev 25762)
+++ trunk/freenet/test/freenet/support/LRUQueueTest.java 2009-02-22
11:23:02 UTC (rev 25763)
@@ -45,8 +45,8 @@
* @param size queue size
* @return the created LRUQueue
*/
- private LRUQueue createSampleQueue(int size) {
- LRUQueue methodLRUQueue = new LRUQueue();
+ private LRUQueue<Object> createSampleQueue(int size) {
+ LRUQueue<Object> methodLRUQueue = new LRUQueue<Object>();
Object[] sampleObjects = createSampleObjects(size);
for (int i=0;i<sampleObjects.length;i++)
methodLRUQueue.push(sampleObjects[i]);
@@ -74,10 +74,10 @@
* @param last the last element expected
* @return true if the order is correct
*/
- private boolean verifyLastElemsOrder(LRUQueue aLRUQueue, Object
nextToLast, Object last ) {
+ private boolean verifyLastElemsOrder(LRUQueue<Object> aLRUQueue, Object
nextToLast, Object last ) {
boolean retVal = true;
int size = aLRUQueue.size();
- Enumeration methodEnum = aLRUQueue.elements();
+ Enumeration<Object> methodEnum = aLRUQueue.elements();
int counter = 0;
while (methodEnum.hasMoreElements()) {
//next-to-last object
@@ -98,7 +98,7 @@
* exception is raised
*/
public void testPushNull() {
- LRUQueue methodLRUQueue =
this.createSampleQueue(sampleElemsNumber);
+ LRUQueue<Object> methodLRUQueue =
this.createSampleQueue(sampleElemsNumber);
try {
methodLRUQueue.push(null);
fail("Expected Exception Error Not Thrown!"); }
@@ -118,7 +118,7 @@
* when pushing the same object more than one time.
*/
public void testPushSameObjTwice() {
- LRUQueue methodLRUQueue =
this.createSampleQueue(sampleElemsNumber);
+ LRUQueue<Object> methodLRUQueue =
this.createSampleQueue(sampleElemsNumber);
Object[] sampleObj = {new Object(), new Object()};
methodLRUQueue.push(sampleObj[0]);
@@ -140,7 +140,7 @@
* Tests {...@link LRUQueue#pushLeast(Object)} method
*/
public void testPushLeast() {
- LRUQueue methodLRUQueue = new LRUQueue();
+ LRUQueue<Object> methodLRUQueue = new LRUQueue<Object>();
Object[] sampleObj = { new Object(), new Object() };
methodLRUQueue.push(sampleObj[0]);
@@ -161,7 +161,7 @@
* verifying if they are correctly (in a FIFO manner) fetched and
deleted
*/
public void testPop() {
- LRUQueue methodLRUQueue = new LRUQueue();
+ LRUQueue<Object> methodLRUQueue = new LRUQueue<Object>();
Object[] sampleObjects = createSampleObjects(sampleElemsNumber);
//pushing objects
for (int i=0; i<sampleObjects.length; i++)
@@ -179,7 +179,7 @@
*/
public void testSize() {
Object[] sampleObjects = createSampleObjects(sampleElemsNumber);
- LRUQueue methodLRUQueue = new LRUQueue();
+ LRUQueue<Object> methodLRUQueue = new LRUQueue<Object>();
assertEquals(0, methodLRUQueue.size());
//pushing objects
for (int i=0; i<sampleObjects.length; i++) {
@@ -200,7 +200,7 @@
* still contained and the queue size.
*/
public void testRemove() {
- LRUQueue methodLRUQueue = new LRUQueue();
+ LRUQueue<Object> methodLRUQueue = new LRUQueue<Object>();
Object[] sampleObjects = createSampleObjects(sampleElemsNumber);
for (int i=0;i<sampleObjects.length;i++)
methodLRUQueue.push(sampleObjects[i]);
@@ -217,7 +217,7 @@
* trying to remove it after setting up a sample queue.
*/
public void testRemoveNull() {
- LRUQueue methodLRUQueue = createSampleQueue(sampleElemsNumber);
+ LRUQueue<Object> methodLRUQueue =
createSampleQueue(sampleElemsNumber);
try {
methodLRUQueue.remove(null);
fail("Expected Exception Error Not Thrown!"); }
@@ -230,7 +230,7 @@
* present object after setting up a sample queue.
*/
public void testRemoveNotPresent() {
- LRUQueue methodLRUQueue = createSampleQueue(sampleElemsNumber);
+ LRUQueue<Object> methodLRUQueue =
createSampleQueue(sampleElemsNumber);
assertFalse(methodLRUQueue.remove(new Object()));
}
@@ -240,7 +240,7 @@
* object.
*/
public void testContains() {
- LRUQueue methodLRUQueue = createSampleQueue(sampleElemsNumber);
+ LRUQueue<Object> methodLRUQueue =
createSampleQueue(sampleElemsNumber);
assertFalse(methodLRUQueue.contains(new Object()));
Object methodSampleObj = new Object();
methodLRUQueue.push(methodSampleObj);
@@ -254,11 +254,11 @@
*/
public void testElements() {
Object[] sampleObjects = createSampleObjects(sampleElemsNumber);
- LRUQueue methodLRUQueue = new LRUQueue();
+ LRUQueue<Object> methodLRUQueue = new LRUQueue<Object>();
//pushing objects
for (int i=0; i<sampleObjects.length; i++)
methodLRUQueue.push(sampleObjects[i]);
- Enumeration methodEnumeration = methodLRUQueue.elements();
+ Enumeration<Object> methodEnumeration =
methodLRUQueue.elements();
int j=0;
while(methodEnumeration.hasMoreElements()) {
assertEquals(sampleObjects[j],
methodEnumeration.nextElement());
@@ -271,7 +271,7 @@
* has the same object that are put into the created LRUQueue
*/
public void testToArray() {
- LRUQueue methodLRUQueue = new LRUQueue();
+ LRUQueue<Object> methodLRUQueue = new LRUQueue<Object>();
Object[] sampleObjects = createSampleObjects(sampleElemsNumber);
//pushing objects
@@ -289,7 +289,7 @@
* Tests {...@link LRUQueue#toArray(Object[])} method
*/
public void testToArray2() {
- LRUQueue methodLRUQueue = new LRUQueue();
+ LRUQueue<Object> methodLRUQueue = new LRUQueue<Object>();
Object[] sampleObjects = createSampleObjects(sampleElemsNumber);
// pushing objects
@@ -308,7 +308,7 @@
* Tests {...@link LRUQueue#toArrayOrdered()} method
*/
public void testToArrayOrdered() {
- LRUQueue methodLRUQueue = new LRUQueue();
+ LRUQueue<Object> methodLRUQueue = new LRUQueue<Object>();
Object[] sampleObjects = createSampleObjects(sampleElemsNumber);
// pushing objects
@@ -326,7 +326,7 @@
* Tests <code>toArrayOrdered(Object[])</code> method
*/
public void testToArrayOrdered2() {
- LRUQueue methodLRUQueue = new LRUQueue();
+ LRUQueue<Object> methodLRUQueue = new LRUQueue<Object>();
Object[] sampleObjects = createSampleObjects(sampleElemsNumber);
// pushing objects
@@ -347,7 +347,7 @@
* when the queue is empty
*/
public void testToArrayEmptyQueue() {
- LRUQueue methodLRUQueue = new LRUQueue();
+ LRUQueue<Object> methodLRUQueue = new LRUQueue<Object>();
assertEquals(0, methodLRUQueue.toArray().length);
}
@@ -357,7 +357,7 @@
* and then with a sample queue.
*/
public void testIsEmpty() {
- LRUQueue methodLRUQueue = new LRUQueue();
+ LRUQueue<Object> methodLRUQueue = new LRUQueue<Object>();
assertTrue(methodLRUQueue.isEmpty());
methodLRUQueue = createSampleQueue(sampleElemsNumber);
assertFalse(methodLRUQueue.isEmpty());
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
