From 40beb4a8ff9268c45ea850cbfae444bdd3090a5a Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Fri, 24 Jun 2011 16:34:11 +0000
Subject: [PATCH] Resolve issue OPENDJ-28 - All virtual attribute unit tests are read-only (except isMemberOf). But each test was clearing the 2 backends used for test. Moved that to the pre-test, so it's only done once per test, reducing the time to run the tests to 5 s per test on my machine.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java | 37 -----------
opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java | 35 -----------
opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java | 35 -----------
opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java | 35 -----------
4 files changed, 8 insertions(+), 134 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
index b6fbc77..b1e2d4e 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
@@ -75,6 +75,8 @@
throws Exception
{
TestCaseUtils.startServer();
+ TestCaseUtils.initializeTestBackend(true);
+ TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
entryDNType = DirectoryServer.getAttributeType("entrydn", false);
assertNotNull(entryDNType);
@@ -123,9 +125,6 @@
public void testGetEntry(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
Entry e = DirectoryServer.getEntry(entryDN);
assertNotNull(e);
assertTrue(e.hasAttribute(entryDNType));
@@ -157,9 +156,6 @@
public void testSearchEmptyAttrs(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
@@ -189,9 +185,6 @@
public void testSearchNoAttrs(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -225,9 +218,6 @@
public void testSearchAllUserAttrs(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -261,9 +251,6 @@
public void testSearchAllOperationalAttrs(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -297,9 +284,6 @@
public void testSearchEntryDNAttr(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -333,9 +317,6 @@
public void testSearchExcludeEntryDNAttr(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -370,9 +351,6 @@
public void testSearchEntryDNAttrInMatchingFilter(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(entryDN=" + entryDN.toString() +
")");
@@ -407,9 +385,6 @@
public void testSearchEntryDNAttrInNonMatchingFilter(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(entryDN=cn=Not A Match)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -440,9 +415,6 @@
public void testSearchEntryDNAttrRealAttrsOnly(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -483,9 +455,6 @@
public void testSearchEntryDNAttrVirtualAttrsOnly(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -1084,8 +1053,6 @@
return;
}
- TestCaseUtils.initializeTestBackend(true);
-
EntryDNVirtualAttributeProvider provider =
new EntryDNVirtualAttributeProvider();
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java
index 75cd40e..65c4bb2 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java
@@ -84,6 +84,8 @@
throws Exception
{
TestCaseUtils.startServer();
+ TestCaseUtils.initializeTestBackend(true);
+ TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
governingStructureRuleType =
DirectoryServer.getAttributeType("governingstructurerule", false);
@@ -185,9 +187,6 @@
public void testGetEntry(DN entryDN,String ruleId)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
Entry e = DirectoryServer.getEntry(entryDN);
assertNotNull(e);
assertTrue(e.hasAttribute(governingStructureRuleType));
@@ -219,9 +218,6 @@
public void testSearchEmptyAttrs(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
@@ -251,9 +247,6 @@
public void testSearchNoAttrs(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -287,9 +280,6 @@
public void testSearchAllUserAttrs(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -323,9 +313,6 @@
public void testSearchAllOperationalAttrs(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -359,9 +346,6 @@
public void testSearchGoverningStructureRulesAttr(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -395,9 +379,6 @@
public void testSearchExcludeGovStructRuleAttr(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -432,9 +413,6 @@
public void testSearchGovStructRuleInMatchingFilter(DN entryDN,String oc)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("governingstructurerule="+oc);
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -468,9 +446,6 @@
public void testSearchGovStructRuleAttrInNonMatchingFilter(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(governingStructureRule=1)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -501,9 +476,6 @@
public void testSearchGovStructRuleAttrRealAttrsOnly(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -545,9 +517,6 @@
public void testSearchGovStructRuleAttrVirtualAttrsOnly(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java
index 3944f6f..0539475 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java
@@ -83,6 +83,8 @@
throws Exception
{
TestCaseUtils.startServer();
+ TestCaseUtils.initializeTestBackend(true);
+ TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
structuralObjectClassType =
DirectoryServer.getAttributeType("structuralobjectclass", false);
@@ -153,9 +155,6 @@
public void testGetEntry(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
Entry e = DirectoryServer.getEntry(entryDN);
assertNotNull(e);
assertTrue(e.hasAttribute(structuralObjectClassType));
@@ -187,9 +186,6 @@
public void testSearchEmptyAttrs(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
@@ -219,9 +215,6 @@
public void testSearchNoAttrs(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -255,9 +248,6 @@
public void testSearchAllUserAttrs(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -291,9 +281,6 @@
public void testSearchAllOperationalAttrs(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -327,9 +314,6 @@
public void testSearchStructuralOCAttr(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -363,9 +347,6 @@
public void testSearchExcludeStructuralOCAttr(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -400,9 +381,6 @@
public void testSearchStructuralOCAttrInMatchingFilter(DN entryDN,String oc)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString(oc);
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -436,9 +414,6 @@
public void testSearchStructuralOCAttrInNonMatchingFilter(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(structuralObjectClass=abc)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -469,9 +444,6 @@
public void testSearchStructuralOCAttrRealAttrsOnly(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -513,9 +485,6 @@
public void testSearchStructuralOCAttrVirtualAttrsOnly(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
index 055c33d..69ceeea 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
@@ -82,6 +82,8 @@
throws Exception
{
TestCaseUtils.startServer();
+ TestCaseUtils.initializeTestBackend(true);
+ TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
subschemaSubentryType =
DirectoryServer.getAttributeType("subschemasubentry", false);
@@ -131,9 +133,6 @@
public void testGetEntry(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
Entry e = DirectoryServer.getEntry(entryDN);
assertNotNull(e);
assertTrue(e.hasAttribute(subschemaSubentryType));
@@ -165,9 +164,6 @@
public void testSearchEmptyAttrs(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
@@ -197,9 +193,6 @@
public void testSearchNoAttrs(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -233,9 +226,6 @@
public void testSearchAllUserAttrs(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -269,9 +259,6 @@
public void testSearchAllOperationalAttrs(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -305,9 +292,6 @@
public void testSearchSubschemaSubentryAttr(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -341,9 +325,6 @@
public void testSearchExcludeSubschemaSubentryAttr(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -378,9 +359,6 @@
public void testSearchSubschemaSubentryAttrInMatchingFilter(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(subschemaSubentry=cn=schema)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -414,9 +392,6 @@
public void testSearchSubschemaSubentryAttrInNonMatchingFilter(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(subschemaSubentry=cn=foo)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -447,9 +422,6 @@
public void testSearchSubschemaSubentryAttrRealAttrsOnly(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
@@ -491,9 +463,6 @@
public void testSearchSubschemaSubentryAttrVirtualAttrsOnly(DN entryDN)
throws Exception
{
- TestCaseUtils.initializeTestBackend(true);
- TestCaseUtils.clearJEBackend(true, "userRoot", "dc=example,dc=com");
-
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
LinkedHashSet<String> attrList = new LinkedHashSet<String>(1);
--
Gitblit v1.10.0