From cb3c4e8dc4d6096355110d252cadcf0b1cc63ace Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Mon, 16 Apr 2007 21:18:16 +0000
Subject: [PATCH] Update the TestCaseUtils class to change the return types of the getServerLdapPort, getServerLdapsPort, and getServerJmxPort methods to be int instead of long, and eliminate lots of now-unnecessary casts.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java | 84 ++++++------------------------------------
1 files changed, 12 insertions(+), 72 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java
index 3f290e3..f0ea97b 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java
@@ -130,7 +130,7 @@
String taskDNStr =
"ds-task-id=add-single-valid-file,cn=Scheduled Tasks,cn=Tasks";
- String path = TestCaseUtils.createTempFile(
+ int resultCode = TestCaseUtils.applyModifications(
"dn: " + taskDNStr,
"changetype: add",
"objectClass: top",
@@ -139,17 +139,7 @@
"ds-task-id: add-single-valid-file",
"ds-task-class-name: org.opends.server.tasks.AddSchemaFileTask",
"ds-task-schema-file-name: 05-single-valid.ldif");
-
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
- "-f", path
- };
-
- assertEquals(LDAPModify.mainModify(args, false, null, System.err), 0);
+ assertEquals(resultCode, 0);
Task task = getCompletedTask(DN.decode(taskDNStr));
assertEquals(task.getTaskState(), TaskState.COMPLETED_SUCCESSFULLY);
@@ -263,7 +253,7 @@
String taskDNStr =
"ds-task-id=add-multiple-valid-files,cn=Scheduled Tasks,cn=Tasks";
- String path = TestCaseUtils.createTempFile(
+ int resultCode = TestCaseUtils.applyModifications(
"dn: " + taskDNStr,
"changetype: add",
"objectClass: top",
@@ -273,17 +263,7 @@
"ds-task-class-name: org.opends.server.tasks.AddSchemaFileTask",
"ds-task-schema-file-name: 05-multiple-valid-1.ldif",
"ds-task-schema-file-name: 05-multiple-valid-2.ldif");
-
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
- "-f", path
- };
-
- assertEquals(LDAPModify.mainModify(args, false, null, System.err), 0);
+ assertEquals(resultCode, 0);
Task task = getCompletedTask(DN.decode(taskDNStr));
assertEquals(task.getTaskState(), TaskState.COMPLETED_SUCCESSFULLY);
@@ -305,24 +285,14 @@
{
String taskDNStr =
"ds-task-id=add-missing-file-names,cn=Scheduled Tasks,cn=Tasks";
- String path = TestCaseUtils.createTempFile(
+ int resultCode = TestCaseUtils.applyModifications(
"dn: " + taskDNStr,
"changetype: add",
"objectClass: top",
"objectClass: ds-task",
"ds-task-id: add-missing-file-names",
"ds-task-class-name: org.opends.server.tasks.AddSchemaFileTask");
-
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
- "-f", path
- };
-
- assertFalse(LDAPModify.mainModify(args, false, null, null) == 0);
+ assertFalse(resultCode == 0);
}
@@ -339,7 +309,7 @@
{
String taskDNStr =
"ds-task-id=add-missing-file,cn=Scheduled Tasks,cn=Tasks";
- String path = TestCaseUtils.createTempFile(
+ int resultCode = TestCaseUtils.applyModifications(
"dn: " + taskDNStr,
"changetype: add",
"objectClass: top",
@@ -348,17 +318,7 @@
"ds-task-id: add-missing-file",
"ds-task-class-name: org.opends.server.tasks.AddSchemaFileTask",
"ds-task-schema-file-name: 05-missing.ldif");
-
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
- "-f", path
- };
-
- assertFalse(LDAPModify.mainModify(args, false, null, null) == 0);
+ assertFalse(resultCode == 0);
}
@@ -388,7 +348,7 @@
emptyFile.createNewFile();
String taskDNStr = "ds-task-id=add-empty-file,cn=Scheduled Tasks,cn=Tasks";
- String path = TestCaseUtils.createTempFile(
+ int resultCode = TestCaseUtils.applyModifications(
"dn: " + taskDNStr,
"changetype: add",
"objectClass: top",
@@ -397,17 +357,7 @@
"ds-task-id: add-empty-file",
"ds-task-class-name: org.opends.server.tasks.AddSchemaFileTask",
"ds-task-schema-file-name: 05-empty.ldif");
-
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
- "-f", path
- };
-
- assertEquals(LDAPModify.mainModify(args, false, null, System.err), 0);
+ assertEquals(resultCode, 0);
Task task = getCompletedTask(DN.decode(taskDNStr));
assertEquals(task.getTaskState(), TaskState.COMPLETED_SUCCESSFULLY);
@@ -436,7 +386,7 @@
String taskDNStr =
"ds-task-id=add-invalid-file,cn=Scheduled Tasks,cn=Tasks";
- String path = TestCaseUtils.createTempFile(
+ int resultCode = TestCaseUtils.applyModifications(
"dn: " + taskDNStr,
"changetype: add",
"objectClass: top",
@@ -445,17 +395,7 @@
"ds-task-id: add-invalid-file",
"ds-task-class-name: org.opends.server.tasks.AddSchemaFileTask",
"ds-task-schema-file-name: 05-invalid.ldif");
-
- String[] args =
- {
- "-h", "127.0.0.1",
- "-p", String.valueOf(TestCaseUtils.getServerLdapPort()),
- "-D", "cn=Directory Manager",
- "-w", "password",
- "-f", path
- };
-
- assertFalse(LDAPModify.mainModify(args, false, null, null) == 0);
+ assertFalse(resultCode == 0);
invalidFile.delete();
}
--
Gitblit v1.10.0