svn commit: r1583061 - in /commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils: discovery/UDPDiscoverySenderUnitTest.java key/KeyGeneratorUtilUnitTest.java

[tv]

Author: tv
Date: Sat Mar 29 21:38:05 2014
New Revision: 1583061

URL: http://svn.apache.org/r1583061
Log:
Clean up some Findbugs complaints

Modified:
    
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/discovery/UDPDiscoverySenderUnitTest.java
    
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/key/KeyGeneratorUtilUnitTest.java

Modified: 
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/discovery/UDPDiscoverySenderUnitTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/discovery/UDPDiscoverySenderUnitTest.java?rev=1583061&r1=1583060&r2=1583061&view=diff
==============================================================================
--- 
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/discovery/UDPDiscoverySenderUnitTest.java
 (original)
+++ 
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/discovery/UDPDiscoverySenderUnitTest.java
 Sat Mar 29 21:38:05 2014
@@ -23,6 +23,8 @@ import java.util.ArrayList;
 
 import junit.framework.TestCase;
 
+import 
org.apache.commons.jcs.utils.discovery.UDPDiscoveryMessage.BroadcastType;
+
 /**
  * Tests for the sender.
  */
@@ -100,7 +102,7 @@ public class UDPDiscoverySenderUnitTest
         // disabled test because of JCS-89
         // assertEquals( "wrong host", SENDING_HOST, msg.getHost() );
         assertEquals( "wrong port", SENDING_PORT, msg.getPort() );
-        assertEquals( "wrong message type", 
UDPDiscoveryMessage.PASSIVE_BROADCAST, msg.getMessageType() );
+        assertEquals( "wrong message type", BroadcastType.PASSIVE, 
msg.getMessageType() );
     }
 
     /**
@@ -127,7 +129,7 @@ public class UDPDiscoverySenderUnitTest
         // disabled test because of JCS-89
         // assertEquals( "wrong host", SENDING_HOST, msg.getHost() );
         assertEquals( "wrong port", SENDING_PORT, msg.getPort() );
-        assertEquals( "wrong message type", 
UDPDiscoveryMessage.REMOVE_BROADCAST, msg.getMessageType() );
+        assertEquals( "wrong message type", BroadcastType.REMOVE, 
msg.getMessageType() );
     }
 
     /**
@@ -148,6 +150,6 @@ public class UDPDiscoverySenderUnitTest
         assertTrue( "unexpected crap received", obj instanceof 
UDPDiscoveryMessage );
 
         UDPDiscoveryMessage msg = (UDPDiscoveryMessage) obj;
-        assertEquals( "wrong message type", 
UDPDiscoveryMessage.REQUEST_BROADCAST, msg.getMessageType() );
+        assertEquals( "wrong message type", BroadcastType.REQUEST, 
msg.getMessageType() );
     }
 }

Modified: 
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/key/KeyGeneratorUtilUnitTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/key/KeyGeneratorUtilUnitTest.java?rev=1583061&r1=1583060&r2=1583061&view=diff
==============================================================================
--- 
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/key/KeyGeneratorUtilUnitTest.java
 (original)
+++ 
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/key/KeyGeneratorUtilUnitTest.java
 Sat Mar 29 21:38:05 2014
@@ -20,12 +20,12 @@ package org.apache.commons.jcs.utils.key
  */
 
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 
 import junit.framework.TestCase;
 
-import org.apache.commons.jcs.utils.date.DateFormatter;
 import org.apache.commons.jcs.utils.timing.SleepUtil;
 
 /**
@@ -34,6 +34,12 @@ import org.apache.commons.jcs.utils.timi
 public class KeyGeneratorUtilUnitTest
     extends TestCase
 {
+    private String getDddHHmm( Date d )
+    {
+        SimpleDateFormat sdf = new 
SimpleDateFormat(KeyGeneratorUtil.dddHHmmFormat);
+        return sdf.format( d );
+    }
+
     /**
      * Creates a query id. Verify that we lead with the system lead.
      */
@@ -44,7 +50,7 @@ public class KeyGeneratorUtilUnitTest
         System.setProperty( KeyGeneratorUtil.KEY_LEAD_NUMBER_PROPERTY_NAME, 
lead );
         // have to force this since it might have already been loaded.
         KeyGeneratorUtil.setLeadFromSystemProperty();
-        String expectedDate = DateFormatter.getDddHHmm( new Date() );
+        String expectedDate = getDddHHmm( new Date() );
 
         // DO WORK
         String result = KeyGeneratorUtil.generateRequestId();
@@ -66,7 +72,7 @@ public class KeyGeneratorUtilUnitTest
         System.setProperty( KeyGeneratorUtil.KEY_LEAD_NUMBER_PROPERTY_NAME, 
lead );
         // have to force this since it might have already been loaded.
         KeyGeneratorUtil.setLeadFromSystemProperty();
-        String expectedDate = DateFormatter.getDddHHmm( new Date() );
+        String expectedDate = getDddHHmm( new Date() );
 
         // DO WORK
         String result = KeyGeneratorUtil.generateRequestId();
@@ -83,7 +89,7 @@ public class KeyGeneratorUtilUnitTest
     public void testGetQueryId()
     {
         // SETUP
-        String expectedDate = DateFormatter.getDddHHmm( new Date() );
+        String expectedDate = getDddHHmm( new Date() );
 
         // DO WORK
         String result = KeyGeneratorUtil.generateRequestId();
@@ -102,7 +108,7 @@ public class KeyGeneratorUtilUnitTest
         cal.set( Calendar.HOUR_OF_DAY, 13 );
         cal.set( Calendar.MINUTE, 59 );
 
-        String inputDate = DateFormatter.getDddHHmm( cal.getTime() );
+        String inputDate = getDddHHmm( cal.getTime() );
 
         // DO WORK
         try
@@ -132,7 +138,7 @@ public class KeyGeneratorUtilUnitTest
         cal.set( Calendar.HOUR_OF_DAY, 13 );
         cal.set( Calendar.MINUTE, 59 );
 
-        String inputDate = DateFormatter.getDddHHmm( cal.getTime() );
+        String inputDate = getDddHHmm( cal.getTime() );
 
         // DO WORK
         try