From 6771bc57f190a8275922290077de1f6d6b374a6f Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 21 Oct 2014 14:39:14 +0000
Subject: [PATCH] Autorefactored removing default values for field initializers
---
opendj-config/src/test/java/org/forgerock/opendj/config/ClassPropertyDefinitionTest.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/ClassPropertyDefinitionTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/ClassPropertyDefinitionTest.java
index f02d773..00a3a78 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/ClassPropertyDefinitionTest.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/ClassPropertyDefinitionTest.java
@@ -27,9 +27,6 @@
package org.forgerock.opendj.config;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-
import java.util.Comparator;
import java.util.List;
@@ -37,6 +34,9 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
+import static org.forgerock.opendj.config.ClassPropertyDefinition.*;
+import static org.testng.Assert.*;
+
@SuppressWarnings("javadoc")
public class ClassPropertyDefinitionTest extends ConfigTestCase {
@@ -48,6 +48,7 @@
public Comparator<Dummy> comparator() {
return new Comparator<ClassPropertyDefinitionTest.Dummy>() {
+ @Override
public int compare(Dummy o1, Dummy o2) {
// No implementation required.
return 0;
@@ -56,8 +57,6 @@
}
}
- ClassPropertyDefinition.Builder builder = null;
-
@DataProvider(name = "validClassNames")
public Object[][] createBuilderAddInstanceOfData() {
return new Object[][] {
@@ -69,8 +68,7 @@
@Test(dataProvider = "validClassNames")
public void testBuilderAddInstanceOf(String classNameToAdd) {
- ClassPropertyDefinition.Builder localBuilder = ClassPropertyDefinition.createBuilder(RootCfgDefn.getInstance(),
- "test-property");
+ ClassPropertyDefinition.Builder localBuilder = createBuilder(RootCfgDefn.getInstance(), "test-property");
localBuilder.addInstanceOf(classNameToAdd);
ClassPropertyDefinition propertyDef = localBuilder.getInstance();
List<String> instances = propertyDef.getInstanceOfInterface();
@@ -92,8 +90,7 @@
@Test(dataProvider = "invalidClassNames", expectedExceptions = { IllegalArgumentException.class })
public void testBuilderAddInstanceInvalid(String className) {
- ClassPropertyDefinition.Builder localBuilder = ClassPropertyDefinition.createBuilder(RootCfgDefn.getInstance(),
- "test-property");
+ ClassPropertyDefinition.Builder localBuilder = createBuilder(RootCfgDefn.getInstance(), "test-property");
localBuilder.addInstanceOf(className);
ClassPropertyDefinition propertyDef = localBuilder.getInstance();
List<String> instances = propertyDef.getInstanceOfInterface();
@@ -115,8 +112,7 @@
@Test(dataProvider = "loadClasses")
public <T> void testLoadClass(String interfaceName, String loadClassName, Class<T> instanceOfClass,
Class<?> expectedClass) {
- ClassPropertyDefinition.Builder localBuilder = ClassPropertyDefinition.createBuilder(RootCfgDefn.getInstance(),
- "test-property");
+ ClassPropertyDefinition.Builder localBuilder = createBuilder(RootCfgDefn.getInstance(), "test-property");
localBuilder.addInstanceOf(interfaceName);
ClassPropertyDefinition propertyDef = localBuilder.getInstance();
Class<?> clazz = propertyDef.loadClass(loadClassName, instanceOfClass);
@@ -134,8 +130,7 @@
@Test(dataProvider = "loadClassesIllegal", expectedExceptions = { PropertyException.class })
public <T> void testLoadClassIllegal(String interfaceName, String loadClassName, Class<T> instanceOfClass,
Class<?> expectedClass) {
- ClassPropertyDefinition.Builder localBuilder = ClassPropertyDefinition.createBuilder(RootCfgDefn.getInstance(),
- "test-property");
+ ClassPropertyDefinition.Builder localBuilder = createBuilder(RootCfgDefn.getInstance(), "test-property");
localBuilder.addInstanceOf(interfaceName);
ClassPropertyDefinition propertyDef = localBuilder.getInstance();
Class<?> clazz = propertyDef.loadClass(loadClassName, instanceOfClass);
--
Gitblit v1.10.0