From f2160f4bd1c8ac67e5a86a6710d431e8932877f9 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 28 May 2010 11:47:51 +0000
Subject: [PATCH] Synchronize SDK on java.net with internal repository.
---
sdk/tests/unit-tests-testng/src/org/opends/sdk/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java | 155 ++++++++++++++++++++++++---------------------------
1 files changed, 72 insertions(+), 83 deletions(-)
diff --git a/sdk/tests/unit-tests-testng/src/org/opends/sdk/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java b/sdk/tests/unit-tests-testng/src/org/opends/sdk/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java
index 33a8b6e..5757c14 100644
--- a/sdk/tests/unit-tests-testng/src/org/opends/sdk/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java
+++ b/sdk/tests/unit-tests-testng/src/org/opends/sdk/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java
@@ -42,87 +42,20 @@
SubstringMatchingRuleTest
{
- /**
- * {@inheritDoc}
- */
- @Override
- @DataProvider(name = "substringMiddleMatchData")
- public Object[][] createSubstringMiddleMatchData()
+ @DataProvider(name = "substringInvalidAssertionValues")
+ public Object[][] createMatchingRuleInvalidAssertionValues()
{
- return new Object[][] {
- { "this is a value", new String[] { "this" },
- ConditionResult.TRUE },
- { "this is a value", new String[] { "is" },
- ConditionResult.TRUE },
- { "this is a value", new String[] { "a" }, ConditionResult.TRUE },
- { "this is a value", new String[] { "value" },
- ConditionResult.TRUE },
- { "this is a value", new String[] { "THIS" },
- ConditionResult.TRUE },
- { "this is a value", new String[] { "IS" },
- ConditionResult.TRUE },
- { "this is a value", new String[] { "A" }, ConditionResult.TRUE },
- { "this is a value", new String[] { "VALUE" },
- ConditionResult.TRUE },
- { "this is a value", new String[] { " " }, ConditionResult.TRUE },
- { "this is a value",
- new String[] { "this", "is", "a", "value" },
- ConditionResult.TRUE },
- // The matching rule requires ordered non overlapping
- // substrings.
- // Issue #730 was not valid.
- { "this is a value", new String[] { "value", "this" },
- ConditionResult.FALSE },
- { "this is a value", new String[] { "this", "this is" },
- ConditionResult.FALSE },
- { "this is a value",
- new String[] { "this", "IS", "a", "VALue" },
- ConditionResult.TRUE },
- { "this is a value", new String[] { "his IS", "A val", },
- ConditionResult.TRUE },
- { "this is a value", new String[] { "not", },
- ConditionResult.FALSE },
- { "this is a value", new String[] { "this", "not" },
- ConditionResult.FALSE },
- { "this is a value", new String[] { " " },
- ConditionResult.TRUE }, };
+ return new Object[][] { { "12345678\uFFFD", new String[0], null },
+ { null, new String[] { "12345678\uFFFD" }, null },
+ { null, new String[0], "12345678\uFFFD" }, };
}
- /**
- * {@inheritDoc}
- */
- @Override
- protected MatchingRule getRule()
+ @DataProvider(name = "substringInvalidAttributeValues")
+ public Object[][] createMatchingRuleInvalidAttributeValues()
{
- return Schema.getCoreSchema().getMatchingRule(
- SMR_CASE_IGNORE_IA5_OID);
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- @Override
- @DataProvider(name = "substringInitialMatchData")
- public Object[][] createSubstringInitialMatchData()
- {
- return new Object[][] {
- { "this is a value", "this", ConditionResult.TRUE },
- { "this is a value", "th", ConditionResult.TRUE },
- { "this is a value", "t", ConditionResult.TRUE },
- { "this is a value", "is", ConditionResult.FALSE },
- { "this is a value", "a", ConditionResult.FALSE },
- { "this is a value", "TH", ConditionResult.TRUE },
- { "this is a value", "T", ConditionResult.TRUE },
- { "this is a value", "IS", ConditionResult.FALSE },
- { "this is a value", "A", ConditionResult.FALSE },
- { "this is a value", "VALUE", ConditionResult.FALSE },
- { "this is a value", " ", ConditionResult.FALSE },
- { "this is a value", "NOT", ConditionResult.FALSE },
- { "this is a value", "THIS", ConditionResult.TRUE }, };
+ return new Object[][] { { "12345678\uFFFD" }, };
}
@@ -156,19 +89,75 @@
- @DataProvider(name = "substringInvalidAttributeValues")
- public Object[][] createMatchingRuleInvalidAttributeValues()
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ @DataProvider(name = "substringInitialMatchData")
+ public Object[][] createSubstringInitialMatchData()
{
- return new Object[][] { { "12345678\uFFFD" }, };
+ return new Object[][] {
+ { "this is a value", "this", ConditionResult.TRUE },
+ { "this is a value", "th", ConditionResult.TRUE },
+ { "this is a value", "t", ConditionResult.TRUE },
+ { "this is a value", "is", ConditionResult.FALSE },
+ { "this is a value", "a", ConditionResult.FALSE },
+ { "this is a value", "TH", ConditionResult.TRUE },
+ { "this is a value", "T", ConditionResult.TRUE },
+ { "this is a value", "IS", ConditionResult.FALSE },
+ { "this is a value", "A", ConditionResult.FALSE },
+ { "this is a value", "VALUE", ConditionResult.FALSE },
+ { "this is a value", " ", ConditionResult.FALSE },
+ { "this is a value", "NOT", ConditionResult.FALSE },
+ { "this is a value", "THIS", ConditionResult.TRUE }, };
}
- @DataProvider(name = "substringInvalidAssertionValues")
- public Object[][] createMatchingRuleInvalidAssertionValues()
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ @DataProvider(name = "substringMiddleMatchData")
+ public Object[][] createSubstringMiddleMatchData()
{
- return new Object[][] { { "12345678\uFFFD", new String[0], null },
- { null, new String[] { "12345678\uFFFD" }, null },
- { null, new String[0], "12345678\uFFFD" }, };
+ return new Object[][] {
+ { "this is a value", new String[] { "this" }, ConditionResult.TRUE },
+ { "this is a value", new String[] { "is" }, ConditionResult.TRUE },
+ { "this is a value", new String[] { "a" }, ConditionResult.TRUE },
+ { "this is a value", new String[] { "value" }, ConditionResult.TRUE },
+ { "this is a value", new String[] { "THIS" }, ConditionResult.TRUE },
+ { "this is a value", new String[] { "IS" }, ConditionResult.TRUE },
+ { "this is a value", new String[] { "A" }, ConditionResult.TRUE },
+ { "this is a value", new String[] { "VALUE" }, ConditionResult.TRUE },
+ { "this is a value", new String[] { " " }, ConditionResult.TRUE },
+ { "this is a value", new String[] { "this", "is", "a", "value" },
+ ConditionResult.TRUE },
+ // The matching rule requires ordered non overlapping
+ // substrings.
+ // Issue #730 was not valid.
+ { "this is a value", new String[] { "value", "this" },
+ ConditionResult.FALSE },
+ { "this is a value", new String[] { "this", "this is" },
+ ConditionResult.FALSE },
+ { "this is a value", new String[] { "this", "IS", "a", "VALue" },
+ ConditionResult.TRUE },
+ { "this is a value", new String[] { "his IS", "A val", },
+ ConditionResult.TRUE },
+ { "this is a value", new String[] { "not", }, ConditionResult.FALSE },
+ { "this is a value", new String[] { "this", "not" },
+ ConditionResult.FALSE },
+ { "this is a value", new String[] { " " }, ConditionResult.TRUE }, };
+ }
+
+
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected MatchingRule getRule()
+ {
+ return Schema.getCoreSchema().getMatchingRule(SMR_CASE_IGNORE_IA5_OID);
}
}
--
Gitblit v1.10.0