From 7be72ff9f4ce58f87ea2dfdb6d80ac4e75a72d6b Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Mon, 11 Feb 2008 16:53:38 +0000
Subject: [PATCH] Cleanup in clu testsuite
---
/dev/null | 151 -------------------------------------
opendj-sdk/opends/tests/functional-tests/shared/data/clu/ldapmodify_checkbehavior.ldif | 0
opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_setup.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldapmodify_checkoptions.xml | 2
opendj-sdk/opends/tests/functional-tests/shared/data/clu/ldapmodify_checkoptions.ldif | 0
opendj-sdk/opends/tests/functional-tests/shared/data/clu/clu_start.ldif | 0
opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldapmodify_checkbehavior.xml | 28 +++---
7 files changed, 16 insertions(+), 167 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/clu_start.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/clu/clu_start.ldif
similarity index 100%
rename from opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/clu_start.ldif
rename to opendj-sdk/opends/tests/functional-tests/shared/data/clu/clu_start.ldif
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/addattr_integer.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/addattr_integer.ldif
deleted file mode 100644
index 13c0914..0000000
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/addattr_integer.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2007-2008 Sun Microsystems, Inc.
-#
-
-dn: cn=schema
-changetype: modify
-add: attributetypes
-attributetypes: ( myTestIntegerAttr-oid NAME 'myTestIntegerAttr' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user defined' )
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/adddata_integer.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/adddata_integer.ldif
deleted file mode 100644
index b9f87e9..0000000
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/adddata_integer.ldif
+++ /dev/null
@@ -1,84 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2007-2008 Sun Microsystems, Inc.
-#
-
-dn: cn=entry_1,o=mcom.com
-objectClass: top
-objectClass: mytestintegerobject
-cn: entry_1
-myTestIntegerAttr: 167772161
-
-dn: cn=entry_2,o=mcom.com
-objectClass: top
-objectClass: mytestintegerobject
-cn: entry_2
-myTestIntegerAttr: 167772162
-
-dn: cn=entry_3,o=mcom.com
-objectClass: top
-objectClass: mytestintegerobject
-cn: entry_3
-myTestIntegerAttr: 167772163
-
-dn: cn=entry_4,o=mcom.com
-objectClass: top
-objectClass: mytestintegerobject
-cn: entry_4
-myTestIntegerAttr: 167772164
-
-dn: cn=entry_5,o=mcom.com
-objectClass: top
-objectClass: mytestintegerobject
-cn: entry_5
-myTestIntegerAttr: 167772165
-
-dn: cn=entry_6,o=mcom.com
-objectClass: top
-objectClass: mytestintegerobject
-cn: entry_6
-myTestIntegerAttr: 167772166
-
-dn: cn=entry_7,o=mcom.com
-objectClass: top
-objectClass: mytestintegerobject
-cn: entry_7
-myTestIntegerAttr: 167772167
-
-dn: cn=entry_8,o=mcom.com
-objectClass: top
-objectClass: mytestintegerobject
-cn: entry_8
-myTestIntegerAttr: 167772168
-
-dn: cn=entry_9,o=mcom.com
-objectClass: top
-objectClass: mytestintegerobject
-cn: entry_9
-myTestIntegerAttr: 167772169
-
-dn: cn=entry_10,o=mcom.com
-objectClass: top
-objectClass: mytestintegerobject
-cn: entry_10
-myTestIntegerAttr: 167772170
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/addobj_integer.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/addobj_integer.ldif
deleted file mode 100644
index 7d2c6e2..0000000
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/addobj_integer.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2007-2008 Sun Microsystems, Inc.
-#
-
-dn: cn=schema
-changetype: modify
-add: objectclasses
-objectclasses: ( myTestIntegerObject-oid NAME 'myTestIntegerObject' SUP top STRUCTURAL MUST ( cn $ myTestIntegerAttr ) X-ORIGIN 'user defined' )
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/delattr_integer.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/delattr_integer.ldif
deleted file mode 100644
index bfa3c46..0000000
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/delattr_integer.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2007-2008 Sun Microsystems, Inc.
-#
-
-dn: cn=schema
-changetype: modify
-delete: attributetypes
-attributetypes: ( myTestIntegerAttr-oid NAME 'myTestIntegerAttr' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user defined' )
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/deldata_integer.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/deldata_integer.ldif
deleted file mode 100644
index f4bfcdd..0000000
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/deldata_integer.ldif
+++ /dev/null
@@ -1,35 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2007-2008 Sun Microsystems, Inc.
-#
-
-cn=entry_1,o=mcom.com
-cn=entry_2,o=mcom.com
-cn=entry_3,o=mcom.com
-cn=entry_4,o=mcom.com
-cn=entry_5,o=mcom.com
-cn=entry_6,o=mcom.com
-cn=entry_7,o=mcom.com
-cn=entry_8,o=mcom.com
-cn=entry_9,o=mcom.com
-cn=entry_10,o=mcom.com
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/delobj_integer.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/delobj_integer.ldif
deleted file mode 100644
index 8ded1ba..0000000
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/delobj_integer.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2007-2008 Sun Microsystems, Inc.
-#
-
-dn: cn=schema
-changetype: modify
-delete: objectclasses
-objectclasses: ( myTestIntegerObject-oid NAME 'myTestIntegerObject' SUP top STRUCTURAL MUST ( cn $ myTestIntegerAttr ) X-ORIGIN 'user defined' )
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/entry.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/entry.ldif
deleted file mode 100755
index 15e7aa4..0000000
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/entry.ldif
+++ /dev/null
@@ -1,34 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2007-2008 Sun Microsystems, Inc.
-#
-
-dn: o=mcom.com
-o: mcom.com
-objectclass: top
-objectclass: organization
-
-dn: ou=People, o=mcom.com
-ou: people
-objectclass: top
-objectclass: organizationalunit
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/fileURL b/opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/fileURL
deleted file mode 100644
index 2bfd9d7..0000000
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/fileURL
+++ /dev/null
@@ -1 +0,0 @@
- /usr/iplanet/servers
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/ldif_comp.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/ldif_comp.ldif
deleted file mode 100755
index 83ccb89..0000000
--- a/opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/ldif_comp.ldif
+++ /dev/null
@@ -1,151 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-# Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Portions Copyright 2007-2008 Sun Microsystems, Inc.
-#
-
-dn: cn=Elvis Presley, o=mcom.com
-changetype: add
-objectclass: person
-objectclass: organizationalPerson
-objectclass: inetOrgPerson
-cn: Elvis Presley
-givenName: Elvis
-sn: Presley
-ou: People
-uid: epresley
-
-dn: uid=tqa1,o=mcom.com
-uid: tqa1
-givenName: test
-objectClass: top
-objectClass: person
-objectClass: organizationalPerson
-objectClass: inetorgperson
-sn: qa1
-cn: test qa1
-mail: tqa1@sun.com
-
-dn: uid=tqa2,o=mcom.com
-uid: tqa2
-givenName: test
-objectClass: top
-objectClass: person
-objectClass: organizationalPerson
-objectClass: inetorgperson
-sn: qa2
-cn: test qa2
-mail: tqa2@sun.com
-
-dn: uid=tqa3,o=mcom.com
-uid: tqa3
-givenName: test
-objectClass: top
-objectClass: person
-objectClass: organizationalPerson
-objectClass: inetorgperson
-sn: qa3
-cn: test qa3
-mail: tqa3@sun.com
-
-dn: uid=tqa4,o=mcom.com
-uid: tqa4
-givenName: test
-objectClass: top
-objectClass: person
-objectClass: organizationalPerson
-objectClass: inetorgperson
-sn: qa4
-cn: test qa4
-mail: tqa4@sun.com
-
-dn: cn=test4 user4, o=mcom.com
-changetype: add
-objectclass: person
-objectclass: organizationalPerson
-objectclass: inetOrgPerson
-cn: test4 user4
-givenName: test4
-sn: user4
-ou: People
-uid: suser4
-mail: email test4
-
-dn: cn=test3 user3, o=mcom.com
-changetype: add
-objectclass: person
-objectclass: organizationalPerson
-objectclass: inetOrgPerson
-cn: test3 user3
-givenName: test3
-sn: user3
-ou: People
-uid: suser3
-
-dn: cn=test2 user2, o=mcom.com
-changetype: add
-objectclass: person
-objectclass: organizationalPerson
-objectclass: inetOrgPerson
-cn: test2 user2
-givenName: test2
-sn: user2
-ou: People
-uid: suser2
-
-dn: cn=SmartGroup, ou=People, o=mcom.com
-changetype: add
-objectclass: top
-objectclass: groupOfUniqueNames
-cn: SmartGroup
-ou: People
-uniquemember: cn=Elvis Presley, o=mcom.com
-description: Smart People.
-
-dn: ou=PlacesOu, o=mcom.com
-changetype: add
-objectclass: organizationalUnit
-ou: PlacesOu
-
-dn: cn=MountainViewGroup, ou=PlacesOu, o=mcom.com
-changetype: add
-objectclass: top
-objectclass: groupOfUniqueNames
-cn: MountainViewGroup
-ou: PlacesOu
-uniquemember: cn=Elvis Presley, o=mcom.com
-description: People from Mountain View
-
-dn: ou=CaliforniaOu, ou=PlacesOu, o=mcom.com
-changetype: add
-objectclass: organizationalUnit
-ou: CaliforniaOu
-
-dn: cn=NorCalGroup, ou=CaliforniaOu, ou=PlacesOu, o=mcom.com
-changetype: add
-objectclass: top
-objectclass: groupOfUniqueNames
-cn: NorCalGroup
-ou: CaliforniaOu
-uniquemember: cn=Elvis Presley, o=mcom.com
-description: People from Northern California
-
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/ldapmodify_checkbehavior.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/clu/ldapmodify_checkbehavior.ldif
similarity index 100%
rename from opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/ldapmodify_checkbehavior.ldif
rename to opendj-sdk/opends/tests/functional-tests/shared/data/clu/ldapmodify_checkbehavior.ldif
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/ldapmodify_checkoptions.ldif b/opendj-sdk/opends/tests/functional-tests/shared/data/clu/ldapmodify_checkoptions.ldif
similarity index 100%
rename from opendj-sdk/opends/tests/functional-tests/shared/data/clu/data/ldapmodify_checkoptions.ldif
rename to opendj-sdk/opends/tests/functional-tests/shared/data/clu/ldapmodify_checkoptions.ldif
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldapmodify_checkbehavior.xml b/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldapmodify_checkbehavior.xml
index 0113fed..67fc7de 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldapmodify_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldapmodify_checkbehavior.xml
@@ -55,24 +55,24 @@
<!--- Define default value for basedn and dsfilename -->
<script>
basedn = 'ou=ldapmodify,o=clu tests,dc=example,dc=com'
- dsfilename = '%s/clu/data/ldapmodify_checkbehavior.ldif' \
+ dsfilename = '%s/clu/ldapmodify_checkbehavior.ldif' \
% logsRemoteDataDir
</script>
<!--- Test Case information
- #@TestMarker ldapmodify check behavior tests
- #@TestName ldapmodify: change attribute value
- #@TestIssue none
- #@TestPurpose Verify that the operation is successful and
- that the attribute value has been modified.
- #@TestPreamble none
- #@TestStep Check that the "postCode" value for "uid=user.1"
- is 93520.
- #@TestStep Modify the "postalCode" value using ldapmodify.
- #@TestStep Check that the "postCode" value for "uid=user.1"
- is 70000.
- #@TestPostamble none
- #@TestResult Success if the "postalCode" value is 70000.
+ #@TestMarker ldapmodify check behavior tests
+ #@TestName ldapmodify: change attribute value
+ #@TestIssue none
+ #@TestPurpose Verify that the operation is successful and
+ that the attribute value has been modified.
+ #@TestPreamble none
+ #@TestStep Check that the "postCode" value for "uid=user.1"
+ is 93520.
+ #@TestStep Modify the "postalCode" value using ldapmodify.
+ #@TestStep Check that the "postCode" value for "uid=user.1"
+ is 70000.
+ #@TestPostamble none
+ #@TestResult Success if the "postalCode" value is 70000.
-->
<testcase name="getTestCaseName
('ldapmodify: change attribute value')">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldapmodify_checkoptions.xml b/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldapmodify_checkoptions.xml
index f4c8b9e..c69c040 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldapmodify_checkoptions.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_ldapmodify_checkoptions.xml
@@ -55,7 +55,7 @@
<!--- Define default value for dsfilename -->
<script>
- dsfilename = '%s/clu/data/ldapmodify_checkoptions.ldif' \
+ dsfilename = '%s/clu/ldapmodify_checkoptions.ldif' \
% logsRemoteDataDir
</script>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_setup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_setup.xml
index 443549a..492e7b7 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_setup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/clu/clu_setup.xml
@@ -111,7 +111,7 @@
<call function="'importLdif'">
{
- 'ldifFile' : '%s/clu/data/clu_start.ldif' % logsRemoteDataDir
+ 'ldifFile' : '%s/clu/clu_start.ldif' % logsRemoteDataDir
}
</call>
--
Gitblit v1.10.0