From 475a964ff6cf8c5d66329710e5ef683cb0bcc8f9 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 27 Sep 2013 13:14:09 +0000
Subject: [PATCH] opendj-ldap-sdk org.forgerock.opendj.ldap.requests.*TestCase.java: Removed redundant code transforming Object arrays back and forth.
---
opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestTestCase.java | 22 +--
opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/UnbindRequestTestCase.java | 15 --
opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/AddRequestTestCase.java | 23 +--
opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestTestCase.java | 22 +--
opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/AbandonRequestTestCase.java | 23 +--
opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestTestCase.java | 21 +--
opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/CompareRequestTestCase.java | 21 +--
opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/ModifyRequestTestCase.java | 23 +--
opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/GenericBindRequestTestCase.java | 24 +--
opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestTestCase.java | 22 +--
opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestTestCase.java | 22 +--
opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestTestCase.java | 19 +--
opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/DeleteRequestTestCase.java | 23 +--
opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestTestCase.java | 15 --
opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java | 21 +--
15 files changed, 89 insertions(+), 227 deletions(-)
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/AbandonRequestTestCase.java b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/AbandonRequestTestCase.java
index 8bfe322..efbe56c 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/AbandonRequestTestCase.java
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/AbandonRequestTestCase.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
+ * Portions copyright 2013 ForgeRock AS
*/
package org.forgerock.opendj.ldap.requests;
@@ -35,25 +36,15 @@
public class AbandonRequestTestCase extends RequestTestCase {
@DataProvider(name = "abandonRequests")
public Object[][] getAbandonRequests() throws Exception {
- final AbandonRequest[] requests = {
- Requests.newAbandonRequest(-1),
- Requests.newAbandonRequest(0),
- Requests.newAbandonRequest(1)
- };
- final Object[][] objArray = new Object[requests.length][1];
- for (int i = 0; i < requests.length; i++) {
- objArray[i][0] = requests[i];
- }
- return objArray;
+ return getTestRequests();
}
@Override
protected AbandonRequest[] createTestRequests() throws Exception {
- final Object[][] objs = getAbandonRequests();
- final AbandonRequest[] ops = new AbandonRequest[objs.length];
- for (int i = 0; i < objs.length; i++) {
- ops[i] = (AbandonRequest) objs[i][0];
- }
- return ops;
+ return new AbandonRequest[] {
+ Requests.newAbandonRequest(-1),
+ Requests.newAbandonRequest(0),
+ Requests.newAbandonRequest(1)
+ };
}
}
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/AddRequestTestCase.java b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/AddRequestTestCase.java
index 1603ff1..9af360d 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/AddRequestTestCase.java
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/AddRequestTestCase.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
+ * Portions copyright 2013 ForgeRock AS
*/
package org.forgerock.opendj.ldap.requests;
@@ -36,26 +37,16 @@
public class AddRequestTestCase extends RequestTestCase {
@DataProvider(name = "addRequests")
public Object[][] getAddRequests() throws Exception {
- final AddRequest[] requests = {
+ return getTestRequests();
+ }
+
+ @Override
+ protected AddRequest[] createTestRequests() throws Exception {
+ return new AddRequest[] {
Requests.newAddRequest(DN.valueOf("uid=addrequest1")),
Requests.newAddRequest("cn=addrequesttestcase"),
Requests.newAddRequest("dn: ou=People,o=test", "objectClass: top",
"objectClass: organizationalUnit", "ou: People")
};
- final Object[][] objArray = new Object[requests.length][1];
- for (int i = 0; i < requests.length; i++) {
- objArray[i][0] = requests[i];
- }
- return objArray;
- }
-
- @Override
- protected AddRequest[] createTestRequests() throws Exception {
- final Object[][] objs = getAddRequests();
- final AddRequest[] ops = new AddRequest[objs.length];
- for (int i = 0; i < objs.length; i++) {
- ops[i] = (AddRequest) objs[i][0];
- }
- return ops;
}
}
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestTestCase.java b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestTestCase.java
index c97e41a..28514a4 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestTestCase.java
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestTestCase.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
+ * Portions copyright 2013 ForgeRock AS
*/
package org.forgerock.opendj.ldap.requests;
@@ -35,24 +36,14 @@
public class AnonymousSASLBindRequestTestCase extends BindRequestTestCase {
@DataProvider(name = "anonymousSASLBindRequests")
public Object[][] getAnonymousSASLBindRequests() throws Exception {
- final AnonymousSASLBindRequest[] requests = {
- Requests.newAnonymousSASLBindRequest(""),
- Requests.newAnonymousSASLBindRequest("test")
- };
- final Object[][] objArray = new Object[requests.length][1];
- for (int i = 0; i < requests.length; i++) {
- objArray[i][0] = requests[i];
- }
- return objArray;
+ return getTestRequests();
}
@Override
protected AnonymousSASLBindRequest[] createTestRequests() throws Exception {
- final Object[][] objs = getAnonymousSASLBindRequests();
- final AnonymousSASLBindRequest[] ops = new AnonymousSASLBindRequest[objs.length];
- for (int i = 0; i < objs.length; i++) {
- ops[i] = (AnonymousSASLBindRequest) objs[i][0];
- }
- return ops;
+ return new AnonymousSASLBindRequest[] {
+ Requests.newAnonymousSASLBindRequest(""),
+ Requests.newAnonymousSASLBindRequest("test")
+ };
}
}
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestTestCase.java b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestTestCase.java
index 4aae140..547789b 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestTestCase.java
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestTestCase.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions copyright 2011 ForgeRock AS
+ * Portions copyright 2011-2013 ForgeRock AS
*/
package org.forgerock.opendj.ldap.requests;
@@ -39,24 +39,14 @@
public class CRAMMD5SASLBindRequestTestCase extends BindRequestTestCase {
@DataProvider(name = "CRAMMD5SASLBindRequests")
public Object[][] getCRAMMD5SASLBindRequests() throws Exception {
- final CRAMMD5SASLBindRequest[] requests = {
- Requests.newCRAMMD5SASLBindRequest("id1", EMPTY_BYTES),
- Requests.newCRAMMD5SASLBindRequest("id2", getBytes("test"))
- };
- final Object[][] objArray = new Object[requests.length][1];
- for (int i = 0; i < requests.length; i++) {
- objArray[i][0] = requests[i];
- }
- return objArray;
+ return getTestRequests();
}
@Override
protected CRAMMD5SASLBindRequest[] createTestRequests() throws Exception {
- final Object[][] objs = getCRAMMD5SASLBindRequests();
- final CRAMMD5SASLBindRequest[] ops = new CRAMMD5SASLBindRequest[objs.length];
- for (int i = 0; i < objs.length; i++) {
- ops[i] = (CRAMMD5SASLBindRequest) objs[i][0];
- }
- return ops;
+ return new CRAMMD5SASLBindRequest[] {
+ Requests.newCRAMMD5SASLBindRequest("id1", EMPTY_BYTES),
+ Requests.newCRAMMD5SASLBindRequest("id2", getBytes("test"))
+ };
}
}
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/CompareRequestTestCase.java b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/CompareRequestTestCase.java
index 85f8b6b..1309f26 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/CompareRequestTestCase.java
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/CompareRequestTestCase.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
+ * Portions copyright 2013 ForgeRock AS
*/
package org.forgerock.opendj.ldap.requests;
@@ -35,25 +36,15 @@
public class CompareRequestTestCase extends RequestTestCase {
@DataProvider(name = "CompareRequests")
public Object[][] getCompareRequests() throws Exception {
- final CompareRequest[] requests = {
- Requests.newCompareRequest("uid=user.0,ou=people,o=test", "cn", "user.0"),
- Requests.newCompareRequest("uid=user.0,ou=people,o=test", "uid", "user.0")
- };
- final Object[][] objArray = new Object[requests.length][1];
- for (int i = 0; i < requests.length; i++) {
- objArray[i][0] = requests[i];
- }
- return objArray;
+ return getTestRequests();
}
@Override
protected CompareRequest[] createTestRequests() throws Exception {
- final Object[][] objs = getCompareRequests();
- final CompareRequest[] ops = new CompareRequest[objs.length];
- for (int i = 0; i < objs.length; i++) {
- ops[i] = (CompareRequest) objs[i][0];
- }
- return ops;
+ return new CompareRequest[] {
+ Requests.newCompareRequest("uid=user.0,ou=people,o=test", "cn", "user.0"),
+ Requests.newCompareRequest("uid=user.0,ou=people,o=test", "uid", "user.0")
+ };
}
}
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/DeleteRequestTestCase.java b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/DeleteRequestTestCase.java
index 93e9ce9..13877d3 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/DeleteRequestTestCase.java
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/DeleteRequestTestCase.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
+ * Portions copyright 2013 ForgeRock AS
*/
package org.forgerock.opendj.ldap.requests;
@@ -36,25 +37,15 @@
public class DeleteRequestTestCase extends RequestTestCase {
@DataProvider(name = "DeleteRequests")
public Object[][] getDeleteRequests() throws Exception {
- final DeleteRequest[] requests = {
- Requests.newDeleteRequest(DN.valueOf("uid=Deleterequest1")),
- Requests.newDeleteRequest("cn=Deleterequesttestcase"),
- Requests.newDeleteRequest("uid=user.999,ou=people,o=test")
- };
- final Object[][] objArray = new Object[requests.length][1];
- for (int i = 0; i < requests.length; i++) {
- objArray[i][0] = requests[i];
- }
- return objArray;
+ return getTestRequests();
}
@Override
protected DeleteRequest[] createTestRequests() throws Exception {
- final Object[][] objs = getDeleteRequests();
- final DeleteRequest[] ops = new DeleteRequest[objs.length];
- for (int i = 0; i < objs.length; i++) {
- ops[i] = (DeleteRequest) objs[i][0];
- }
- return ops;
+ return new DeleteRequest[] {
+ Requests.newDeleteRequest(DN.valueOf("uid=Deleterequest1")),
+ Requests.newDeleteRequest("cn=Deleterequesttestcase"),
+ Requests.newDeleteRequest("uid=user.999,ou=people,o=test")
+ };
}
}
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestTestCase.java b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestTestCase.java
index ecb3647..f0c41a2 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestTestCase.java
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestTestCase.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions copyright 2011 ForgeRock AS
+ * Portions copyright 2011-2013 ForgeRock AS
*/
package org.forgerock.opendj.ldap.requests;
@@ -43,25 +43,15 @@
public class DigestMD5SASLBindRequestTestCase extends BindRequestTestCase {
@DataProvider(name = "DigestMD5SASLBindRequests")
public Object[][] getDigestMD5SASLBindRequests() throws Exception {
- final DigestMD5SASLBindRequest[] requests = {
- Requests.newDigestMD5SASLBindRequest("id1", EMPTY_BYTES),
- Requests.newDigestMD5SASLBindRequest("id2", getBytes("password"))
- };
- final Object[][] objArray = new Object[requests.length][1];
- for (int i = 0; i < requests.length; i++) {
- objArray[i][0] = requests[i];
- }
- return objArray;
+ return getTestRequests();
}
@Override
protected DigestMD5SASLBindRequest[] createTestRequests() throws Exception {
- final Object[][] objs = getDigestMD5SASLBindRequests();
- final DigestMD5SASLBindRequest[] ops = new DigestMD5SASLBindRequest[objs.length];
- for (int i = 0; i < objs.length; i++) {
- ops[i] = (DigestMD5SASLBindRequest) objs[i][0];
- }
- return ops;
+ return new DigestMD5SASLBindRequest[] {
+ Requests.newDigestMD5SASLBindRequest("id1", EMPTY_BYTES),
+ Requests.newDigestMD5SASLBindRequest("id2", getBytes("password"))
+ };
}
@Test(dataProvider = "DigestMD5SASLBindRequests")
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestTestCase.java b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestTestCase.java
index d2d68b1..7b27ca9 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestTestCase.java
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestTestCase.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
+ * Portions copyright 2013 ForgeRock AS
*/
package org.forgerock.opendj.ldap.requests;
@@ -35,21 +36,11 @@
public class ExternalSASLBindRequestTestCase extends BindRequestTestCase {
@DataProvider(name = "ExternalSASLBindRequests")
public Object[][] getExternalSASLBindRequests() throws Exception {
- final ExternalSASLBindRequest[] requests = { Requests.newExternalSASLBindRequest() };
- final Object[][] objArray = new Object[requests.length][1];
- for (int i = 0; i < requests.length; i++) {
- objArray[i][0] = requests[i];
- }
- return objArray;
+ return getTestRequests();
}
@Override
protected ExternalSASLBindRequest[] createTestRequests() throws Exception {
- final Object[][] objs = getExternalSASLBindRequests();
- final ExternalSASLBindRequest[] ops = new ExternalSASLBindRequest[objs.length];
- for (int i = 0; i < objs.length; i++) {
- ops[i] = (ExternalSASLBindRequest) objs[i][0];
- }
- return ops;
+ return new ExternalSASLBindRequest[] { Requests.newExternalSASLBindRequest() };
}
}
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestTestCase.java b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestTestCase.java
index dac5e14..bcace9e 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestTestCase.java
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestTestCase.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions copyright 2011 ForgeRock AS
+ * Portions copyright 2011-2013 ForgeRock AS
*/
package org.forgerock.opendj.ldap.requests;
@@ -43,25 +43,15 @@
public class GSSAPISASLBindRequestTestCase extends BindRequestTestCase {
@DataProvider(name = "GSSAPISASLBindRequests")
public Object[][] getGSSAPISASLBindRequests() throws Exception {
- final GSSAPISASLBindRequest[] requests = {
- Requests.newGSSAPISASLBindRequest("id1", EMPTY_BYTES),
- Requests.newGSSAPISASLBindRequest("id2", getBytes("password"))
- };
- final Object[][] objArray = new Object[requests.length][1];
- for (int i = 0; i < requests.length; i++) {
- objArray[i][0] = requests[i];
- }
- return objArray;
+ return getTestRequests();
}
@Override
protected GSSAPISASLBindRequest[] createTestRequests() throws Exception {
- final Object[][] objs = getGSSAPISASLBindRequests();
- final GSSAPISASLBindRequest[] ops = new GSSAPISASLBindRequest[objs.length];
- for (int i = 0; i < objs.length; i++) {
- ops[i] = (GSSAPISASLBindRequest) objs[i][0];
- }
- return ops;
+ return new GSSAPISASLBindRequest[] {
+ Requests.newGSSAPISASLBindRequest("id1", EMPTY_BYTES),
+ Requests.newGSSAPISASLBindRequest("id2", getBytes("password"))
+ };
}
@Test(enabled = false)
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/GenericBindRequestTestCase.java b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/GenericBindRequestTestCase.java
index 3a508e5..f3307d4 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/GenericBindRequestTestCase.java
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/GenericBindRequestTestCase.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions copyright 2011 ForgeRock AS
+ * Portions copyright 2011-2013 ForgeRock AS
*/
package org.forgerock.opendj.ldap.requests;
@@ -41,26 +41,16 @@
public class GenericBindRequestTestCase extends BindRequestTestCase {
@DataProvider(name = "GenericBindRequests")
public Object[][] getGenericBindRequests() throws Exception {
- final GenericBindRequest[] requests = {
+ return getTestRequests();
+ }
+
+ @Override
+ protected GenericBindRequest[] createTestRequests() throws Exception {
+ return new GenericBindRequest[] {
Requests.newGenericBindRequest(LDAPConstants.TYPE_AUTHENTICATION_SASL, EMPTY_BYTES),
Requests.newGenericBindRequest(LDAPConstants.TYPE_AUTHENTICATION_SIMPLE, getBytes("password")),
Requests.newGenericBindRequest("username", LDAPConstants.TYPE_AUTHENTICATION_SIMPLE,
getBytes("password"))
};
- final Object[][] objArray = new Object[requests.length][1];
- for (int i = 0; i < requests.length; i++) {
- objArray[i][0] = requests[i];
- }
- return objArray;
- }
-
- @Override
- protected GenericBindRequest[] createTestRequests() throws Exception {
- final Object[][] objs = getGenericBindRequests();
- final GenericBindRequest[] ops = new GenericBindRequest[objs.length];
- for (int i = 0; i < objs.length; i++) {
- ops[i] = (GenericBindRequest) objs[i][0];
- }
- return ops;
}
}
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java
index b8135a7..8a60ff6 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
+ * Portions copyright 2013 ForgeRock AS
*/
package org.forgerock.opendj.ldap.requests;
@@ -35,24 +36,14 @@
public class ModifyDNRequestTestCase extends RequestTestCase {
@DataProvider(name = "ModifyDNRequests")
public Object[][] getModifyDNRequests() throws Exception {
- final ModifyDNRequest[] requests = {
- Requests.newModifyDNRequest("uid=user.100,ou=people,o=test", "uid=100.user,ou=people,o=testl"),
- Requests.newModifyDNRequest("cn=ModifyDNrequesttestcase", "cn=xyz"),
- };
- final Object[][] objArray = new Object[requests.length][1];
- for (int i = 0; i < requests.length; i++) {
- objArray[i][0] = requests[i];
- }
- return objArray;
+ return getTestRequests();
}
@Override
protected ModifyDNRequest[] createTestRequests() throws Exception {
- final Object[][] objs = getModifyDNRequests();
- final ModifyDNRequest[] ops = new ModifyDNRequest[objs.length];
- for (int i = 0; i < objs.length; i++) {
- ops[i] = (ModifyDNRequest) objs[i][0];
- }
- return ops;
+ return new ModifyDNRequest[] {
+ Requests.newModifyDNRequest("uid=user.100,ou=people,o=test", "uid=100.user,ou=people,o=testl"),
+ Requests.newModifyDNRequest("cn=ModifyDNrequesttestcase", "cn=xyz"),
+ };
}
}
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/ModifyRequestTestCase.java b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/ModifyRequestTestCase.java
index 8035509..b4aeda4 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/ModifyRequestTestCase.java
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/ModifyRequestTestCase.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
+ * Portions copyright 2013 ForgeRock AS
*/
package org.forgerock.opendj.ldap.requests;
@@ -37,7 +38,12 @@
public class ModifyRequestTestCase extends RequestTestCase {
@DataProvider(name = "ModifyRequests")
public Object[][] getModifyRequests() throws Exception {
- final ModifyRequest[] requests = {
+ return getTestRequests();
+ }
+
+ @Override
+ protected ModifyRequest[] createTestRequests() throws Exception {
+ return new ModifyRequest[] {
Requests.newModifyRequest(DN.valueOf("uid=Modifyrequest1")).addModification(
ModificationType.ADD, "userpassword", "password"),
Requests.newModifyRequest("cn=Modifyrequesttestcase").addModification(
@@ -45,21 +51,6 @@
Requests.newModifyRequest("dn: ou=People,o=test", "changetype: modify",
"add: userpassword", "userpassword: password")
};
- final Object[][] objArray = new Object[requests.length][1];
- for (int i = 0; i < requests.length; i++) {
- objArray[i][0] = requests[i];
- }
- return objArray;
- }
-
- @Override
- protected ModifyRequest[] createTestRequests() throws Exception {
- final Object[][] objs = getModifyRequests();
- final ModifyRequest[] ops = new ModifyRequest[objs.length];
- for (int i = 0; i < objs.length; i++) {
- ops[i] = (ModifyRequest) objs[i][0];
- }
- return ops;
}
}
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestTestCase.java b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestTestCase.java
index ace54c4..bd53a0f 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestTestCase.java
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestTestCase.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions copyright 2011 ForgeRock AS
+ * Portions copyright 2011-2013 ForgeRock AS
*/
package org.forgerock.opendj.ldap.requests;
@@ -39,24 +39,14 @@
public class PlainSASLBindRequestTestCase extends BindRequestTestCase {
@DataProvider(name = "plainSASLBindRequests")
public Object[][] getPlainSASLBindRequests() throws Exception {
- final PlainSASLBindRequest[] requests = {
- Requests.newPlainSASLBindRequest("id1", EMPTY_BYTES),
- Requests.newPlainSASLBindRequest("id2", getBytes("password"))
- };
- final Object[][] objArray = new Object[requests.length][1];
- for (int i = 0; i < requests.length; i++) {
- objArray[i][0] = requests[i];
- }
- return objArray;
+ return getTestRequests();
}
@Override
protected PlainSASLBindRequest[] createTestRequests() throws Exception {
- final Object[][] objs = getPlainSASLBindRequests();
- final PlainSASLBindRequest[] ops = new PlainSASLBindRequest[objs.length];
- for (int i = 0; i < objs.length; i++) {
- ops[i] = (PlainSASLBindRequest) objs[i][0];
- }
- return ops;
+ return new PlainSASLBindRequest[] {
+ Requests.newPlainSASLBindRequest("id1", EMPTY_BYTES),
+ Requests.newPlainSASLBindRequest("id2", getBytes("password"))
+ };
}
}
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestTestCase.java b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestTestCase.java
index 3480e87..eaa2619 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestTestCase.java
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestTestCase.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
+ * Portions copyright 2013 ForgeRock AS
*/
package org.forgerock.opendj.ldap.requests;
@@ -35,23 +36,15 @@
public class SimpleBindRequestTestCase extends BindRequestTestCase {
@DataProvider(name = "simpleBindRequests")
public Object[][] getSimpleBindRequests() throws Exception {
- final SimpleBindRequest[] requests = { Requests.newSimpleBindRequest(), // anonymous;
- Requests.newSimpleBindRequest("username", "password".toCharArray()) };
- final Object[][] objArray = new Object[requests.length][1];
- for (int i = 0; i < requests.length; i++) {
- objArray[i][0] = requests[i];
- }
- return objArray;
+ return getTestRequests();
}
@Override
protected SimpleBindRequest[] createTestRequests() throws Exception {
- final Object[][] objs = getSimpleBindRequests();
- final SimpleBindRequest[] ops = new SimpleBindRequest[objs.length];
- for (int i = 0; i < objs.length; i++) {
- ops[i] = (SimpleBindRequest) objs[i][0];
- }
- return ops;
+ return new SimpleBindRequest[] {
+ Requests.newSimpleBindRequest(), // anonymous;
+ Requests.newSimpleBindRequest("username", "password".toCharArray())
+ };
}
}
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/UnbindRequestTestCase.java b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/UnbindRequestTestCase.java
index 0daa8dc..08fbb4c 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/UnbindRequestTestCase.java
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/requests/UnbindRequestTestCase.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
+ * Portions copyright 2013 ForgeRock AS
*/
package org.forgerock.opendj.ldap.requests;
@@ -35,21 +36,11 @@
public class UnbindRequestTestCase extends RequestTestCase {
@DataProvider(name = "UnbindRequests")
public Object[][] getUnbindRequests() throws Exception {
- final UnbindRequest[] requests = { Requests.newUnbindRequest(), };
- final Object[][] objArray = new Object[requests.length][1];
- for (int i = 0; i < requests.length; i++) {
- objArray[i][0] = requests[i];
- }
- return objArray;
+ return getTestRequests();
}
@Override
protected UnbindRequest[] createTestRequests() throws Exception {
- final Object[][] objs = getUnbindRequests();
- final UnbindRequest[] ops = new UnbindRequest[objs.length];
- for (int i = 0; i < objs.length; i++) {
- ops[i] = (UnbindRequest) objs[i][0];
- }
- return ops;
+ return new UnbindRequest[] { Requests.newUnbindRequest(), };
}
}
--
Gitblit v1.10.0