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/CaseExactSubstringMatchingRuleTest.java | 115 +++++++++++++++++++++++++++------------------------------
1 files changed, 55 insertions(+), 60 deletions(-)
diff --git a/sdk/tests/unit-tests-testng/src/org/opends/sdk/schema/CaseExactSubstringMatchingRuleTest.java b/sdk/tests/unit-tests-testng/src/org/opends/sdk/schema/CaseExactSubstringMatchingRuleTest.java
index decbbcc..70bf2f7 100644
--- a/sdk/tests/unit-tests-testng/src/org/opends/sdk/schema/CaseExactSubstringMatchingRuleTest.java
+++ b/sdk/tests/unit-tests-testng/src/org/opends/sdk/schema/CaseExactSubstringMatchingRuleTest.java
@@ -42,42 +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[] { " " }, 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[] { "his is", "a val", },
- ConditionResult.TRUE },
- { "this is a value", new String[] { "not", },
- ConditionResult.FALSE },
- { "this is a value", new String[] { "THIS", },
- ConditionResult.FALSE },
- { "this is a value", new String[] { "this", "not" },
- ConditionResult.FALSE },
- { "this is a value", new String[] { " " },
- ConditionResult.TRUE }, };
+ return new Object[][] {};
+ }
+
+
+
+ @Override
+ @DataProvider(name = "substringInvalidAttributeValues")
+ public Object[][] createMatchingRuleInvalidAttributeValues()
+ {
+ return new Object[][] {};
}
@@ -86,9 +64,21 @@
* {@inheritDoc}
*/
@Override
- protected MatchingRule getRule()
+ @DataProvider(name = "substringFinalMatchData")
+ public Object[][] createSubstringFinalMatchData()
{
- return Schema.getCoreSchema().getMatchingRule(SMR_CASE_EXACT_OID);
+ return new Object[][] {
+ { "this is a value", "value", ConditionResult.TRUE },
+ { "this is a value", "alue", ConditionResult.TRUE },
+ { "this is a value", "ue", ConditionResult.TRUE },
+ { "this is a value", "e", ConditionResult.TRUE },
+ { "this is a value", "valu", ConditionResult.FALSE },
+ { "this is a value", "this", ConditionResult.FALSE },
+ { "this is a value", " ", ConditionResult.FALSE },
+ { "this is a value", "VALUE", ConditionResult.FALSE },
+ { "this is a VALUE", "value", ConditionResult.FALSE },
+ { "end with space ", " ", ConditionResult.FALSE },
+ { "end with space ", "space", ConditionResult.TRUE }, };
}
@@ -118,37 +108,42 @@
* {@inheritDoc}
*/
@Override
- @DataProvider(name = "substringFinalMatchData")
- public Object[][] createSubstringFinalMatchData()
+ @DataProvider(name = "substringMiddleMatchData")
+ public Object[][] createSubstringMiddleMatchData()
{
return new Object[][] {
- { "this is a value", "value", ConditionResult.TRUE },
- { "this is a value", "alue", ConditionResult.TRUE },
- { "this is a value", "ue", ConditionResult.TRUE },
- { "this is a value", "e", ConditionResult.TRUE },
- { "this is a value", "valu", ConditionResult.FALSE },
- { "this is a value", "this", ConditionResult.FALSE },
- { "this is a value", " ", ConditionResult.FALSE },
- { "this is a value", "VALUE", ConditionResult.FALSE },
- { "this is a VALUE", "value", ConditionResult.FALSE },
- { "end with space ", " ", ConditionResult.FALSE },
- { "end with space ", "space", 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[] { "his is", "a val", },
+ ConditionResult.TRUE },
+ { "this is a value", new String[] { "not", }, ConditionResult.FALSE },
+ { "this is a value", new String[] { "THIS", }, ConditionResult.FALSE },
+ { "this is a value", new String[] { "this", "not" },
+ ConditionResult.FALSE },
+ { "this is a value", new String[] { " " }, ConditionResult.TRUE }, };
}
- @DataProvider(name = "substringInvalidAttributeValues")
- public Object[][] createMatchingRuleInvalidAttributeValues()
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected MatchingRule getRule()
{
- return new Object[][] {};
- }
-
-
-
- @DataProvider(name = "substringInvalidAssertionValues")
- public Object[][] createMatchingRuleInvalidAssertionValues()
- {
- return new Object[][] {};
+ return Schema.getCoreSchema().getMatchingRule(SMR_CASE_EXACT_OID);
}
}
--
Gitblit v1.10.0