From d4f22528cb25b6e08ac7de6289c532468e37bbe3 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 11 Feb 2011 23:31:28 +0000
Subject: [PATCH] Fix build after previous re-import of code
---
opendj3/opendj-build-tools/opendj-testng-support/src/main/java/org/opendj/buildtools/testng/OpenDJTestListener.java | 25 ++--
opendj3/opendj-build-tools/opendj-maven-plugin/.classpath | 1
opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/ldif/LDIFTestCase.java | 4
opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1WriterTestCase.java | 4
opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_fr.properties | 16 ---
opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/AttributeDescriptionTestCase.java | 3
opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1ReaderTestCase.java | 4
opendj3/opendj-build-tools/opendj-testng-support/src/main/java/org/opendj/buildtools/testng/package-info.java | 22 +--
opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages.properties | 27 -----
opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_es.properties | 16 ---
opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_zh_TW.properties | 16 ---
opendj3/opendj-modules/opendj-client-tools/src/test/java/com/sun/opends/sdk/tools/ToolsTestCase.java | 4
opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/RequestsTestCase.java | 4
opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_ja.properties | 16 ---
/dev/null | 54 ----------
opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/LDAPTestCase.java | 4
opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_zh_CN.properties | 16 ---
opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/SdkTestCase.java | 3
opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_de.properties | 16 ---
opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/controls/ControlsTestCase.java | 4
opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/responses/ResponsesTestCase.java | 4
opendj3/opendj-build-tools/opendj-testng-support/src/main/java/org/opendj/buildtools/testng/OpenDJTestCase.java | 9 +
opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/util/UtilTestCase.java | 4
opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_ko.properties | 16 ---
opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/SchemaTestCase.java | 4
25 files changed, 53 insertions(+), 243 deletions(-)
diff --git a/opendj3/opendj-build-tools/opendj-maven-plugin/.classpath b/opendj3/opendj-build-tools/opendj-maven-plugin/.classpath
index fb2f7c1..d6a2b32 100644
--- a/opendj3/opendj-build-tools/opendj-maven-plugin/.classpath
+++ b/opendj3/opendj-build-tools/opendj-maven-plugin/.classpath
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry kind="src" output="target/classes" path="target/generated-sources/plugin"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/OpenDSTestCase.java b/opendj3/opendj-build-tools/opendj-testng-support/src/main/java/org/opendj/buildtools/testng/OpenDJTestCase.java
similarity index 95%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/OpenDSTestCase.java
rename to opendj3/opendj-build-tools/opendj-testng-support/src/main/java/org/opendj/buildtools/testng/OpenDJTestCase.java
index 9847b93..67f7ea1 100644
--- a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/OpenDSTestCase.java
+++ b/opendj3/opendj-build-tools/opendj-testng-support/src/main/java/org/opendj/buildtools/testng/OpenDJTestCase.java
@@ -23,9 +23,10 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
+ * Portions copyright 2011 ForgeRock AS
*/
-package org.opends.sdk;
+package org.opendj.buildtools.testng;
@@ -47,7 +48,7 @@
* them include the class name.
*/
@Test(sequential = true)
-public abstract class OpenDSTestCase
+public abstract class OpenDJTestCase
{
//
@@ -119,8 +120,8 @@
Class<?> cls = this.getClass();
// Iterate through all of the fields in all subclasses of
// DirectoryServerTestCase, but not DirectoryServerTestCase itself.
- while (OpenDSTestCase.class.isAssignableFrom(cls)
- && !OpenDSTestCase.class.equals(cls))
+ while (OpenDJTestCase.class.isAssignableFrom(cls)
+ && !OpenDJTestCase.class.equals(cls))
{
final Field fields[] = cls.getDeclaredFields();
for (final Field field : fields)
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/TestListener.java b/opendj3/opendj-build-tools/opendj-testng-support/src/main/java/org/opendj/buildtools/testng/OpenDJTestListener.java
similarity index 97%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/TestListener.java
rename to opendj3/opendj-build-tools/opendj-testng-support/src/main/java/org/opendj/buildtools/testng/OpenDJTestListener.java
index a95a92b..a76edf9 100755
--- a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/TestListener.java
+++ b/opendj3/opendj-build-tools/opendj-testng-support/src/main/java/org/opendj/buildtools/testng/OpenDJTestListener.java
@@ -23,13 +23,12 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions copyright 2011 ForgeRock AS
*/
-package org.opends.sdk;
+package org.opendj.buildtools.testng;
-import static com.sun.opends.sdk.util.StaticUtils.EOL;
-
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
@@ -50,12 +49,16 @@
* This class is our replacement for the test results that TestNG generates. It
* prints out test to the console as they happen.
*/
-public class TestListener extends TestListenerAdapter implements IReporter
+public class OpenDJTestListener extends TestListenerAdapter implements IReporter
{
/**
- *
+ * The end-of-line character for this platform.
*/
+ private static final String EOL = System.getProperty("line.separator");
+
+
+
private static class TestClassResults
{
private final IClass _cls;
@@ -417,7 +420,7 @@
- public TestListener() throws Exception
+ public OpenDJTestListener() throws Exception
{
initializeProgressVars();
}
@@ -586,20 +589,20 @@
final Object[] testInstances = result.getMethod().getInstances();
for (final Object testInstance : testInstances)
{
- if (testInstance instanceof OpenDSTestCase)
+ if (testInstance instanceof OpenDJTestCase)
{
- final OpenDSTestCase openDSTestCase = (OpenDSTestCase) testInstance;
+ final OpenDJTestCase openDJTestCase = (OpenDJTestCase) testInstance;
final Object[] parameters = result.getParameters();
if (result.getStatus() == ITestResult.SUCCESS)
{
- openDSTestCase.addParamsFromSuccessfulTests(parameters);
+ openDJTestCase.addParamsFromSuccessfulTests(parameters);
// This can eat up a bunch of memory for tests that are
// expected to throw
result.setThrowable(null);
}
else
{
- openDSTestCase.addParamsFromFailedTest(parameters);
+ openDJTestCase.addParamsFromFailedTest(parameters);
// When the test finishes later on, we might not have
// everything
@@ -753,7 +756,7 @@
}
_checkedForTypeAndAnnotations.add(testClass);
- if (!OpenDSTestCase.class.isAssignableFrom(testClass))
+ if (!OpenDJTestCase.class.isAssignableFrom(testClass))
{
final String errorMessage = "The test class " + testClass.getName()
+ " must inherit (directly or indirectly) "
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/messages/MessagesTestCase.java b/opendj3/opendj-build-tools/opendj-testng-support/src/main/java/org/opendj/buildtools/testng/package-info.java
similarity index 66%
rename from opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/messages/MessagesTestCase.java
rename to opendj3/opendj-build-tools/opendj-testng-support/src/main/java/org/opendj/buildtools/testng/package-info.java
index c6d4c57..c88cd8f 100644
--- a/opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/messages/MessagesTestCase.java
+++ b/opendj3/opendj-build-tools/opendj-testng-support/src/main/java/org/opendj/buildtools/testng/package-info.java
@@ -7,33 +7,27 @@
* 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.
+ * trunk/opends/resource/legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
* 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,
+ * trunk/opends/resource/legal-notices/CDDLv1_0.txt. 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
*
- *
- * Copyright 2010 Sun Microsystems, Inc.
+ * Copyright 2011 ForgeRock AS
*/
-package com.sun.opends.sdk.messages;
+/**
+ * TestNG unit testing infrastructure necessary for the OpenDJ project.
+ */
+package org.opendj.buildtools.testng;
-import org.opends.sdk.OpenDSTestCase;
-
-
-
-public class MessagesTestCase extends OpenDSTestCase
-{
-
-}
diff --git a/opendj3/opendj-modules/opendj-client-tools/src/test/java/com/sun/opends/sdk/tools/ToolsTestCase.java b/opendj3/opendj-modules/opendj-client-tools/src/test/java/com/sun/opends/sdk/tools/ToolsTestCase.java
index eb8134c..e3b2afa 100644
--- a/opendj3/opendj-modules/opendj-client-tools/src/test/java/com/sun/opends/sdk/tools/ToolsTestCase.java
+++ b/opendj3/opendj-modules/opendj-client-tools/src/test/java/com/sun/opends/sdk/tools/ToolsTestCase.java
@@ -29,7 +29,7 @@
-import org.opends.sdk.OpenDSTestCase;
+import org.opendj.buildtools.testng.OpenDJTestCase;
import org.testng.annotations.Test;
@@ -40,6 +40,6 @@
*/
@Test(groups = { "precommit", "tools", "sdk" }, sequential = true)
-public abstract class ToolsTestCase extends OpenDSTestCase
+public abstract class ToolsTestCase extends OpenDJTestCase
{
}
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages.properties b/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages.properties
index 99aa95f..c37b549 100755
--- a/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages.properties
+++ b/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages.properties
@@ -24,31 +24,6 @@
#
# Copyright 2010 Sun Microsystems, Inc.
#
-
-
-
-#
-# Global directives
-#
-global.ordinal=-1
-
-#
-# Format string definitions
-#
-# Keys must be formatted as follows:
-#
-# [DESCRIPTION]
-#
-# where:
-#
-# DESCRIPTION is an upper case string providing a hint as to the context of
-# the message in upper case with the underscore ('_') character serving as
-# word separator
-#
-
-#
-# Schema messages
-#
SEVERE_ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE=Unable to retrieve \
approximate matching rule %s used as the default for the %s attribute syntax. \
Approximate matching will not be allowed by default for attributes with this \
@@ -2923,7 +2898,7 @@
SEVERE_ERR_LDAPURL_NO_SCHEME=The provided string "%s" cannot be decoded \
as an LDAP URL because it does not contain a protocol scheme
SEVERE_ERR_LDAPURL_BAD_SCHEME=The provided string "%s" cannot be decoded \
- as an LDAP URL because the protocol scheme "%s" is invalid. It should be
+ as an LDAP URL because the protocol scheme "%s" is invalid. It should be \
either "ldap" or "ldaps"
SEVERE_ERR_LDAPURL_NO_HOST=The provided string "%s" cannot be decoded as \
an LDAP URL because it does not contain a host before the colon to specify \
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_de.properties b/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_de.properties
index 11514dd..117151a 100755
--- a/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_de.properties
+++ b/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_de.properties
@@ -22,22 +22,6 @@
#
# Copyright 2009 Sun Microsystems, Inc.
#
-# Global directives
-#
-global.ordinal=-1
-#
-# Format string definitions
-#
-# Keys must be formatted as follows:
-#
-# [DESCRIPTION]
-#
-# where:
-#
-# DESCRIPTION is an upper case string providing a hint as to the context of
-# the message in upper case with the underscore ('_') character serving as
-# word separator
-#
###SEVERE_ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE_1=Unable to retrieve \
### approximate matching rule %s used as the default for the %s attribute syntax. \
### Approximate matching will not be allowed by default for attributes with this \
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_es.properties b/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_es.properties
index 5dda414..5883282 100755
--- a/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_es.properties
+++ b/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_es.properties
@@ -22,22 +22,6 @@
#
# Copyright 2009 Sun Microsystems, Inc.
#
-# Global directives
-#
-global.ordinal=-1
-#
-# Format string definitions
-#
-# Keys must be formatted as follows:
-#
-# [DESCRIPTION]
-#
-# where:
-#
-# DESCRIPTION is an upper case string providing a hint as to the context of
-# the message in upper case with the underscore ('_') character serving as
-# word separator
-#
###SEVERE_ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE_1=Unable to retrieve \
### approximate matching rule %s used as the default for the %s attribute syntax. \
### Approximate matching will not be allowed by default for attributes with this \
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_fr.properties b/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_fr.properties
index 6959d0b..239bed3 100755
--- a/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_fr.properties
+++ b/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_fr.properties
@@ -22,22 +22,6 @@
#
# Copyright 2009 Sun Microsystems, Inc.
#
-# Global directives
-#
-global.ordinal=-1
-#
-# Format string definitions
-#
-# Keys must be formatted as follows:
-#
-# [DESCRIPTION]
-#
-# where:
-#
-# DESCRIPTION is an upper case string providing a hint as to the context of
-# the message in upper case with the underscore ('_') character serving as
-# word separator
-#
###SEVERE_ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE_1=Unable to retrieve \
### approximate matching rule %s used as the default for the %s attribute syntax. \
### Approximate matching will not be allowed by default for attributes with this \
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_ja.properties b/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_ja.properties
index 5ef2ca8..c99d7ad 100755
--- a/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_ja.properties
+++ b/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_ja.properties
@@ -22,22 +22,6 @@
#
# Copyright 2009 Sun Microsystems, Inc.
#
-# Global directives
-#
-global.ordinal=-1
-#
-# Format string definitions
-#
-# Keys must be formatted as follows:
-#
-# [DESCRIPTION]
-#
-# where:
-#
-# DESCRIPTION is an upper case string providing a hint as to the context of
-# the message in upper case with the underscore ('_') character serving as
-# word separator
-#
###SEVERE_ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE_1=Unable to retrieve \
### approximate matching rule %s used as the default for the %s attribute syntax. \
### Approximate matching will not be allowed by default for attributes with this \
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_ko.properties b/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_ko.properties
index a29b8bd..4eb51da 100755
--- a/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_ko.properties
+++ b/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_ko.properties
@@ -22,22 +22,6 @@
#
# Copyright 2009 Sun Microsystems, Inc.
#
-# Global directives
-#
-global.ordinal=-1
-#
-# Format string definitions
-#
-# Keys must be formatted as follows:
-#
-# [DESCRIPTION]
-#
-# where:
-#
-# DESCRIPTION is an upper case string providing a hint as to the context of
-# the message in upper case with the underscore ('_') character serving as
-# word separator
-#
###SEVERE_ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE_1=Unable to retrieve \
### approximate matching rule %s used as the default for the %s attribute syntax. \
### Approximate matching will not be allowed by default for attributes with this \
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_zh_CN.properties b/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_zh_CN.properties
index 05570f5..a85cabb 100755
--- a/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_zh_CN.properties
+++ b/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_zh_CN.properties
@@ -22,22 +22,6 @@
#
# Copyright 2009 Sun Microsystems, Inc.
#
-# Global directives
-#
-global.ordinal=-1
-#
-# Format string definitions
-#
-# Keys must be formatted as follows:
-#
-# [DESCRIPTION]
-#
-# where:
-#
-# DESCRIPTION is an upper case string providing a hint as to the context of
-# the message in upper case with the underscore ('_') character serving as
-# word separator
-#
###SEVERE_ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE_1=Unable to retrieve \
### approximate matching rule %s used as the default for the %s attribute syntax. \
### Approximate matching will not be allowed by default for attributes with this \
diff --git a/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_zh_TW.properties b/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_zh_TW.properties
index 990d8e8..fd9beea 100755
--- a/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_zh_TW.properties
+++ b/opendj3/opendj-modules/opendj-sdk/src/main/resources/com/sun/opends/sdk/messages/messages_zh_TW.properties
@@ -22,22 +22,6 @@
#
# Copyright 2009 Sun Microsystems, Inc.
#
-# Global directives
-#
-global.ordinal=-1
-#
-# Format string definitions
-#
-# Keys must be formatted as follows:
-#
-# [DESCRIPTION]
-#
-# where:
-#
-# DESCRIPTION is an upper case string providing a hint as to the context of
-# the message in upper case with the underscore ('_') character serving as
-# word separator
-#
###SEVERE_ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE_1=Unable to retrieve \
### approximate matching rule %s used as the default for the %s attribute syntax. \
### Approximate matching will not be allowed by default for attributes with this \
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/LDAPTestCase.java b/opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/LDAPTestCase.java
index 7d2e509..2c9414b 100644
--- a/opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/LDAPTestCase.java
+++ b/opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/ldap/LDAPTestCase.java
@@ -29,7 +29,7 @@
-import org.opends.sdk.OpenDSTestCase;
+import org.opendj.buildtools.testng.OpenDJTestCase;
import org.testng.annotations.Test;
@@ -40,6 +40,6 @@
*/
@Test(groups = { "precommit", "ldap", "sdk" }, sequential = true)
-public abstract class LDAPTestCase extends OpenDSTestCase
+public abstract class LDAPTestCase extends OpenDJTestCase
{
}
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/util/UtilTestCase.java b/opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/util/UtilTestCase.java
index af703f4..b75cc79 100644
--- a/opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/util/UtilTestCase.java
+++ b/opendj3/opendj-modules/opendj-sdk/src/test/java/com/sun/opends/sdk/util/UtilTestCase.java
@@ -29,7 +29,7 @@
-import org.opends.sdk.OpenDSTestCase;
+import org.opendj.buildtools.testng.OpenDJTestCase;
import org.testng.annotations.Test;
@@ -39,6 +39,6 @@
* classes found directly under the package org.opends.sdk.util.
*/
@Test(groups = { "precommit", "util", "sdk" }, sequential = true)
-public abstract class UtilTestCase extends OpenDSTestCase
+public abstract class UtilTestCase extends OpenDJTestCase
{
}
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/AttributeDescriptionTestCase.java b/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/AttributeDescriptionTestCase.java
index 76da7f8..67639fa 100644
--- a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/AttributeDescriptionTestCase.java
+++ b/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/AttributeDescriptionTestCase.java
@@ -31,6 +31,7 @@
import java.util.Iterator;
+import org.opendj.buildtools.testng.OpenDJTestCase;
import org.opends.sdk.schema.Schema;
import org.testng.Assert;
import org.testng.annotations.DataProvider;
@@ -41,7 +42,7 @@
/**
* Test {@code AttributeDescription}.
*/
-public final class AttributeDescriptionTestCase extends OpenDSTestCase
+public final class AttributeDescriptionTestCase extends OpenDJTestCase
{
@DataProvider(name = "dataForCompareCoreSchema")
public Object[][] dataForCompareCoreSchema()
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/SdkTestCase.java b/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/SdkTestCase.java
index 92da12a..b315119 100644
--- a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/SdkTestCase.java
+++ b/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/SdkTestCase.java
@@ -28,6 +28,7 @@
+import org.opendj.buildtools.testng.OpenDJTestCase;
import org.testng.annotations.Test;
@@ -38,6 +39,6 @@
*/
@Test(groups = { "precommit", "types", "sdk" }, sequential = true)
-public abstract class SdkTestCase extends OpenDSTestCase
+public abstract class SdkTestCase extends OpenDJTestCase
{
}
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/SuiteRunner.java b/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/SuiteRunner.java
deleted file mode 100755
index 1e9fd98..0000000
--- a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/SuiteRunner.java
+++ /dev/null
@@ -1,54 +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
- *
- *
- * Copyright 2008 Sun Microsystems, Inc.
- */
-package org.opends.sdk;
-
-
-
-import org.testng.TestNG;
-
-
-
-/**
- * This class wraps TestNG so that we can force the process to exit if there is
- * an uncaught exception (e.g. OutOfMemoryError).
- */
-public class SuiteRunner
-{
- public static void main(final String[] args)
- {
- try
- {
- TestNG.main(args);
- }
- catch (final Throwable e)
- {
- System.err.println("TestNG.main threw an expected exception:");
- e.printStackTrace(System.err);
- System.exit(TestNG.HAS_FAILURE);
- }
- }
-}
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1ReaderTestCase.java b/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1ReaderTestCase.java
index 0299f79..27d0cf4 100644
--- a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1ReaderTestCase.java
+++ b/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1ReaderTestCase.java
@@ -34,10 +34,10 @@
import java.io.IOException;
+import org.opendj.buildtools.testng.OpenDJTestCase;
import org.opends.sdk.ByteString;
import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
-import org.opends.sdk.OpenDSTestCase;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
@@ -47,7 +47,7 @@
* An abstract base class for all ASN1Reader test cases.
*/
@Test(groups = { "precommit", "asn1", "sdk" }, sequential = true)
-public abstract class ASN1ReaderTestCase extends OpenDSTestCase
+public abstract class ASN1ReaderTestCase extends OpenDJTestCase
{
/**
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1WriterTestCase.java b/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1WriterTestCase.java
index f43f9f7..a227302 100644
--- a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1WriterTestCase.java
+++ b/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/asn1/ASN1WriterTestCase.java
@@ -35,10 +35,10 @@
import java.io.IOException;
+import org.opendj.buildtools.testng.OpenDJTestCase;
import org.opends.sdk.ByteString;
import org.opends.sdk.ByteStringBuilder;
import org.opends.sdk.DecodeException;
-import org.opends.sdk.OpenDSTestCase;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
@@ -50,7 +50,7 @@
* An abstract base class for all ASN1Writer test cases.
*/
@Test(groups = { "precommit", "asn1", "sdk" }, sequential = true)
-public abstract class ASN1WriterTestCase extends OpenDSTestCase
+public abstract class ASN1WriterTestCase extends OpenDJTestCase
{
// Create an array with all of the valid single-byte types. We don't
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/controls/ControlsTestCase.java b/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/controls/ControlsTestCase.java
index 6f0ec5e..8db7a83 100644
--- a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/controls/ControlsTestCase.java
+++ b/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/controls/ControlsTestCase.java
@@ -29,7 +29,7 @@
-import org.opends.sdk.OpenDSTestCase;
+import org.opendj.buildtools.testng.OpenDJTestCase;
import org.opends.sdk.TestCaseUtils;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -43,7 +43,7 @@
*/
@Test(groups = { "precommit", "controls", "sdk" }, sequential = true)
-public abstract class ControlsTestCase extends OpenDSTestCase
+public abstract class ControlsTestCase extends OpenDJTestCase
{
/**
* Set up the environment for performing the tests in this suite.
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/ldif/LDIFTestCase.java b/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/ldif/LDIFTestCase.java
index e656589..b5acea4 100644
--- a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/ldif/LDIFTestCase.java
+++ b/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/ldif/LDIFTestCase.java
@@ -28,7 +28,7 @@
-import org.opends.sdk.OpenDSTestCase;
+import org.opendj.buildtools.testng.OpenDJTestCase;
import org.testng.annotations.Test;
@@ -39,6 +39,6 @@
*/
@Test(groups = { "precommit", "types", "sdk" }, sequential = true)
-public abstract class LDIFTestCase extends OpenDSTestCase
+public abstract class LDIFTestCase extends OpenDJTestCase
{
}
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/RequestsTestCase.java b/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/RequestsTestCase.java
index 81be811..ee807e0 100644
--- a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/RequestsTestCase.java
+++ b/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/requests/RequestsTestCase.java
@@ -29,7 +29,7 @@
-import org.opends.sdk.OpenDSTestCase;
+import org.opendj.buildtools.testng.OpenDJTestCase;
import org.testng.annotations.Test;
@@ -41,6 +41,6 @@
*/
@Test(groups = { "precommit", "requests", "sdk" }, sequential = true)
-public abstract class RequestsTestCase extends OpenDSTestCase
+public abstract class RequestsTestCase extends OpenDJTestCase
{
}
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/responses/ResponsesTestCase.java b/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/responses/ResponsesTestCase.java
index 7261a24..584aacf 100644
--- a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/responses/ResponsesTestCase.java
+++ b/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/responses/ResponsesTestCase.java
@@ -29,7 +29,7 @@
-import org.opends.sdk.OpenDSTestCase;
+import org.opendj.buildtools.testng.OpenDJTestCase;
import org.testng.annotations.Test;
@@ -41,6 +41,6 @@
*/
@Test(groups = { "precommit", "responses", "sdk" }, sequential = true)
-public abstract class ResponsesTestCase extends OpenDSTestCase
+public abstract class ResponsesTestCase extends OpenDJTestCase
{
}
diff --git a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/SchemaTestCase.java b/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/SchemaTestCase.java
index e1346bd..5370a5f 100644
--- a/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/SchemaTestCase.java
+++ b/opendj3/opendj-modules/opendj-sdk/src/test/java/org/opends/sdk/schema/SchemaTestCase.java
@@ -28,7 +28,7 @@
-import org.opends.sdk.OpenDSTestCase;
+import org.opendj.buildtools.testng.OpenDJTestCase;
import org.testng.annotations.Test;
@@ -37,6 +37,6 @@
* An abstract class that all schema unit test should extend.
*/
@Test(groups = { "precommit", "schema", "sdk" }, sequential = true)
-public abstract class SchemaTestCase extends OpenDSTestCase
+public abstract class SchemaTestCase extends OpenDJTestCase
{
}
--
Gitblit v1.10.0