inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use java.util.Arrays, trying to move away from BouncyCastle

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@40499 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2012-08-16 12:04:28 +00:00
parent 039f818530
commit 1e30ce31c2
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/encryption/EncryptorTest.java
View File

@@ -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()

4
source/java/org/alfresco/repo/domain/propval/PropertyValueDAOTest.java
View File

@@ -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;
}
};