From f8985e3aba482d1c59ef66cc8b646ee96613a6c0 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 12 Jun 2012 08:08:24 +0000
Subject: [PATCH] Fix JDK7 unit test failure: unit tests should not reference private interfaces which may change between releases.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ClassPropertyDefinitionTest.java | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ClassPropertyDefinitionTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ClassPropertyDefinitionTest.java
index 0dcf893..a55d452 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ClassPropertyDefinitionTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ClassPropertyDefinitionTest.java
@@ -23,12 +23,14 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions copyright 2012 ForgeRock AS.
*/
package org.opends.server.admin;
import static org.testng.Assert.*;
+import java.util.Comparator;
import java.util.List;
import org.opends.server.admin.std.meta.RootCfgDefn;
@@ -42,6 +44,23 @@
*/
public class ClassPropertyDefinitionTest extends DirectoryServerTestCase {
+ // Dummy class for testing.
+ public static final class Dummy
+ {
+ public class X {}
+ public Comparator<Dummy> comparator()
+ {
+ return new Comparator<ClassPropertyDefinitionTest.Dummy>()
+ {
+ public int compare(Dummy o1, Dummy o2)
+ {
+ // No implementation required.
+ return 0;
+ }
+ };
+ }
+ }
+
ClassPropertyDefinition.Builder builder = null;
/**
@@ -58,16 +77,10 @@
@DataProvider(name = "testBuilderAddInstanceOf")
public Object[][] createBuilderAddInstanceOfData() {
return new Object[][]{
- { "java.awt.Container" },
- { "java.awt.Container$1" },
- { "java.awt.Container$2$1" },
- { "java.awt.Container$2" },
- { "java.awt.Container$AccessibleAWTContainer$AccessibleContainerHandler" },
- { "java.awt.Container$DropTargetEventTargetFilter" },
- { "java.awt.Container$EventTargetFilter" },
- { "java.awt.Container$MouseEventTargetFilter" },
- { "java.awt.Container$WakingRunnable" },
- { "java.awt.Container$AccessibleAWTContainer" }
+ { "org.opends.server.admin.ClassPropertyDefinitionTest" },
+ { "org.opends.server.admin.ClassPropertyDefinitionTest$Dummy" },
+ { "org.opends.server.admin.ClassPropertyDefinitionTest$Dummy$X" },
+ { "org.opends.server.admin.ClassPropertyDefinitionTest$Dummy$1" },
};
}
--
Gitblit v1.10.0