From 1e30ce31c21d3f02d3a8320bf633498433ac66cb Mon Sep 17 00:00:00 2001
From: Samuel Langlois <samuel.langlois@alfresco.com>
Date: Thu, 16 Aug 2012 12:04:28 +0000
Subject: [PATCH] Use java.util.Arrays, trying to move away from BouncyCastle

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@40499 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/java/org/alfresco/encryption/EncryptorTest.java      | 6 +++---
 .../alfresco/repo/domain/propval/PropertyValueDAOTest.java  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/java/org/alfresco/encryption/EncryptorTest.java b/source/java/org/alfresco/encryption/EncryptorTest.java
index 1fe52d2a7e..e57f7c5a65 100644
--- a/source/java/org/alfresco/encryption/EncryptorTest.java
+++ b/source/java/org/alfresco/encryption/EncryptorTest.java
@@ -21,12 +21,12 @@ package org.alfresco.encryption;
 import java.io.Serializable;
 import java.security.AlgorithmParameters;
 import java.security.KeyException;
+import java.util.Arrays;
 
 import junit.framework.TestCase;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.util.Pair;
-import org.bouncycastle.util.Arrays;
 
 /**
  * @since 4.0
@@ -53,7 +53,7 @@ public class EncryptorTest extends TestCase
                 "fluff",
                 encryptedPair.getSecond(),
                 encryptedPair.getFirst());
-        assertTrue("Encryption round trip failed. ", Arrays.areEqual(bytes, decrypted));
+        assertTrue("Encryption round trip failed. ", Arrays.equals(bytes, decrypted));
     }
     
     public void testBasicBytes_WithKey()
@@ -65,7 +65,7 @@ public class EncryptorTest extends TestCase
                 "mykey1",
                 encryptedPair.getSecond(),
                 encryptedPair.getFirst());
-        assertTrue("Encryption round trip failed. ", Arrays.areEqual(bytes, decrypted));
+        assertTrue("Encryption round trip failed. ", Arrays.equals(bytes, decrypted));
     }
     
     public void testBasicObject()
diff --git a/source/java/org/alfresco/repo/domain/propval/PropertyValueDAOTest.java b/source/java/org/alfresco/repo/domain/propval/PropertyValueDAOTest.java
index 1ef1281642..7d999acde9 100644
--- a/source/java/org/alfresco/repo/domain/propval/PropertyValueDAOTest.java
+++ b/source/java/org/alfresco/repo/domain/propval/PropertyValueDAOTest.java
@@ -20,6 +20,7 @@ package org.alfresco.repo.domain.propval;
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
@@ -40,7 +41,6 @@ import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.util.ApplicationContextHelper;
 import org.alfresco.util.GUID;
 import org.alfresco.util.Pair;
-import org.bouncycastle.util.Arrays;
 import org.springframework.context.ApplicationContext;
 import org.springframework.extensions.surf.util.ISO8601DateFormat;
 
@@ -301,7 +301,7 @@ public class PropertyValueDAOTest extends TestCase
                 Serializable check = propertyValueDAO.getPropertySerializableValueById(id).getSecond();
                 assertNotNull(check);
                 assertTrue(check instanceof byte[]);
-                Arrays.areEqual((byte[])bytes, (byte[])check);
+                Arrays.equals((byte[])bytes, (byte[])check);
                 return null;
             }
         };