From 52b297c7414b542b49ad21ca4ccdb0f65a7e399f Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 23 Jan 2014 18:00:39 +0000
Subject: [PATCH] Minor unit test fixes.
---
opendj-core/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java | 2 +-
opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributesTestCase.java | 7 ++-----
opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java | 3 +--
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/TypesTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributesTestCase.java
similarity index 94%
rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/TypesTestCase.java
rename to opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributesTestCase.java
index 61dfc5c..836cd6b 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/TypesTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributesTestCase.java
@@ -32,13 +32,10 @@
import org.testng.annotations.Test;
/**
- * An abstract class that all types unit tests should extend. A type represents
- * the classes found directly under the package org.forgerock.opendj.ldap.
+ * Tests the Attributes class.
*/
-
-@Test(groups = { "precommit", "types", "sdk" })
@SuppressWarnings("javadoc")
-public class TypesTestCase extends SdkTestCase {
+public class AttributesTestCase extends SdkTestCase {
/**
* Data provider for attribute descriptions.
*
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java
index 82a7e29..dd6a9ff 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java
@@ -45,7 +45,7 @@
* {@link org.forgerock.opendj.ldap.RDN} class.
*/
@SuppressWarnings("javadoc")
-public final class RDNTestCase extends TypesTestCase {
+public final class RDNTestCase extends SdkTestCase {
// Domain component attribute type.
private static final AttributeType ATTR_TYPE_DC;
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java
index d1e58f1..1d8df50 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java
@@ -27,7 +27,6 @@
package org.forgerock.opendj.ldap.schema;
-import static org.forgerock.opendj.ldap.schema.SchemaConstants.EMR_DN_OID;
import static org.testng.Assert.assertEquals;
import org.forgerock.opendj.ldap.ByteString;
@@ -183,7 +182,7 @@
}
protected MatchingRule getRule() {
- return Schema.getCoreSchema().getMatchingRule(EMR_DN_OID);
+ return CoreSchema.getDistinguishedNameMatchingRule();
}
/**
--
Gitblit v1.10.0