From 81a11b281d6e17c5b93dd6a3aec996cc00ef03bc Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 17 Nov 2011 17:40:15 +0000
Subject: [PATCH] Fix OPENDJ-361: AttributeBuilderTest unit test fails on OpenJDK
---
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AttributeBuilderTest.java | 25 +++++++++----------------
1 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AttributeBuilderTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AttributeBuilderTest.java
index e53f664..817ce48 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AttributeBuilderTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AttributeBuilderTest.java
@@ -23,19 +23,13 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions copyright 2011 ForgeRock AS.
*/
package org.opends.server.types;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.Set;
+import java.util.*;
import org.opends.server.TestCaseUtils;
import org.opends.server.core.DirectoryServer;
@@ -2022,26 +2016,25 @@
throws Exception
{
// Determine the value set implementation class.
- String iteratorName = a.iterator().getClass().getName();
- int i = iteratorName.lastIndexOf('$');
- String className = iteratorName.substring(0, i);
-
+ Class<?> actualClass = a.iterator().getClass();
+ Class<?> expectedClass = null;
switch (values.length)
{
case 0:
// Attribute must be optimized for zero values.
- Assert.assertEquals(className, "java.util.Collections$EmptySet");
+ expectedClass = Collections.emptySet().iterator().getClass();
break;
case 1:
// Attribute must be optimized for single value.
- Assert.assertEquals(className, "java.util.Collections$SingletonSet");
+ expectedClass = Collections.singleton(0).iterator().getClass();
break;
default:
// Attribute must be optimized for many values.
- Assert.assertEquals(className,
- "java.util.Collections$UnmodifiableCollection");
+ expectedClass = Collections.unmodifiableCollection(new HashSet<Object>())
+ .iterator().getClass();
break;
}
+ Assert.assertEquals(actualClass, expectedClass);
}
--
Gitblit v1.10.0