[prev in list] [next in list] [prev in thread] [next in thread]
List: forgerock-opendj-dev
Subject: [Opendj-dev] [10969] trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/ schema:
From: noreply () forgerock ! org
Date: 2014-08-21 9:17:57
Message-ID: 20140821091757.C913A40994 () sources ! internal ! forgerock ! com
[Download RAW message or body]
[Attachment #2 (text/html)]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[10969] trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema: \
Preparatory work for OPENDJ-1477: Constant re-allocation of DN per-schema \
caches</title> </head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: \
bold} #msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
.info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a \
href="http://sources.forgerock.org/changelog/opendj/?cs=10969">10969</a></dd> \
<dt>Author</dt> <dd>matthew</dd> <dt>Date</dt> <dd>2014-08-21 10:17:57 +0100 (Thu, 21 \
Aug 2014)</dd> </dl>
<h3>Log Message</h3>
<pre>Preparatory work for <a \
href="https://bugster.forgerock.org/jira/browse/OPENDJ-1477">OPENDJ-1477</a>: \
Constant re-allocation of DN per-schema caches
* rename SchemaTestCase to AbstractSchemaTestCase
* add SchemaTestCase with disabled unit tests for <a \
href="https://bugster.forgerock.org/jira/browse/OPENDJ-1477">OPENDJ-1477</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaAbstractSche \
maElementTestCasejava">trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaElementTestCase.java</a></li>
<li><a href="#trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaAbstractSub \
stringMatchingRuleImplTestjava">trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImplTest.java</a></li>
<li><a href="#trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaAbstractSyn \
taxTestCasejava">trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxTestCase.java</a></li>
<li><a href="#trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaApproximate \
MatchingRuleTestjava">trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ApproximateMatchingRuleTest.java</a></li>
<li><a href="#trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaCertificate \
ExactMatchingRuleImplTestjava">trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CertificateExactMatchingRuleImplTest.java</a></li>
<li><a href="#trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaCertificate \
SyntaxTestjava">trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxTest.java</a></li>
<li><a href="#trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaCoreSchemaT \
estjava">trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CoreSchemaTest.java</a></li>
<li><a href="#trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaEntrySchema \
CheckingTestCasejava">trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EntrySchemaCheckingTestCase.java</a></li>
<li><a href="#trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaMatchingRul \
eTestjava">trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTest.java</a></li>
<li><a href="#trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaMatchingRul \
eTestCasejava">trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTestCase.java</a></li>
<li><a href="#trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaNameFormTes \
tCasejava">trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java</a></li>
<li><a href="#trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaOrderingMat \
chingRuleTestjava">trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OrderingMatchingRuleTest.java</a></li>
<li><a href="#trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaSchemaBuild \
erTestCasejava">trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java</a></li>
<li><a href="#trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaSchemaCompa \
tTestjava">trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaCompatTest.java</a></li>
<li><a href="#trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaSchemaTestC \
asejava">trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java</a></li>
<li><a href="#trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaSchemaUtils \
Testjava">trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaUtilsTest.java</a></li>
<li><a href="#trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaSubstringMa \
tchingRuleTestjava">trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstringMatchingRuleTest.java</a></li>
<li><a href="#trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaSyntaxTestC \
asejava">trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaAbstractSche \
maTestCasejava">trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaTestCase.java</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaAbstractSchemaElementTestCasejava"></a>
<div class="modfile"><h4>Modified: \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaElementTestCase.java \
(10968 => 10969)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaElementTestCase.java 2014-08-21 \
08:58:34 UTC (rev 10968)
+++ trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaElementTestCase.java 2014-08-21 \
09:17:57 UTC (rev 10969) </span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> * Abstract schema element tests.
</span><span class="cx"> */
</span><span class="cx"> @SuppressWarnings("javadoc")
</span><del>-public abstract class AbstractSchemaElementTestCase extends \
SchemaTestCase { </del><ins>+public abstract class AbstractSchemaElementTestCase \
extends AbstractSchemaTestCase { </ins><span class="cx"> protected static final \
Map<String, List<String>> EMPTY_PROPS = Collections.emptyMap(); \
</span><span class="cx"> protected static final List<String> EMPTY_NAMES = \
Collections.emptyList(); </span><span class="cx">
</span></span></pre></div>
<a id="trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaAbstractSchemaTestC \
asejavafromrev10967trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaSchemaTestCasejava"></a>
<div class="copfile"><h4>Copied: \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaTestCase.java \
(from rev 10967, trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java) \
(0 => 10969)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaTestCase.java \
(rev 0)
+++ trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaTestCase.java 2014-08-21 \
09:17:57 UTC (rev 10969) </span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License"). You may not use this file except in compliance
+ * with the License.
+ *
+ * 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 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
+ *
+ *
+ * Copyright 2009 Sun Microsystems, Inc.
+ * Portions copyright 2012 ForgeRock AS.
+ */
+package org.forgerock.opendj.ldap.schema;
+
+import org.forgerock.testng.ForgeRockTestCase;
+import org.testng.annotations.Test;
+
+/**
+ * An abstract class that all schema unit test should extend.
+ */
+@Test(groups = { "precommit", "schema", "sdk" })
+public abstract class AbstractSchemaTestCase extends ForgeRockTestCase {
+}
</ins></span></pre></div>
<a id="trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaAbstractSubstringMatchingRuleImplTestjava"></a>
<div class="modfile"><h4>Modified: \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImplTest.java \
(10968 => 10969)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImplTest.java 2014-08-21 \
08:58:34 UTC (rev 10968)
+++ trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImplTest.java 2014-08-21 \
09:17:57 UTC (rev 10969) </span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> * Tests all generic code of \
AbstractSubstringMatchingRuleImpl. </span><span class="cx"> */
</span><span class="cx"> @SuppressWarnings("javadoc")
</span><del>-public class AbstractSubstringMatchingRuleImplTest extends \
SchemaTestCase { </del><ins>+public class AbstractSubstringMatchingRuleImplTest \
extends AbstractSchemaTestCase { </ins><span class="cx">
</span><span class="cx"> private static class FakeSubstringMatchingRuleImpl \
extends AbstractSubstringMatchingRuleImpl { </span><span class="cx">
</span></span></pre></div>
<a id="trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaAbstractSyntaxTestCasejava"></a>
<div class="modfile"><h4>Modified: \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxTestCase.java \
(10968 => 10969)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxTestCase.java 2014-08-21 \
08:58:34 UTC (rev 10968)
+++ trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxTestCase.java 2014-08-21 \
09:17:57 UTC (rev 10969) </span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> * Syntax tests.
</span><span class="cx"> */
</span><span class="cx"> @SuppressWarnings("javadoc")
</span><del>-public abstract class AbstractSyntaxTestCase extends SchemaTestCase {
</del><ins>+public abstract class AbstractSyntaxTestCase extends \
AbstractSchemaTestCase { </ins><span class="cx"> /**
</span><span class="cx"> * Create data for the testAcceptableValues test. This \
should be a table of </span><span class="cx"> * tables with 2 elements. The \
first one should be the value to test, the </span></span></pre></div>
<a id="trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaApproximateMatchingRuleTestjava"></a>
<div class="modfile"><h4>Modified: \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ApproximateMatchingRuleTest.java \
(10968 => 10969)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ApproximateMatchingRuleTest.java 2014-08-21 \
08:58:34 UTC (rev 10968)
+++ trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ApproximateMatchingRuleTest.java 2014-08-21 \
09:17:57 UTC (rev 10969) </span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> * Approximate matching rule tests.
</span><span class="cx"> */
</span><span class="cx"> @SuppressWarnings("javadoc")
</span><del>-public class ApproximateMatchingRuleTest extends SchemaTestCase {
</del><ins>+public class ApproximateMatchingRuleTest extends AbstractSchemaTestCase {
</ins><span class="cx"> MatchingRule metaphone = \
Schema.getCoreSchema().getMatchingRule(AMR_DOUBLE_METAPHONE_NAME); </span><span \
class="cx"> </span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaCertificateExactMatchingRuleImplTestjava"></a>
<div class="modfile"><h4>Modified: \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CertificateExactMatchingRuleImplTest.java \
(10968 => 10969)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CertificateExactMatchingRuleImplTest.java 2014-08-21 \
08:58:34 UTC (rev 10968)
+++ trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CertificateExactMatchingRuleImplTest.java 2014-08-21 \
09:17:57 UTC (rev 10969) </span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> * This class tests the certificateExactMatch matching rule.
</span><span class="cx"> */
</span><span class="cx"> @SuppressWarnings("javadoc")
</span><del>-public class CertificateExactMatchingRuleImplTest extends SchemaTestCase \
{ </del><ins>+public class CertificateExactMatchingRuleImplTest extends \
AbstractSchemaTestCase { </ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Generate data for the certificateExactMatch matching \
rule test. </span></span></pre></div>
<a id="trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaCertificateSyntaxTestjava"></a>
<div class="modfile"><h4>Modified: \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxTest.java \
(10968 => 10969)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxTest.java 2014-08-21 \
08:58:34 UTC (rev 10968)
+++ trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxTest.java 2014-08-21 \
09:17:57 UTC (rev 10969) </span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Certificate syntax tests.
</span><span class="cx"> */
</span><del>-public class CertificateSyntaxTest extends SchemaTestCase {
</del><ins>+public class CertificateSyntaxTest extends AbstractSchemaTestCase {
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Create data for the testAcceptableValues test. This \
should be a table of </span></span></pre></div>
<a id="trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaCoreSchemaTestjava"></a>
<div class="modfile"><h4>Modified: \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CoreSchemaTest.java \
(10968 => 10969)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CoreSchemaTest.java 2014-08-21 \
08:58:34 UTC (rev 10968)
+++ trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CoreSchemaTest.java 2014-08-21 \
09:17:57 UTC (rev 10969) </span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> * Core schema tests
</span><span class="cx"> */
</span><span class="cx"> @SuppressWarnings("javadoc")
</span><del>-public class CoreSchemaTest extends SchemaTestCase {
</del><ins>+public class CoreSchemaTest extends AbstractSchemaTestCase {
</ins><span class="cx"> @Test
</span><span class="cx"> public final void testCoreSchemaWarnings() {
</span><span class="cx"> // Make sure core schema doesn't have any warnings.
</span></span></pre></div>
<a id="trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaEntrySchemaCheckingTestCasejava"></a>
<div class="modfile"><h4>Modified: \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EntrySchemaCheckingTestCase.java \
(10968 => 10969)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EntrySchemaCheckingTestCase.java 2014-08-21 \
08:58:34 UTC (rev 10968)
+++ trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EntrySchemaCheckingTestCase.java 2014-08-21 \
09:17:57 UTC (rev 10969) </span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> * Test schema validation using {@link \
Schema#validateEntry}. </span><span class="cx"> */
</span><span class="cx"> @Test
</span><del>-public class EntrySchemaCheckingTestCase extends SchemaTestCase {
</del><ins>+public class EntrySchemaCheckingTestCase extends AbstractSchemaTestCase {
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Tests schema checking for an entry covered by a DIT \
content rule to </span></span></pre></div>
<a id="trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaMatchingRuleTestjava"></a>
<div class="modfile"><h4>Modified: \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTest.java \
(10968 => 10969)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTest.java 2014-08-21 \
08:58:34 UTC (rev 10968)
+++ trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTest.java 2014-08-21 \
09:17:57 UTC (rev 10969) </span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> * Test The equality matching rules and the equality \
matching rule api. </span><span class="cx"> */
</span><span class="cx"> @SuppressWarnings("javadoc")
</span><del>-public abstract class MatchingRuleTest extends SchemaTestCase {
</del><ins>+public abstract class MatchingRuleTest extends AbstractSchemaTestCase {
</ins><span class="cx"> /**
</span><span class="cx"> * Generate invalid assertion values for the Matching \
Rule test. </span><span class="cx"> *
</span></span></pre></div>
<a id="trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaMatchingRuleTestCasejava"></a>
<div class="modfile"><h4>Modified: \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTestCase.java \
(10968 => 10969)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTestCase.java 2014-08-21 \
08:58:34 UTC (rev 10968)
+++ trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTestCase.java 2014-08-21 \
09:17:57 UTC (rev 10969) </span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> * This class tests the MatchingRule class. The matching \
rule builder can be only used with the schema builder. </span><span class="cx"> */
</span><span class="cx"> @SuppressWarnings("javadoc")
</span><del>-public class MatchingRuleTestCase extends SchemaTestCase {
</del><ins>+public class MatchingRuleTestCase extends AbstractSchemaTestCase {
</ins><span class="cx">
</span><span class="cx"> @Test()
</span><span class="cx"> public final void testCreatesBasicMatchingRule() {
</span></span></pre></div>
<a id="trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaNameFormTestCasejava"></a>
<div class="modfile"><h4>Modified: \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java \
(10968 => 10969)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java 2014-08-21 \
08:58:34 UTC (rev 10968)
+++ trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java 2014-08-21 \
09:17:57 UTC (rev 10969) </span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> * with the schema builder.
</span><span class="cx"> */
</span><span class="cx"> @SuppressWarnings("javadoc")
</span><del>-public class NameFormTestCase extends SchemaTestCase {
</del><ins>+public class NameFormTestCase extends AbstractSchemaTestCase {
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Creates a new form using the required parameters only \
(oid, structural </span></span></pre></div>
<a id="trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaOrderingMatchingRuleTestjava"></a>
<div class="modfile"><h4>Modified: \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OrderingMatchingRuleTest.java \
(10968 => 10969)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OrderingMatchingRuleTest.java 2014-08-21 \
08:58:34 UTC (rev 10968)
+++ trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OrderingMatchingRuleTest.java 2014-08-21 \
09:17:57 UTC (rev 10969) </span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> * Ordering matching rule tests.
</span><span class="cx"> */
</span><span class="cx"> @SuppressWarnings("javadoc")
</span><del>-public abstract class OrderingMatchingRuleTest extends SchemaTestCase {
</del><ins>+public abstract class OrderingMatchingRuleTest extends \
AbstractSchemaTestCase { </ins><span class="cx"> /**
</span><span class="cx"> * Create data for the \
OrderingMatchingRulesInvalidValues test. </span><span class="cx"> *
</span></span></pre></div>
<a id="trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaSchemaBuilderTestCasejava"></a>
<div class="modfile"><h4>Modified: \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java \
(10968 => 10969)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java 2014-08-21 \
08:58:34 UTC (rev 10968)
+++ trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java 2014-08-21 \
09:17:57 UTC (rev 10969) </span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> * Test SchemaBuilder.
</span><span class="cx"> */
</span><span class="cx"> @SuppressWarnings("javadoc")
</span><del>-public class SchemaBuilderTestCase extends SchemaTestCase {
</del><ins>+public class SchemaBuilderTestCase extends AbstractSchemaTestCase {
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Tests that schema validation resolves dependencies \
between parent/child </span></span></pre></div>
<a id="trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaSchemaCompatTestjava"></a>
<div class="modfile"><h4>Modified: \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaCompatTest.java \
(10968 => 10969)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaCompatTest.java 2014-08-21 \
08:58:34 UTC (rev 10968)
+++ trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaCompatTest.java 2014-08-21 \
09:17:57 UTC (rev 10969) </span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Tests schema compatibility options.
</span><span class="cx"> */
</span><del>-public class SchemaCompatTest extends SchemaTestCase {
</del><ins>+public class SchemaCompatTest extends AbstractSchemaTestCase {
</ins><span class="cx"> /**
</span><span class="cx"> * Returns test data for valid attribute descriptions.
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaSchemaTestCasejava"></a>
<div class="modfile"><h4>Modified: \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java \
(10968 => 10969)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java 2014-08-21 \
08:58:34 UTC (rev 10968)
+++ trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java 2014-08-21 \
09:17:57 UTC (rev 10969) </span><span class="lines">@@ -21,17 +21,33 @@
</span><span class="cx"> * CDDL HEADER END
</span><span class="cx"> *
</span><span class="cx"> *
</span><del>- * Copyright 2009 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
</del><ins>+ * Copyright 2014 ForgeRock AS.
</ins><span class="cx"> */
</span><span class="cx"> package org.forgerock.opendj.ldap.schema;
</span><span class="cx">
</span><del>-import org.forgerock.testng.ForgeRockTestCase;
</del><ins>+import static org.fest.assertions.Assertions.assertThat;
+
</ins><span class="cx"> import org.testng.annotations.Test;
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * An abstract class that all schema unit test should extend.
</del><ins>+ * Tests the Schema class.
</ins><span class="cx"> */
</span><del>-@Test(groups = { "precommit", "schema", \
"sdk" })
-public abstract class SchemaTestCase extends ForgeRockTestCase {
</del><ins>+@SuppressWarnings("javadoc")
+public class SchemaTestCase extends AbstractSchemaTestCase {
+ @Test(description = "Unit test for OPENDJ-1477", enabled = false)
+ public void asNonStrictSchemaAlwaysReturnsSameInstance() {
+ final Schema schema = Schema.getCoreSchema();
+ final Schema nonStrictSchema1 = schema.asNonStrictSchema();
+ final Schema nonStrictSchema2 =
+ schema.asNonStrictSchema().asStrictSchema().asNonStrictSchema();
+ assertThat(nonStrictSchema1).isSameAs(nonStrictSchema2);
+ }
+
+ @Test(description = "Unit test for OPENDJ-1477", enabled = false)
+ public void asStrictSchemaAlwaysReturnsSameInstance() {
+ final Schema schema = Schema.getCoreSchema();
+ final Schema strictSchema1 = schema.asStrictSchema();
+ final Schema strictSchema2 = \
schema.asStrictSchema().asNonStrictSchema().asStrictSchema(); + \
assertThat(strictSchema1).isSameAs(strictSchema2); + }
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaSchemaUtilsTestjava"></a>
<div class="modfile"><h4>Modified: \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaUtilsTest.java \
(10968 => 10969)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaUtilsTest.java 2014-08-21 \
08:58:34 UTC (rev 10968)
+++ trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaUtilsTest.java 2014-08-21 \
09:17:57 UTC (rev 10969) </span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> * Test schema utilities.
</span><span class="cx"> */
</span><span class="cx"> @SuppressWarnings("javadoc")
</span><del>-public class SchemaUtilsTest extends SchemaTestCase {
</del><ins>+public class SchemaUtilsTest extends AbstractSchemaTestCase {
</ins><span class="cx">
</span><span class="cx"> @DataProvider(name = "invalidOIDs")
</span><span class="cx"> public Object[][] createInvalidOIDs() {
</span></span></pre></div>
<a id="trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaSubstringMatchingRuleTestjava"></a>
<div class="modfile"><h4>Modified: \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstringMatchingRuleTest.java \
(10968 => 10969)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstringMatchingRuleTest.java 2014-08-21 \
08:58:34 UTC (rev 10968)
+++ trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstringMatchingRuleTest.java 2014-08-21 \
09:17:57 UTC (rev 10969) </span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> * is intended to be extended by one class for each \
substring matching rules. </span><span class="cx"> */
</span><span class="cx"> @SuppressWarnings("javadoc")
</span><del>-public abstract class SubstringMatchingRuleTest extends SchemaTestCase {
</del><ins>+public abstract class SubstringMatchingRuleTest extends \
AbstractSchemaTestCase { </ins><span class="cx"> /**
</span><span class="cx"> * Generate invalid assertion values for the Matching \
Rule test. </span><span class="cx"> *
</span></span></pre></div>
<a id="trunkopendjopendjcoresrctestjavaorgforgerockopendjldapschemaSyntaxTestCasejava"></a>
<div class="modfile"><h4>Modified: \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java \
(10968 => 10969)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java 2014-08-21 \
08:58:34 UTC (rev 10968)
+++ trunk/opendj/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java 2014-08-21 \
09:17:57 UTC (rev 10969) </span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> * This class tests the Syntax class.
</span><span class="cx"> */
</span><span class="cx"> @SuppressWarnings("javadoc")
</span><del>-public class SyntaxTestCase extends SchemaTestCase {
</del><ins>+public class SyntaxTestCase extends AbstractSchemaTestCase {
</ins><span class="cx">
</span><span class="cx"> @Test()
</span><span class="cx"> public final void testCreatesANewSyntax() {
</span></span></pre>
</div>
</div>
<div id="footer">Copyright (c) by ForgeRock. All rights reserved.</div>
</body>
</html>
_______________________________________________
OpenDJ-dev mailing list
OpenDJ-dev@forgerock.org
https://lists.forgerock.org/mailman/listinfo/opendj-dev
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic