From 72650d4cc41c64136d064967d7fec3726d850fee Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Thu, 14 Oct 2010 11:52:28 +0000
Subject: [PATCH] Multiple enhancements and bug fixes to the SDK (update from OpenDS by matthew_swift):
---
sdk/tests/unit-tests-testng/src/org/opends/sdk/requests/DigestMD5SASLBindRequestTestCase.java | 33 ++++++++++++---------------------
1 files changed, 12 insertions(+), 21 deletions(-)
diff --git a/sdk/tests/unit-tests-testng/src/org/opends/sdk/requests/DigestMD5SASLBindRequestTestCase.java b/sdk/tests/unit-tests-testng/src/org/opends/sdk/requests/DigestMD5SASLBindRequestTestCase.java
index 530d4ae..52629a6 100644
--- a/sdk/tests/unit-tests-testng/src/org/opends/sdk/requests/DigestMD5SASLBindRequestTestCase.java
+++ b/sdk/tests/unit-tests-testng/src/org/opends/sdk/requests/DigestMD5SASLBindRequestTestCase.java
@@ -35,7 +35,6 @@
import java.util.Arrays;
-import static org.testng.Assert.assertTrue;
import static org.testng.Assert.assertEquals;
@@ -76,37 +75,29 @@
@Test(dataProvider = "DigestMD5SASLBindRequests")
public void testQOP(DigestMD5SASLBindRequest request) throws Exception
{
- DigestMD5SASLBindRequest.QOPOption [] options =
- new DigestMD5SASLBindRequest.QOPOption[]{
- DigestMD5SASLBindRequest.QOPOption.AUTH,
- DigestMD5SASLBindRequest.QOPOption.AUTH_INT,
- DigestMD5SASLBindRequest.QOPOption.AUTH_CONF};
- request.setQOP(options);
-
- DigestMD5SASLBindRequest.QOPOption [] results = request.getQOP();
- for(int i = 0; i < options.length; i++)
- {
- assertEquals(options[i], results[i]);
- }
+ String[] options = new String[] {
+ DigestMD5SASLBindRequest.QOP_AUTH,
+ DigestMD5SASLBindRequest.QOP_AUTH_INT,
+ DigestMD5SASLBindRequest.QOP_AUTH_CONF };
+ request.addQOP(options);
+ assertEquals(request.getQOPs(), Arrays.asList(options));
}
@Test(dataProvider = "DigestMD5SASLBindRequests" )
public void testStrength(DigestMD5SASLBindRequest request) throws Exception
{
- DigestMD5SASLBindRequest.CipherOption[] options =
- new DigestMD5SASLBindRequest.CipherOption[]{
- DigestMD5SASLBindRequest.CipherOption.RC4_40,
- DigestMD5SASLBindRequest.CipherOption.TRIPLE_DES_RC4,
- DigestMD5SASLBindRequest.CipherOption.DES_RC4_56};
- request.setCipher(options);
- assertTrue(Arrays.deepEquals(options, request.getCipher()));
+ request.setCipher(DigestMD5SASLBindRequest.CIPHER_3DES);
+ assertEquals(request.getCipher(), DigestMD5SASLBindRequest.CIPHER_3DES);
+
+ request.setCipher(DigestMD5SASLBindRequest.CIPHER_MEDIUM);
+ assertEquals(request.getCipher(), DigestMD5SASLBindRequest.CIPHER_MEDIUM);
}
@Test(dataProvider = "DigestMD5SASLBindRequests")
public void testServerAuth(DigestMD5SASLBindRequest request) throws Exception
{
request.setServerAuth(true);
- assertEquals(request.getServerAuth(), true);
+ assertEquals(request.isServerAuth(), true);
}
@Test(dataProvider = "DigestMD5SASLBindRequests")
--
Gitblit v1.10.0