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/JPEGSyntaxTest.java | 124 ++---------------------------------------
1 files changed, 6 insertions(+), 118 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/schema/JPEGSyntaxTest.java b/opendj-server-legacy/src/test/java/org/opends/server/schema/JPEGSyntaxTest.java
index af394d2..2bbeece 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/schema/JPEGSyntaxTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/schema/JPEGSyntaxTest.java
@@ -25,20 +25,18 @@
*/
package org.opends.server.schema;
-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.JPEGAttributeSyntaxCfg;
-import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteString;
-import org.opends.server.types.DN;
+import org.opends.server.api.AttributeSyntax;
import org.opends.server.util.Base64;
-
+import org.opends.server.util.RemoveOnceSDKSchemaIsUsed;
import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
/**
* Test the JPEGSyntax.
*/
+@RemoveOnceSDKSchemaIsUsed
+@Test
public class JPEGSyntaxTest extends BinaryAttributeSyntaxTest
{
@@ -46,88 +44,7 @@
@Override
protected AttributeSyntax<?> getRule()
{
- JPEGSyntax syntax = new JPEGSyntax();
- JPEGAttributeSyntaxCfg cfg = new JPEGAttributeSyntaxCfg()
- {
- public DN dn()
- {
- return null;
- }
-
-
-
- public void removeChangeListener(ConfigurationChangeListener<AttributeSyntaxCfg> listener)
- {
- // Stub.
- }
-
-
-
- public boolean isEnabled()
- {
- // Stub.
- return false;
- }
-
-
-
- public void addChangeListener(
- ConfigurationChangeListener<AttributeSyntaxCfg> listener)
- {
- // Stub.
- }
-
-
-
- public void removeJPEGChangeListener(
- ConfigurationChangeListener<JPEGAttributeSyntaxCfg> listener)
- {
- // Stub.
- }
-
-
-
- public boolean isStrictFormat()
- {
- return true;
- }
-
-
-
- public String getJavaClass()
- {
- // Stub.
- return null;
- }
-
-
-
- public Class<? extends JPEGAttributeSyntaxCfg> configurationClass()
- {
- // Stub.
- return null;
- }
-
-
-
- public void addJPEGChangeListener(
- ConfigurationChangeListener<JPEGAttributeSyntaxCfg> listener)
- {
- // Stub.
- }
- };
-
- try
- {
- syntax.initializeSyntax(cfg);
- }
- catch (ConfigException e)
- {
- // Should never happen.
- throw new RuntimeException(e);
- }
-
- return syntax;
+ return new JPEGSyntax();
}
/** {@inheritDoc} */
@@ -135,8 +52,6 @@
@DataProvider(name="acceptableValues")
public Object[][] createAcceptableValues()
{
- String non_image =
- "AAECAwQFBgcICQ==";
String jfif_image =
"/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDACMYGh4aFiMeHB4nJSMpNFc4NDAwNGpM" +
"UD9Xfm+EgnxveneLnMipi5S9lnd6ru2wvc7V4OLgh6f1//PZ/8jb4Nf/2wBDASUn" +
@@ -152,37 +67,10 @@
"anN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPE" +
"xcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwCC" +
"iiiuM9g//9k=";
- String exif_image =
- "/9j/4QD2RXhpZgAATU0AKgAAAAgACQESAAMAAAABAAEAAAEaAAUAAAABAAAAegEb" +
- "AAUAAAABAAAAggEoAAMAAAABAAIAAAExAAIAAAAQAAAAigEyAAIAAAAUAAAAmgE8" +
- "AAIAAAAOAAAArgITAAMAAAABAAEAAIdpAAQAAAABAAAAvAAAAAAASAAAAAEAAABI" +
- "AAAAAQAAUXVpY2tUaW1lIDcuNy4xADIwMTI6MDg6MjAgMTI6MTE6MTIATWFjIE9T" +
- "IFggMTAuOAAAApAAAAcAAAAEMDIyMJADAAIAAAAUAAAA2gAAAAAyMDEyOjA4OjIw" +
- "IDEyOjEwOjA2AP/+AAxBcHBsZU1hcmsK/9sAQwAjGBoeGhYjHhweJyUjKTRXODQw" +
- "MDRqTFA/V35vhIJ8b3p3i5zIqYuUvZZ3eq7tsL3O1eDi4Ien9f/z2f/I2+DX/9sA" +
- "QwElJyc0LjRmODhm1496j9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX" +
- "19fX19fX19fX19fX19fX19fX/8AAEQgAAQABAwEiAAIRAQMRAf/EAB8AAAEFAQEB" +
- "AQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAE" +
- "EQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2" +
- "Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SV" +
- "lpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn" +
- "6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//E" +
- "ALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkj" +
- "M1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2Rl" +
- "ZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5" +
- "usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMR" +
- "AD8AgooorjPYP//Z";
- String png_image =
- "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAMAAAAoyzS7AAAABlBMVEX/JgAAAAAP" +
- "IsinAAAACklEQVQImWNgAAAAAgAB9HFkpgAAAABJRU5ErkJggg==";
-
try
{
return new Object [][] {
- {ByteString.wrap(Base64.decode(non_image)), false},
{ByteString.wrap(Base64.decode(jfif_image)), true},
- {ByteString.wrap(Base64.decode(exif_image)), true},
- {ByteString.wrap(Base64.decode(png_image)), false}
};
}
catch (Exception e)
--
Gitblit v1.10.0