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/MatchingRuleTest.java | 161 +++++++++++++++++++++++------------------------------
1 files changed, 69 insertions(+), 92 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTest.java b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTest.java
index b4961f5..59e1a8b 100644
--- a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTest.java
+++ b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTest.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
@@ -26,113 +25,91 @@
*/
package org.forgerock.opendj.ldap.schema;
-
-
import static org.testng.Assert.assertEquals;
import org.forgerock.opendj.ldap.Assertion;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConditionResult;
import org.forgerock.opendj.ldap.DecodeException;
-import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-
-
/**
* Test The equality matching rules and the equality matching rule api.
*/
@SuppressWarnings("javadoc")
-public abstract class MatchingRuleTest extends SchemaTestCase
-{
- /**
- * Generate invalid assertion values for the Matching Rule test.
- *
- * @return the data for the EqualityMatchingRulesInvalidValuestest.
- */
- @DataProvider(name = "matchingRuleInvalidAssertionValues")
- public Object[][] createMatchingRuleInvalidAssertionValues()
- {
- return createMatchingRuleInvalidAttributeValues();
- }
+public abstract class MatchingRuleTest extends SchemaTestCase {
+ /**
+ * Generate invalid assertion values for the Matching Rule test.
+ *
+ * @return the data for the EqualityMatchingRulesInvalidValuestest.
+ */
+ @DataProvider(name = "matchingRuleInvalidAssertionValues")
+ public Object[][] createMatchingRuleInvalidAssertionValues() {
+ return createMatchingRuleInvalidAttributeValues();
+ }
+ /**
+ * Generate invalid attribute values for the Matching Rule test.
+ *
+ * @return the data for the EqualityMatchingRulesInvalidValuestest.
+ */
+ @DataProvider(name = "matchingRuleInvalidAttributeValues")
+ public abstract Object[][] createMatchingRuleInvalidAttributeValues();
+ /**
+ * Generate data for the Matching Rule test.
+ *
+ * @return the data for the equality matching rule test.
+ */
+ @DataProvider(name = "matchingrules")
+ public abstract Object[][] createMatchingRuleTest();
- /**
- * Generate invalid attribute values for the Matching Rule test.
- *
- * @return the data for the EqualityMatchingRulesInvalidValuestest.
- */
- @DataProvider(name = "matchingRuleInvalidAttributeValues")
- public abstract Object[][] createMatchingRuleInvalidAttributeValues();
+ /**
+ * Test the normalization and the comparison of valid values.
+ */
+ @Test(dataProvider = "matchingrules")
+ public void matchingRules(final String value1, final String value2, final ConditionResult result)
+ throws Exception {
+ final MatchingRule rule = getRule();
+ // normalize the 2 provided values and check that they are equals
+ final ByteString normalizedValue1 =
+ rule.normalizeAttributeValue(ByteString.valueOf(value1));
+ final Assertion assertion = rule.getAssertion(ByteString.valueOf(value2));
+ final ConditionResult liveResult = assertion.matches(normalizedValue1);
+ assertEquals(result, liveResult);
+ }
- /**
- * Generate data for the Matching Rule test.
- *
- * @return the data for the equality matching rule test.
- */
- @DataProvider(name = "matchingrules")
- public abstract Object[][] createMatchingRuleTest();
+ /**
+ * Test that invalid values are rejected.
+ */
+ @Test(expectedExceptions = DecodeException.class,
+ dataProvider = "matchingRuleInvalidAssertionValues")
+ public void matchingRulesInvalidAssertionValues(final String value) throws Exception {
+ // Get the instance of the rule to be tested.
+ final MatchingRule rule = getRule();
+ rule.getAssertion(ByteString.valueOf(value));
+ }
+ /**
+ * Test that invalid values are rejected.
+ */
+ @Test(expectedExceptions = DecodeException.class,
+ dataProvider = "matchingRuleInvalidAttributeValues")
+ public void matchingRulesInvalidAttributeValues(final String value) throws Exception {
+ // Get the instance of the rule to be tested.
+ final MatchingRule rule = getRule();
- /**
- * Test the normalization and the comparison of valid values.
- */
- @Test(dataProvider = "matchingrules")
- public void matchingRules(final String value1, final String value2,
- final ConditionResult result) throws Exception
- {
- final MatchingRule rule = getRule();
+ rule.normalizeAttributeValue(ByteString.valueOf(value));
+ }
- // normalize the 2 provided values and check that they are equals
- final ByteString normalizedValue1 = rule.normalizeAttributeValue(ByteString
- .valueOf(value1));
- final Assertion assertion = rule.getAssertion(ByteString.valueOf(value2));
-
- final ConditionResult liveResult = assertion.matches(normalizedValue1);
- assertEquals(result, liveResult);
- }
-
-
-
- /**
- * Test that invalid values are rejected.
- */
- @Test(expectedExceptions = DecodeException.class, dataProvider = "matchingRuleInvalidAssertionValues")
- public void matchingRulesInvalidAssertionValues(final String value)
- throws Exception
- {
- // Get the instance of the rule to be tested.
- final MatchingRule rule = getRule();
-
- rule.getAssertion(ByteString.valueOf(value));
- }
-
-
-
- /**
- * Test that invalid values are rejected.
- */
- @Test(expectedExceptions = DecodeException.class, dataProvider = "matchingRuleInvalidAttributeValues")
- public void matchingRulesInvalidAttributeValues(final String value)
- throws Exception
- {
- // Get the instance of the rule to be tested.
- final MatchingRule rule = getRule();
-
- rule.normalizeAttributeValue(ByteString.valueOf(value));
- }
-
-
-
- /**
- * Get an instance of the matching rule.
- *
- * @return An instance of the matching rule to test.
- */
- protected abstract MatchingRule getRule();
+ /**
+ * Get an instance of the matching rule.
+ *
+ * @return An instance of the matching rule to test.
+ */
+ protected abstract MatchingRule getRule();
}
--
Gitblit v1.10.0