From dc6197f9e6919344773e52d5606ea3791903eb64 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 22 May 2015 13:16:03 +0000
Subject: [PATCH] Fix checkstyle errors
---
opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxTest.java | 28 ++--
opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxTest.java | 11 -
opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java | 17 +-
opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelexSyntaxTest.java | 9
opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxTest.java | 24 ++--
opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxTest.java | 101 ++++++++--------
opendj-core/src/test/java/org/forgerock/opendj/ldap/GeneralizedTimeTest.java | 113 +++++++++---------
opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxTest.java | 25 +--
8 files changed, 157 insertions(+), 171 deletions(-)
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/GeneralizedTimeTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/GeneralizedTimeTest.java
index 4a429ee..9faf8b2 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/GeneralizedTimeTest.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/GeneralizedTimeTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions copyright 2012-2013 ForgeRock AS.
+ * Portions copyright 2012-2015 ForgeRock AS.
*/
package org.forgerock.opendj.ldap;
@@ -164,70 +164,67 @@
* @return Returns test data.
*/
@DataProvider()
- public Object[][] createToStringData()
- {
- return new Object [][] {
- // Note that Calendar months run from 0-11,
- // and that there was no such year as year 0 (1 BC -> 1 AD).
- { 1, 0, 1, 0, 0, 0, 0, "00010101000000Z"},
- { 9, 0, 1, 0, 0, 0, 0, "00090101000000Z"},
- { 10, 0, 1, 0, 0, 0, 0, "00100101000000Z"},
- { 99, 0, 1, 0, 0, 0, 0, "00990101000000Z"},
- { 100, 0, 1, 0, 0, 0, 0, "01000101000000Z"},
- { 999, 0, 1, 0, 0, 0, 0, "09990101000000Z"},
- {1000, 0, 1, 0, 0, 0, 0, "10000101000000Z"},
- {2000, 0, 1, 0, 0, 0, 0, "20000101000000Z"},
- {2099, 0, 1, 0, 0, 0, 0, "20990101000000Z"},
- {2000, 8, 1, 0, 0, 0, 0, "20000901000000Z"},
- {2000, 9, 1, 0, 0, 0, 0, "20001001000000Z"},
- {2000, 10, 1, 0, 0, 0, 0, "20001101000000Z"},
- {2000, 11, 1, 0, 0, 0, 0, "20001201000000Z"},
- {2000, 0, 9, 0, 0, 0, 0, "20000109000000Z"},
- {2000, 0, 10, 0, 0, 0, 0, "20000110000000Z"},
- {2000, 0, 19, 0, 0, 0, 0, "20000119000000Z"},
- {2000, 0, 20, 0, 0, 0, 0, "20000120000000Z"},
- {2000, 0, 29, 0, 0, 0, 0, "20000129000000Z"},
- {2000, 0, 30, 0, 0, 0, 0, "20000130000000Z"},
- {2000, 0, 31, 0, 0, 0, 0, "20000131000000Z"},
- {2000, 0, 1, 9, 0, 0, 0, "20000101090000Z"},
- {2000, 0, 1, 10, 0, 0, 0, "20000101100000Z"},
- {2000, 0, 1, 19, 0, 0, 0, "20000101190000Z"},
- {2000, 0, 1, 20, 0, 0, 0, "20000101200000Z"},
- {2000, 0, 1, 23, 0, 0, 0, "20000101230000Z"},
- {2000, 0, 1, 0, 9, 0, 0, "20000101000900Z"},
- {2000, 0, 1, 0, 10, 0, 0, "20000101001000Z"},
- {2000, 0, 1, 0, 59, 0, 0, "20000101005900Z"},
- {2000, 0, 1, 0, 0, 9, 0, "20000101000009Z"},
- {2000, 0, 1, 0, 0, 10, 0, "20000101000010Z"},
- {2000, 0, 1, 0, 0, 59, 0, "20000101000059Z"},
- {2000, 0, 1, 0, 0, 0, 9, "20000101000000.009Z"},
- {2000, 0, 1, 0, 0, 0, 10, "20000101000000.010Z"},
- {2000, 0, 1, 0, 0, 0, 99, "20000101000000.099Z"},
- {2000, 0, 1, 0, 0, 0, 100, "20000101000000.100Z"},
- {2000, 0, 1, 0, 0, 0, 999, "20000101000000.999Z"},
- };
+ public Object[][] createToStringData() {
+ return new Object[][] {
+ // Note that Calendar months run from 0-11,
+ // and that there was no such year as year 0 (1 BC -> 1 AD).
+ { 1, 0, 1, 0, 0, 0, 0, "00010101000000Z"},
+ { 9, 0, 1, 0, 0, 0, 0, "00090101000000Z"},
+ { 10, 0, 1, 0, 0, 0, 0, "00100101000000Z"},
+ { 99, 0, 1, 0, 0, 0, 0, "00990101000000Z"},
+ { 100, 0, 1, 0, 0, 0, 0, "01000101000000Z"},
+ { 999, 0, 1, 0, 0, 0, 0, "09990101000000Z"},
+ {1000, 0, 1, 0, 0, 0, 0, "10000101000000Z"},
+ {2000, 0, 1, 0, 0, 0, 0, "20000101000000Z"},
+ {2099, 0, 1, 0, 0, 0, 0, "20990101000000Z"},
+ {2000, 8, 1, 0, 0, 0, 0, "20000901000000Z"},
+ {2000, 9, 1, 0, 0, 0, 0, "20001001000000Z"},
+ {2000, 10, 1, 0, 0, 0, 0, "20001101000000Z"},
+ {2000, 11, 1, 0, 0, 0, 0, "20001201000000Z"},
+ {2000, 0, 9, 0, 0, 0, 0, "20000109000000Z"},
+ {2000, 0, 10, 0, 0, 0, 0, "20000110000000Z"},
+ {2000, 0, 19, 0, 0, 0, 0, "20000119000000Z"},
+ {2000, 0, 20, 0, 0, 0, 0, "20000120000000Z"},
+ {2000, 0, 29, 0, 0, 0, 0, "20000129000000Z"},
+ {2000, 0, 30, 0, 0, 0, 0, "20000130000000Z"},
+ {2000, 0, 31, 0, 0, 0, 0, "20000131000000Z"},
+ {2000, 0, 1, 9, 0, 0, 0, "20000101090000Z"},
+ {2000, 0, 1, 10, 0, 0, 0, "20000101100000Z"},
+ {2000, 0, 1, 19, 0, 0, 0, "20000101190000Z"},
+ {2000, 0, 1, 20, 0, 0, 0, "20000101200000Z"},
+ {2000, 0, 1, 23, 0, 0, 0, "20000101230000Z"},
+ {2000, 0, 1, 0, 9, 0, 0, "20000101000900Z"},
+ {2000, 0, 1, 0, 10, 0, 0, "20000101001000Z"},
+ {2000, 0, 1, 0, 59, 0, 0, "20000101005900Z"},
+ {2000, 0, 1, 0, 0, 9, 0, "20000101000009Z"},
+ {2000, 0, 1, 0, 0, 10, 0, "20000101000010Z"},
+ {2000, 0, 1, 0, 0, 59, 0, "20000101000059Z"},
+ {2000, 0, 1, 0, 0, 0, 9, "20000101000000.009Z"},
+ {2000, 0, 1, 0, 0, 0, 10, "20000101000000.010Z"},
+ {2000, 0, 1, 0, 0, 0, 99, "20000101000000.099Z"},
+ {2000, 0, 1, 0, 0, 0, 100, "20000101000000.100Z"},
+ {2000, 0, 1, 0, 0, 0, 999, "20000101000000.999Z"},
+ };
}
private static final String TIME_ZONE_UTC = "UTC";
- @Test(dataProvider="createToStringData")
- public void testToString(int yyyy, int MM, int dd, int HH, int mm, int ss, int SSS, String expected)
- throws Exception
- {
- Calendar calendar = new GregorianCalendar(TimeZone.getTimeZone(TIME_ZONE_UTC));
- calendar.set(yyyy, MM, dd, HH, mm, ss);
- calendar.set(Calendar.MILLISECOND, SSS);
+ @Test(dataProvider = "createToStringData")
+ public void testToString(int yyyy, int month, int dd, int hour, int mm, int ss, int millis, String expected)
+ throws Exception {
+ Calendar calendar = new GregorianCalendar(TimeZone.getTimeZone(TIME_ZONE_UTC));
+ calendar.set(yyyy, month, dd, hour, mm, ss);
+ calendar.set(Calendar.MILLISECOND, millis);
- long time = calendar.getTimeInMillis();
- // test creation with long only if it is positive because negative values will be rejected
- if (time > 0)
- {
- assertThat(GeneralizedTime.valueOf(time).toString()).isEqualTo(expected);
- }
+ long time = calendar.getTimeInMillis();
+ // test creation with long only if it is positive because negative values will be rejected
+ if (time > 0) {
+ assertThat(GeneralizedTime.valueOf(time).toString()).isEqualTo(expected);
+ }
- Date date = new Date(time);
- assertThat(GeneralizedTime.valueOf(date).toString()).isEqualTo(expected);
+ Date date = new Date(time);
+ assertThat(GeneralizedTime.valueOf(date).toString()).isEqualTo(expected);
}
}
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxTest.java
index c78ce52..39bf5f0 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxTest.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions copyright 2014 ForgeRock AS.
+ * Portions copyright 2014-2015 ForgeRock AS.
*/
package org.forgerock.opendj.ldap.schema;
@@ -40,13 +40,8 @@
@Override
@DataProvider(name = "acceptableValues")
public Object[][] createAcceptableValues() {
- return new Object[][] {
- { "'0101'B", true },
- { "'1'B", true },
- { "'0'B", true },
- { "invalid", false },
- { "1", false },
- { "'010100000111111010101000'B", true }, };
+ return new Object[][] { { "'0101'B", true }, { "'1'B", true }, { "'0'B", true }, { "invalid", false },
+ { "1", false }, { "'010100000111111010101000'B", true }, };
}
/** {@inheritDoc} */
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxTest.java
index 3ada8fd..9fa5e17 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxTest.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions copyright 2014 ForgeRock AS.
+ * Portions copyright 2014-2015 ForgeRock AS.
*/
package org.forgerock.opendj.ldap.schema;
@@ -37,19 +37,16 @@
@Override
@DataProvider(name = "acceptableValues")
public Object[][] createAcceptableValues() {
- return new Object[][] { { "2006090613Z", true }, { "20060906135030+01", true },
- { "200609061350Z", true }, { "20060906135030Z", true }, { "20061116135030Z", true },
- { "20061126135030Z", true }, { "20061231235959Z", true },
- { "20060906135030+0101", true }, { "20060906135030+2359", true },
- { "20060906135030+3359", false }, { "20060906135030+2389", false },
- { "20060906135030+2361", false }, { "20060906135030+", false },
- { "20060906135030+0", false }, { "20060906135030+010", false },
- { "20061200235959Z", false }, { "2006121a235959Z", false },
- { "2006122a235959Z", false }, { "20060031235959Z", false },
- { "20061331235959Z", false }, { "20062231235959Z", false },
- { "20061232235959Z", false }, { "2006123123595aZ", false },
- { "200a1231235959Z", false }, { "2006j231235959Z", false },
- { "200612-1235959Z", false }, { "20061231#35959Z", false }, { "2006", false }, };
+ return new Object[][] { { "2006090613Z", true }, { "20060906135030+01", true }, { "200609061350Z", true },
+ { "20060906135030Z", true }, { "20061116135030Z", true }, { "20061126135030Z", true },
+ { "20061231235959Z", true }, { "20060906135030+0101", true }, { "20060906135030+2359", true },
+ { "20060906135030+3359", false }, { "20060906135030+2389", false }, { "20060906135030+2361", false },
+ { "20060906135030+", false }, { "20060906135030+0", false }, { "20060906135030+010", false },
+ { "20061200235959Z", false }, { "2006121a235959Z", false }, { "2006122a235959Z", false },
+ { "20060031235959Z", false }, { "20061331235959Z", false }, { "20062231235959Z", false },
+ { "20061232235959Z", false }, { "2006123123595aZ", false }, { "200a1231235959Z", false },
+ { "2006j231235959Z", false }, { "200612-1235959Z", false }, { "20061231#35959Z", false },
+ { "2006", false }, };
}
/** {@inheritDoc} */
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxTest.java
index b3f347f..71c6b59 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxTest.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions copyright 2014 ForgeRock AS.
+ * Portions copyright 2014-2015 ForgeRock AS.
*/
package org.forgerock.opendj.ldap.schema;
@@ -40,17 +40,17 @@
@Override
@DataProvider(name = "acceptableValues")
public Object[][] createAcceptableValues() {
- return new Object [][] {
- {"123", true},
- {"987654321", true},
- {"-1", true},
- {"10001", true},
- {"001", false},
- {"-01", false},
- {"12345678\u2163", false},
- {" 123", false},
- {"123 ", false}
- };
+ return new Object [][] {
+ {"123", true},
+ {"987654321", true},
+ {"-1", true},
+ {"10001", true},
+ {"001", false},
+ {"-01", false},
+ {"12345678\u2163", false},
+ {" 123", false},
+ {"123 ", false}
+ };
}
/** {@inheritDoc} */
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxTest.java
index ab3579f..9eb3c2c 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxTest.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxTest.java
@@ -45,59 +45,56 @@
@DataProvider(name = "acceptableValues")
public Object[][] createAcceptableValues() {
- String non_image =
- "AAECAwQFBgcICQ==";
- String jfif_image =
- "/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDACMYGh4aFiMeHB4nJSMpNFc4NDAwNGpM" +
- "UD9Xfm+EgnxveneLnMipi5S9lnd6ru2wvc7V4OLgh6f1//PZ/8jb4Nf/2wBDASUn" +
- "JzQuNGY4OGbXj3qP19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX" +
- "19fX19fX19fX19fX19f/wAARCAABAAEDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEA" +
- "AAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIh" +
- "MUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6" +
- "Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZ" +
- "mqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx" +
- "8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREA" +
- "AgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAV" +
- "YnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hp" +
- "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==";
+ String nonImage =
+ "AAECAwQFBgcICQ==";
+ String jfifImage =
+ "/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDACMYGh4aFiMeHB4nJSMpNFc4NDAwNGpM"
+ + "UD9Xfm+EgnxveneLnMipi5S9lnd6ru2wvc7V4OLgh6f1//PZ/8jb4Nf/2wBDASUn"
+ + "JzQuNGY4OGbXj3qP19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX"
+ + "19fX19fX19fX19fX19f/wAARCAABAAEDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEA"
+ + "AAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIh"
+ + "MUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6"
+ + "Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZ"
+ + "mqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx"
+ + "8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREA"
+ + "AgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAV"
+ + "YnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hp"
+ + "anN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPE"
+ + "xcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwCC"
+ + "iiiuM9g//9k=";
+ String exifImage =
+ "/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 pngImage =
+ "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAMAAAAoyzS7AAAABlBMVEX/JgAAAAAP"
+ + "IsinAAAACklEQVQImWNgAAAAAgAB9HFkpgAAAABJRU5ErkJggg==";
- try
- {
- return new Object[][] {
- { ByteString.valueOfBase64(non_image), false },
- { ByteString.valueOfBase64(jfif_image), true },
- { ByteString.valueOfBase64(exif_image), true },
- { ByteString.valueOfBase64(png_image), false } };
- }
- catch (Exception e)
- {
- return new Object[][] {};
- }
+ try {
+ return new Object[][] {
+ { ByteString.valueOfBase64(nonImage), false },
+ { ByteString.valueOfBase64(jfifImage), true },
+ { ByteString.valueOfBase64(exifImage), true },
+ { ByteString.valueOfBase64(pngImage), false } };
+ } catch (Exception e) {
+ return new Object[][] {};
+ }
}
/** Test acceptable values for this syntax when not allowing malformed JPEG photos. */
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java
index 2e9cf55..3287587 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java
@@ -1196,18 +1196,17 @@
@Test
public final void testSchemaBuilderWithAttributeUsageDifferentFromSuperior() {
- final SchemaBuilder scBuild = new SchemaBuilder();
+ final SchemaBuilder scBuild = new SchemaBuilder();
- // directoryOperation can't inherit from userApplications
- scBuild.addAttributeType("(1.2.8.5 NAME 'testtype' DESC 'full type' OBSOLETE SUP cn "
- + " EQUALITY caseIgnoreMatch ORDERING caseIgnoreOrderingMatch"
- + " SUBSTR caseIgnoreSubstringsMatch"
+ // directoryOperation can't inherit from userApplications
+ scBuild.addAttributeType("(1.2.8.5 NAME 'testtype' DESC 'full type' OBSOLETE SUP cn "
+ + " EQUALITY caseIgnoreMatch ORDERING caseIgnoreOrderingMatch" + " SUBSTR caseIgnoreSubstringsMatch"
+ " SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE"
+ " NO-USER-MODIFICATION USAGE directoryOperation )", true);
- scBuild.addSchema(Schema.getCoreSchema(), false);
- Schema schema = scBuild.toSchema();
- assertThat(schema.getWarnings()).hasSize(1);
- assertThat(schema.getWarnings().toString()).contains("attribute usage directoryOperation is not the same");
+ scBuild.addSchema(Schema.getCoreSchema(), false);
+ Schema schema = scBuild.toSchema();
+ assertThat(schema.getWarnings()).hasSize(1);
+ assertThat(schema.getWarnings().toString()).contains("attribute usage directoryOperation is not the same");
}
/**
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxTest.java
index 6eedd09..7054fa0 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxTest.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxTest.java
@@ -37,28 +37,28 @@
*/
@Test
public class TelephoneNumberSyntaxTest extends AbstractSyntaxTestCase {
+
/** {@inheritDoc} */
@Override
@DataProvider(name = "acceptableValues")
public Object[][] createAcceptableValues() {
return new Object[][] {
- { "+61 3 9896 7830", true},
- { "+1 512 315 0280", true},
- { "+1-512-315-0280", true},
- { "3 9896 7830", false},
- { "+1+512 315 0280", false},
- { "+1x512x315x0280", false},
- { " ", false},
- { "", false}
- };
+ { "+61 3 9896 7830", true },
+ { "+1 512 315 0280", true },
+ { "+1-512-315-0280", true },
+ { "3 9896 7830", false },
+ { "+1+512 315 0280", false },
+ { "+1x512x315x0280", false },
+ { " ", false },
+ { "", false } };
}
/** {@inheritDoc} */
@Override
- protected Syntax getRule()
- {
- SchemaBuilder builder = new SchemaBuilder(getCoreSchema()).setOption(ALLOW_NON_STANDARD_TELEPHONE_NUMBERS, false);
- return builder.toSchema().getSyntax(SYNTAX_TELEPHONE_OID);
- }
+ protected Syntax getRule() {
+ SchemaBuilder builder = new SchemaBuilder(getCoreSchema()).setOption(ALLOW_NON_STANDARD_TELEPHONE_NUMBERS,
+ false);
+ return builder.toSchema().getSyntax(SYNTAX_TELEPHONE_OID);
+ }
}
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelexSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelexSyntaxTest.java
index 51f3e4c..7026acc 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelexSyntaxTest.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelexSyntaxTest.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions copyright 2014 ForgeRock AS.
+ * Portions copyright 2014-2015 ForgeRock AS.
*/
package org.forgerock.opendj.ldap.schema;
@@ -36,14 +36,15 @@
*/
@Test
public class TelexSyntaxTest extends AbstractSyntaxTestCase {
+
/** {@inheritDoc} */
@Override
@DataProvider(name = "acceptableValues")
public Object[][] createAcceptableValues() {
return new Object[][] {
- { "123$france$456", true },
- { "abcdefghijk$lmnopqr$stuvwxyz", true },
- { "12345$67890$()+,-./:? ", true }, };
+ { "123$france$456", true },
+ { "abcdefghijk$lmnopqr$stuvwxyz", true },
+ { "12345$67890$()+,-./:? ", true }, };
}
/** {@inheritDoc} */
--
Gitblit v1.10.0