From 263d085885df024dca9250cc03c807912b0a7662 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 24 Apr 2012 22:33:21 +0000
Subject: [PATCH] Reformat to comply with new Checkstyle rules.
---
opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/SchemaUtilsTest.java | 133 +++++++++++++++++--------------------------
1 files changed, 53 insertions(+), 80 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/SchemaUtilsTest.java b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/SchemaUtilsTest.java
index fb3e7d1..f337e90 100644
--- a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/SchemaUtilsTest.java
+++ b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/SchemaUtilsTest.java
@@ -6,17 +6,16 @@
* (the "License"). You may not use this file except in compliance
* with the License.
*
- * You can obtain a copy of the license at
- * trunk/opendj3/legal-notices/CDDLv1_0.txt
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
* or http://forgerock.org/license/CDDLv1.0.html.
* See the License for the specific language governing permissions
* and limitations under the License.
*
* When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at
- * trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information:
* Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
@@ -27,92 +26,66 @@
*/
package org.forgerock.opendj.ldap.schema;
-
-
import org.forgerock.opendj.ldap.DecodeException;
-import org.forgerock.opendj.ldap.schema.SchemaUtils;
import org.testng.Assert;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import com.forgerock.opendj.util.SubstringReader;
-
-
/**
* Test schema utilities.
*/
@SuppressWarnings("javadoc")
-public class SchemaUtilsTest extends SchemaTestCase
-{
+public class SchemaUtilsTest extends SchemaTestCase {
- @DataProvider(name = "invalidOIDs")
- public Object[][] createInvalidOIDs()
- {
- return new Object[][] { { "" }, { ".0" }, { "0." }, { "100." }, { ".999" },
- { "1one" }, { "one+two+three" },
- { "one.two.three" },
- // AD puts quotes around OIDs - test mismatched quotes.
- { "'0" }, { "'10" }, { "999'" }, { "0.0'" }, };
- }
-
-
-
- @DataProvider(name = "validOIDs")
- public Object[][] createValidOIDs()
- {
- return new Object[][] {
- // Compliant NOIDs
- { "0.0" }, { "1.0" }, { "2.0" }, { "3.0" }, { "4.0" }, { "5.0" },
- { "6.0" }, { "7.0" }, { "8.0" }, { "9.0" }, { "0.1" }, { "0.2" },
- { "0.3" }, { "0.4" }, { "0.5" }, { "0.6" }, { "0.7" }, { "0.8" },
- { "0.9" }, { "10.0" }, { "100.0" }, { "999.0" },
- { "0.100" },
- { "0.999" },
- { "100.100" },
- { "999.999" },
- { "111.22.333.44.55555.66.777.88.999" },
- { "a" },
- { "a2" },
- { "a-" },
- { "one" },
- { "one1" },
- { "one-two" },
- { "one1-two2-three3" },
- // AD puts quotes around OIDs - not compliant but we need to
- // handle them.
- { "'0.0'" }, { "'10.0'" }, { "'999.0'" },
- { "'111.22.333.44.55555.66.777.88.999'" }, { "'a'" }, { "'a2'" },
- { "'a-'" }, { "'one'" }, { "'one1'" },
- { "'one-two'" },
- { "'one1-two2-three3'" },
- // Not strictly legal, but we'll be lenient with what we accept.
- { "0" }, { "1" }, { "2" }, { "3" }, { "4" }, { "5" }, { "6" }, { "7" },
- { "8" }, { "9" }, { "00" }, { "01" }, { "01.0" }, { "0.01" },
- };
- }
-
-
-
- @Test(dataProvider = "invalidOIDs", expectedExceptions = DecodeException.class)
- public void testReadOIDInvalid(final String oid) throws DecodeException
- {
- final SubstringReader reader = new SubstringReader(oid);
- SchemaUtils.readOID(reader, false);
- }
-
-
-
- @Test(dataProvider = "validOIDs")
- public void testReadOIDValid(final String oid) throws DecodeException
- {
- String expected = oid;
- if (oid.startsWith("'"))
- {
- expected = oid.substring(1, oid.length() - 1);
+ @DataProvider(name = "invalidOIDs")
+ public Object[][] createInvalidOIDs() {
+ return new Object[][] { { "" }, { ".0" }, { "0." }, { "100." }, { ".999" }, { "1one" },
+ { "one+two+three" }, { "one.two.three" },
+ // AD puts quotes around OIDs - test mismatched quotes.
+ { "'0" }, { "'10" }, { "999'" }, { "0.0'" }, };
}
- final SubstringReader reader = new SubstringReader(oid);
- Assert.assertEquals(SchemaUtils.readOID(reader, false), expected);
- }
+ @DataProvider(name = "validOIDs")
+ public Object[][] createValidOIDs() {
+ return new Object[][] {
+ // Compliant NOIDs
+ { "0.0" }, { "1.0" }, { "2.0" }, { "3.0" }, { "4.0" }, { "5.0" }, { "6.0" }, { "7.0" },
+ { "8.0" }, { "9.0" }, { "0.1" }, { "0.2" }, { "0.3" }, { "0.4" }, { "0.5" }, { "0.6" },
+ { "0.7" }, { "0.8" }, { "0.9" }, { "10.0" }, { "100.0" }, { "999.0" }, { "0.100" },
+ { "0.999" }, { "100.100" }, { "999.999" }, { "111.22.333.44.55555.66.777.88.999" },
+ { "a" },
+ { "a2" },
+ { "a-" },
+ { "one" },
+ { "one1" },
+ { "one-two" },
+ { "one1-two2-three3" },
+ // AD puts quotes around OIDs - not compliant but we need to
+ // handle them.
+ { "'0.0'" }, { "'10.0'" }, { "'999.0'" }, { "'111.22.333.44.55555.66.777.88.999'" },
+ { "'a'" }, { "'a2'" }, { "'a-'" }, { "'one'" }, { "'one1'" }, { "'one-two'" },
+ { "'one1-two2-three3'" },
+ // Not strictly legal, but we'll be lenient with what we accept.
+ { "0" }, { "1" }, { "2" }, { "3" }, { "4" }, { "5" }, { "6" }, { "7" }, { "8" },
+ { "9" }, { "00" }, { "01" }, { "01.0" }, { "0.01" }, };
+ }
+
+ @Test(dataProvider = "invalidOIDs", expectedExceptions = DecodeException.class)
+ public void testReadOIDInvalid(final String oid) throws DecodeException {
+ final SubstringReader reader = new SubstringReader(oid);
+ SchemaUtils.readOID(reader, false);
+ }
+
+ @Test(dataProvider = "validOIDs")
+ public void testReadOIDValid(final String oid) throws DecodeException {
+ String expected = oid;
+ if (oid.startsWith("'")) {
+ expected = oid.substring(1, oid.length() - 1);
+ }
+
+ final SubstringReader reader = new SubstringReader(oid);
+ Assert.assertEquals(SchemaUtils.readOID(reader, false), expected);
+ }
}
--
Gitblit v1.10.0