From 001aa3e444e96f827900ba6550c8f9a4d8a45ffe Mon Sep 17 00:00:00 2001
From: coulbeck <coulbeck@localhost>
Date: Mon, 12 Mar 2007 22:05:23 +0000
Subject: [PATCH] Tidy up related to issue #730, which was not valid.
---
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRuleTest.java | 7 ++++---
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java | 7 ++++---
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactSubstringMatchingRuleTest.java | 7 ++++---
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringSubstringMatchingRuleTest.java | 9 +++++----
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRuleTest.java | 7 ++++---
5 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRuleTest.java
index 15596fe..aa8a89b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRuleTest.java
@@ -50,9 +50,10 @@
{"this is a value", new String[] {"value"}, true },
{"this is a value", new String[] {" "}, true },
{"this is a value", new String[] {"this", "is", "a", "value"}, true },
- // {"this is a value", new String[] {"this", "this is"}, true },
- // disabled becasue of issue 730
- // {"this is a value", new String[] {"value", "this"}, true },
+ // The matching rule requires ordered non overlapping substrings
+ // Issue #730 was not valid.
+ {"this is a value", new String[] {"value", "this"}, false },
+ {"this is a value", new String[] {"this", "this is"}, false },
{"this is a value", new String[] {"his is", "a val",}, true },
{"this is a value", new String[] {"not",}, false },
{"this is a value", new String[] {"THIS",}, false },
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactSubstringMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactSubstringMatchingRuleTest.java
index 7335756..55452e8 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactSubstringMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactSubstringMatchingRuleTest.java
@@ -50,9 +50,10 @@
{"this is a value", new String[] {"value"}, true },
{"this is a value", new String[] {" "}, true },
{"this is a value", new String[] {"this", "is", "a", "value"}, true },
- // {"this is a value", new String[] {"this", "this is"}, true },
- // disabled becasue of issue 730
- // {"this is a value", new String[] {"value", "this"}, true },
+ // The matching rule requires ordered non overlapping substrings.
+ // Issue #730 was not valid.
+ {"this is a value", new String[] {"value", "this"}, false },
+ {"this is a value", new String[] {"this", "this is"}, false },
{"this is a value", new String[] {"his is", "a val",}, true },
{"this is a value", new String[] {"not",}, false },
{"this is a value", new String[] {"THIS",}, false },
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java
index 7ea4449..0ade83e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java
@@ -54,9 +54,10 @@
{"this is a value", new String[] {"VALUE"}, true },
{"this is a value", new String[] {" "}, true },
{"this is a value", new String[] {"this", "is", "a", "value"}, true },
- // disabled because of issue 730
- // {"this is a value", new String[] {"value", "this"}, true },
- // {"this is a value", new String[] {"this", "this is"}, true },
+ // The matching rule requires ordered non overlapping substrings.
+ // Issue #730 was not valid.
+ {"this is a value", new String[] {"value", "this"}, false },
+ {"this is a value", new String[] {"this", "this is"}, false },
{"this is a value", new String[] {"this", "IS", "a", "VALue"}, true },
{"this is a value", new String[] {"his IS", "A val",}, true },
{"this is a value", new String[] {"not",}, false },
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRuleTest.java
index 7a8f664..3a07fe2 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRuleTest.java
@@ -54,9 +54,10 @@
{"this is a value", new String[] {"VALUE"}, true },
{"this is a value", new String[] {" "}, true },
{"this is a value", new String[] {"this", "is", "a", "value"}, true },
- // disabled because of issue 730
- // {"this is a value", new String[] {"value", "this"}, true },
- // {"this is a value", new String[] {"this", "this is"}, true },
+ // The matching rule requires ordered non overlapping substrings.
+ // Issue #730 was not valid.
+ {"this is a value", new String[] {"value", "this"}, false },
+ {"this is a value", new String[] {"this", "this is"}, false },
{"this is a value", new String[] {"this", "IS", "a", "VALue"}, true },
{"this is a value", new String[] {"his IS", "A val",}, true },
{"this is a value", new String[] {"not",}, false },
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringSubstringMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringSubstringMatchingRuleTest.java
index 94eea76..95632e1 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringSubstringMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringSubstringMatchingRuleTest.java
@@ -44,10 +44,11 @@
public Object[][] createSubstringMiddleMatchData()
{
return new Object[][] {
- // disabled becasue of issue 730
- // {"123456789", new String[] {"123", "234", "567", "789"}, true },
- // {"123456789", new String[] {"123", "234"}, true },
- // {"123456789", new String[] {"567", "234"}, true },
+ // The matching rule requires ordered non overlapping substrings.
+ // Issue #730 was not valid.
+ {"123456789", new String[] {"123", "234", "567", "789"}, false },
+ {"123456789", new String[] {"123", "234"}, false },
+ {"123456789", new String[] {"567", "234"}, false },
{"123456789", new String[] {"123", "456"}, true },
{"123456789", new String[] {"123"}, true },
{"123456789", new String[] {"456"}, true },
--
Gitblit v1.10.0