From 9defd2349274d077ad120d780a6fac5f6d594c7f Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 22 May 2015 15:58:46 +0000
Subject: [PATCH] OPENDJ-1631 CR-6864 Migrate server to SDK syntaxes
---
opendj-server-legacy/src/test/java/org/opends/server/schema/DITContentRuleSyntaxTest.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/DITContentRuleSyntaxTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/DITContentRuleSyntaxTest.java
index 94c2ff2..62a988c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/DITContentRuleSyntaxTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/DITContentRuleSyntaxTest.java
@@ -27,11 +27,15 @@
package org.opends.server.schema;
import org.opends.server.api.AttributeSyntax;
+import org.opends.server.util.RemoveOnceSDKSchemaIsUsed;
import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
/**
* Test the DITContentRuleSyntax.
*/
+@RemoveOnceSDKSchemaIsUsed
+@Test
public class DITContentRuleSyntaxTest extends AttributeSyntaxTest
{
@@ -49,52 +53,52 @@
return new Object [][] {
{"( 2.5.6.4 DESC 'content rule for organization' NOT "
+ "( x121Address $ telexNumber ) )", true},
- {"( 2.5.6.4 NAME 'full rule' DESC 'rule with all possible fields' "
+ {"( 2.5.6.4 NAME 'fullrule' DESC 'rule with all possible fields' "
+ " OBSOLETE"
+ " AUX ( posixAccount )"
+ " MUST ( cn $ sn )"
+ " MAY ( dc )"
+ " NOT ( x121Address $ telexNumber ) )"
, true},
- {"( 2.5.6.4 NAME 'full rule' DESC 'ommit parenthesis' "
+ {"( 2.5.6.4 NAME 'fullrule' DESC 'ommit parenthesis' "
+ " OBSOLETE"
+ " AUX posixAccount "
+ " MUST cn "
+ " MAY dc "
+ " NOT x121Address )"
, true},
- {"( 2.5.6.4 NAME 'full rule' DESC 'use numeric OIDs' "
+ {"( 2.5.6.4 NAME 'fullrule' DESC 'use numeric OIDs' "
+ " OBSOLETE"
+ " AUX 1.3.6.1.1.1.2.0"
+ " MUST cn "
+ " MAY dc "
+ " NOT x121Address )"
, true},
- {"( 2.5.6.4 NAME 'full rule' DESC 'illegal OIDs' "
+ {"( 2.5.6.4 NAME 'fullrule' DESC 'illegal OIDs' "
+ " OBSOLETE"
+ " AUX 2.5.6.."
+ " MUST cn "
+ " MAY dc "
+ " NOT x121Address )"
, false},
- {"( 2.5.6.4 NAME 'full rule' DESC 'illegal OIDs' "
+ {"( 2.5.6.4 NAME 'fullrule' DESC 'illegal OIDs' "
+ " OBSOLETE"
+ " AUX 2.5.6.x"
+ " MUST cn "
+ " MAY dc "
+ " NOT x121Address )"
, false},
- {"( 2.5.6.4 NAME 'full rule' DESC 'missing closing parenthesis' "
+ {"( 2.5.6.4 NAME 'fullrule' DESC 'missing closing parenthesis' "
+ " OBSOLETE"
+ " AUX posixAccount"
+ " MUST cn "
+ " MAY dc "
+ " NOT x121Address"
, false},
- {"( 2.5.6.4 NAME 'full rule' DESC 'extra parameterss' "
+ {"( 2.5.6.4 NAME 'fullrule' DESC 'extra parameterss' "
+ " MUST cn "
- + "( this is an extra parameter )"
- , true},
+ + " this is an extra parameter )"
+ , false},
};
}
--
Gitblit v1.10.0