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/CountryStringSyntaxTest.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/CountryStringSyntaxTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/CountryStringSyntaxTest.java
index 09a90cb..cc9ee5c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/CountryStringSyntaxTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/CountryStringSyntaxTest.java
@@ -27,18 +27,24 @@
*/
package org.opends.server.schema;
+import org.opends.server.ServerContextBuilder;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.opends.server.admin.std.server.CountryStringAttributeSyntaxCfg;
+import org.opends.server.core.ServerContext;
import org.forgerock.opendj.config.server.ConfigException;
+import org.forgerock.opendj.ldap.schema.Schema;
import org.opends.server.types.DN;
-
+import org.opends.server.util.RemoveOnceSDKSchemaIsUsed;
import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
/**
* Test the CountryStringSyntax.
*/
+@RemoveOnceSDKSchemaIsUsed
+@Test
public class CountryStringSyntaxTest extends AttributeSyntaxTest
{
@@ -49,6 +55,7 @@
CountryStringSyntax syntax = new CountryStringSyntax();
CountryStringAttributeSyntaxCfg cfg = new CountryStringAttributeSyntaxCfg()
{
+ @Override
public DN dn()
{
return null;
@@ -56,6 +63,7 @@
+ @Override
public void removeChangeListener(ConfigurationChangeListener<AttributeSyntaxCfg> listener)
{
// Stub.
@@ -63,6 +71,7 @@
+ @Override
public boolean isEnabled()
{
// Stub.
@@ -71,6 +80,7 @@
+ @Override
public void addChangeListener(
ConfigurationChangeListener<AttributeSyntaxCfg> listener)
{
@@ -79,6 +89,7 @@
+ @Override
public void removeCountryStringChangeListener(
ConfigurationChangeListener<CountryStringAttributeSyntaxCfg> listener)
{
@@ -87,6 +98,7 @@
+ @Override
public boolean isStrictFormat()
{
return true;
@@ -94,6 +106,7 @@
+ @Override
public String getJavaClass()
{
// Stub.
@@ -102,6 +115,7 @@
+ @Override
public Class<? extends CountryStringAttributeSyntaxCfg> configurationClass()
{
// Stub.
@@ -110,6 +124,7 @@
+ @Override
public void addCountryStringChangeListener(
ConfigurationChangeListener<CountryStringAttributeSyntaxCfg> listener)
{
@@ -119,7 +134,11 @@
try
{
- syntax.initializeSyntax(cfg);
+ Schema schema = Schema.getCoreSchema();
+ ServerContext serverContext = ServerContextBuilder.aServerContext()
+ .schemaNG(schema)
+ .schemaUpdater(new ServerContextBuilder.MockSchemaUpdater(schema)).build();
+ syntax.initializeSyntax(cfg, serverContext);
}
catch (ConfigException e)
{
--
Gitblit v1.10.0