changed the code after code review

Author: ammajumd

java/src/test/java/com/cybersource/ws/client/SecurityUtilIT.java

@@ -120,7 +120,7 @@ public void testSoapWrapAndSign() throws Exception {
 
     @Test
     public void testSoapWrapSignedAndEncrypt() throws Exception {
-    	Thread.sleep(30000);
+    	Thread.sleep(40000);
 
     	Document signedDoc = SecurityUtil.createSignedDoc(wrappedDoc,config.getMerchantID(),config.getKeyPassword(),logger);
         NodeList signatureElement = signedDoc.getElementsByTagName("wsse:Security");
@@ -181,28 +181,9 @@ private static PrivateKey instPrivateKey(PrivateKey pkey) throws Exception{
         return privateKey;
     }
 
-    @Test
-    public void testLoadMerchantP12File() throws Exception{
 
 
-    	Identity identity = Mockito.mock(Identity.class);
-    	//MerchantConfig config=Mockito.mock(MerchantConfig.class);
-    	File keyFile=config.getKeyFile();
-    	boolean value=(config.getMerchantID() == null || !(identity.isValid(keyFile)));
-    	assert(value==true);
-		if (value == true) {
-
-			logger.log(Logger.LT_INFO, "Condition valid");
-
-		} else {
-
-			logger.log(Logger.LT_INFO, "Condition false");
-		}
-    		
-    	}
-    	
-    	
-    }
+ }