From 12b0ce03d0029bb96bb23cc288ea351a8a1bec75 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 07 Dec 2007 17:36:12 +0000
Subject: [PATCH] This relates to issue 2661 "public APIs must not reference private classes".
---
opends/tests/unit-tests-testng/src/server/org/opends/messages/MessageDescriptorRegistryTest.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/messages/MessageDescriptorRegistryTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/messages/MessageDescriptorRegistryTest.java
index aebf0ad..bb04715 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/messages/MessageDescriptorRegistryTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/messages/MessageDescriptorRegistryTest.java
@@ -31,8 +31,6 @@
import org.testng.annotations.*;
import java.util.Set;
-import java.util.Arrays;
-import java.util.HashSet;
import java.util.List;
import java.util.ArrayList;
import java.util.Locale;
@@ -63,8 +61,8 @@
@DataProvider(name = "message classes")
public Object[][] getMessageClasses() {
- Set<Class> mdClasses = MessageDescriptorRegistry.getRegisteredClasses();
- List<Class> classesToTest = new ArrayList<Class>(mdClasses);
+ Set<Class<?>> mdClasses = MessageDescriptorRegistry.getRegisteredClasses();
+ List<Class<?>> classesToTest = new ArrayList<Class<?>>(mdClasses);
// These newer message files don't comply
classesToTest.remove(AdminToolMessages.class);
@@ -86,7 +84,7 @@
* class through reflection
*/
@Test(dataProvider = "message classes")
- public void testFormatStringsDontEndWithPeriod(Class messagesClass)
+ public void testFormatStringsDontEndWithPeriod(Class<?> messagesClass)
throws IllegalAccessException
{
Field[] fa = messagesClass.getFields();
@@ -115,10 +113,10 @@
*/
@Test
public void testCategoriesDontSpanFiles() {
- Map<Category,Class> categoriesToClass = new HashMap<Category,Class>();
- Set categories = EnumSet.allOf(Category.class);
- Set<Class> msgClasses = MessageDescriptorRegistry.getRegisteredClasses();
- for (Class msgClass : msgClasses) {
+ Map<Category,Class<?>> categoriesToClass = new HashMap<Category,Class<?>>();
+ Set<?> categories = EnumSet.allOf(Category.class);
+ Set<Class<?>> msgClasses = MessageDescriptorRegistry.getRegisteredClasses();
+ for (Class<?> msgClass : msgClasses) {
List<MessageDescriptor> mds =
MessageDescriptorRegistry.getMessageDescriptorsForClass(msgClass);
Category currentCategory = null;
--
Gitblit v1.10.0