You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2015/07/06 19:09:16 UTC
svn commit: r1689459 -
/directory/studio/trunk/plugins/schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporterTest.java
Author: seelmann
Date: Mon Jul 6 17:09:16 2015
New Revision: 1689459
URL: http://svn.apache.org/r1689459
Log:
DIRSTUDIO-1060: Fix tests due to changed formtting in API 1.0.0-M31
Modified:
directory/studio/trunk/plugins/schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporterTest.java
Modified: directory/studio/trunk/plugins/schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporterTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporterTest.java?rev=1689459&r1=1689458&r2=1689459&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporterTest.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporterTest.java Mon Jul 6 17:09:16 2015
@@ -28,7 +28,6 @@ import java.util.Collections;
import org.apache.directory.api.ldap.model.schema.MutableAttributeType;
import org.apache.directory.api.ldap.model.schema.MutableObjectClass;
import org.apache.directory.api.ldap.model.schema.ObjectClassTypeEnum;
-import org.apache.directory.api.ldap.model.schema.SchemaObjectRenderer;
import org.apache.directory.api.ldap.model.schema.UsageEnum;
import org.junit.Before;
import org.junit.Test;
@@ -91,7 +90,7 @@ public class OpenLdapSchemaFileExporterT
public void testOpenLdapSchemaRendererObjectClassSimple()
{
String actual = OpenLdapSchemaFileExporter.toSourceCode( objectClassSimple );
- String expected = "objectclass ( 1.2.3.4 NAME 'name0'\n\tSTRUCTURAL\n\tMUST att0\n)";
+ String expected = "objectclass ( 1.2.3.4 NAME 'name0'\n\tSTRUCTURAL\n\tMUST att0 )";
assertEquals( expected, actual );
}
@@ -100,7 +99,7 @@ public class OpenLdapSchemaFileExporterT
public void testOpenLdapSchemaRendererObjectClassComplex()
{
String actual = OpenLdapSchemaFileExporter.toSourceCode( objectClassComplex );
- String expected = "objectclass ( 1.2.3.4 NAME ( 'name1' 'name2' )\n\tDESC 'description with \\27quotes\\27'\n\tOBSOLETE\n\tSUP 1.3.5.7\n\tAUXILIARY\n\tMUST ( att1 $ att2 )\n\tMAY ( att3 $ att4 )\n)";
+ String expected = "objectclass ( 1.2.3.4 NAME ( 'name1' 'name2' )\n\tDESC 'description with \\27quotes\\27'\n\tOBSOLETE\n\tSUP 1.3.5.7\n\tAUXILIARY\n\tMUST ( att1 $ att2 )\n\tMAY ( att3 $ att4 ) )";
assertEquals( expected, actual );
}
@@ -108,7 +107,7 @@ public class OpenLdapSchemaFileExporterT
public void testOpenLdapSchemaRendererAttributeTypeSimple()
{
String actual = OpenLdapSchemaFileExporter.toSourceCode( attributeTypeSimple );
- String expected = "attributetype ( 1.2.3.4 NAME 'name0'\n\tEQUALITY matchingRule0\n\tSYNTAX 2.3.4.5{512}\n\tCOLLECTIVE\n\tUSAGE userApplications\n)";
+ String expected = "attributetype ( 1.2.3.4 NAME 'name0'\n\tEQUALITY matchingRule0\n\tSYNTAX 2.3.4.5{512}\n\tCOLLECTIVE\n\tUSAGE userApplications )";
assertEquals( expected, actual );
}
@@ -117,7 +116,7 @@ public class OpenLdapSchemaFileExporterT
public void testOpenLdapSchemaRendererAttributeTypeComplex()
{
String actual = OpenLdapSchemaFileExporter.toSourceCode( attributeTypeComplex );
- String expected = "attributetype ( 1.2.3.4 NAME ( 'name1' 'name2' )\n\tDESC 'description with \\27quotes\\27'\n\tOBSOLETE\n\tSUP superAttr\n\tEQUALITY matchingRule1\n\tORDERING matchingRule2\n\tSUBSTR matchingRule3\n\tSINGLE-VALUE\n\tNO-USER-MODIFICATION\n\tUSAGE directoryOperation\n)";
+ String expected = "attributetype ( 1.2.3.4 NAME ( 'name1' 'name2' )\n\tDESC 'description with \\27quotes\\27'\n\tOBSOLETE\n\tSUP superAttr\n\tEQUALITY matchingRule1\n\tORDERING matchingRule2\n\tSUBSTR matchingRule3\n\tSINGLE-VALUE\n\tNO-USER-MODIFICATION\n\tUSAGE directoryOperation )";
assertEquals( expected, actual );
}