From 8e174a3b5ad5ba4f3267bffceb0d952eea891b5f Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 24 Mar 2015 11:09:45 +0000
Subject: [PATCH] *Test*.java: Replaced the assert keyword with calling TestNG Assert.assertTrue() instead.
---
opendj-server-legacy/src/test/java/org/opends/server/admin/client/spi/PropertySetTest.java | 63 ++++++------
opendj-server-legacy/src/test/java/org/opends/server/admin/IntegerPropertyDefinitionTest.java | 52 +++++----
opendj-server-legacy/src/test/java/org/opends/server/plugins/SambaPasswordPluginTestCase.java | 14 +-
opendj-server-legacy/src/test/java/org/opends/server/util/TestStaticUtils.java | 27 ++--
opendj-server-legacy/src/test/java/org/opends/quicksetup/util/FileManagerTest.java | 42 +++++---
opendj-server-legacy/src/test/java/org/opends/quicksetup/util/ServerControllerTest.java | 21 ++-
opendj-server-legacy/src/test/java/org/opends/server/admin/SizePropertyDefinitionTest.java | 56 ++++++-----
7 files changed, 149 insertions(+), 126 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/quicksetup/util/FileManagerTest.java b/opendj-server-legacy/src/test/java/org/opends/quicksetup/util/FileManagerTest.java
index c20b67d..bee3f2a 100644
--- a/opendj-server-legacy/src/test/java/org/opends/quicksetup/util/FileManagerTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/quicksetup/util/FileManagerTest.java
@@ -24,27 +24,30 @@
* Copyright 2006-2008 Sun Microsystems, Inc.
* Portions Copyright 2014-2015 ForgeRock AS
*/
-
package org.opends.quicksetup.util;
import static org.testng.Assert.*;
-import org.testng.annotations.*;
-import org.opends.quicksetup.QuickSetupTestCase;
-import org.opends.quicksetup.TestUtilities;
-import org.opends.quicksetup.Constants;
-import org.opends.quicksetup.ApplicationException;
-import org.opends.server.util.StaticUtils;
-import java.io.File;
-import java.io.IOException;
-import java.io.FileWriter;
-import java.io.FileReader;
import java.io.BufferedReader;
+import java.io.File;
import java.io.FileFilter;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
import java.io.RandomAccessFile;
import java.nio.channels.FileChannel;
import java.nio.channels.FileLock;
+import org.opends.quicksetup.ApplicationException;
+import org.opends.quicksetup.Constants;
+import org.opends.quicksetup.QuickSetupTestCase;
+import org.opends.quicksetup.TestUtilities;
+import org.opends.server.util.StaticUtils;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
/**
* FileManager Tester.
*/
@@ -141,11 +144,11 @@
try {
if (target.exists()) {
target.delete();
- assert(!target.exists());
+ assertTrue(!target.exists());
}
fileManager.rename(src, target);
- assert(!src.exists());
- assert(target.exists());
+ assertTrue(!src.exists());
+ assertTrue(target.exists());
} finally {
src.delete();
target.delete();
@@ -164,8 +167,8 @@
File target = File.createTempFile("target", null);
try {
StaticUtils.renameFile(src, target);
- assert(!src.exists());
- assert(target.exists());
+ assertTrue(!src.exists());
+ assertTrue(target.exists());
} finally {
src.delete();
target.delete();
@@ -231,6 +234,7 @@
// Create a filter that should reject the operation
FileFilter filter = new FileFilter() {
+ @Override
public boolean accept(File pathname) {
return false;
}
@@ -269,6 +273,7 @@
// Create a filter that should reject the operation
FileFilter filter = new FileFilter() {
+ @Override
public boolean accept(File pathname) {
return false;
}
@@ -314,6 +319,7 @@
// Test that a filter can stop a delete altogether
FileFilter rejectOpFilter = new FileFilter() {
+ @Override
public boolean accept(File pathname) {
return false;
}
@@ -328,6 +334,7 @@
// Test that using a filter to delete one file works
FileFilter killChildFileFilter = new FileFilter() {
+ @Override
public boolean accept(File f) {
return f.equals(f2b1);
}
@@ -422,6 +429,7 @@
public void testCopyRecursively1() throws Exception {
// Test that a filter can stop a delete altogether
FileFilter rejectOpFilter = new FileFilter() {
+ @Override
public boolean accept(File pathname) {
return false;
}
@@ -443,6 +451,7 @@
// Test that using a filter to delete one file works
FileFilter copyChildFileFilter = new FileFilter() {
+ @Override
public boolean accept(File f) {
return f.equals(f2b1);
}
@@ -485,6 +494,7 @@
// Test that using a filter to delete one file works
FileFilter copyChildFileFilter = new FileFilter() {
+ @Override
public boolean accept(File f) {
return f.equals(f2b1);
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/quicksetup/util/ServerControllerTest.java b/opendj-server-legacy/src/test/java/org/opends/quicksetup/util/ServerControllerTest.java
index f9cf0f3..67ce2ab 100644
--- a/opendj-server-legacy/src/test/java/org/opends/quicksetup/util/ServerControllerTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/quicksetup/util/ServerControllerTest.java
@@ -22,14 +22,19 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
-
-
package org.opends.quicksetup.util;
-import org.testng.annotations.*;
-import org.opends.quicksetup.*;
+import static junit.framework.Assert.*;
+
+import org.opends.quicksetup.ApplicationException;
+import org.opends.quicksetup.Installation;
+import org.opends.quicksetup.QuickSetupTestCase;
+import org.opends.quicksetup.Status;
import org.opends.quicksetup.TestUtilities;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
/**
* ServerController Tester.
@@ -56,9 +61,9 @@
if (!status.isServerRunning()) {
controller.startServer();
}
- assert (status.isServerRunning());
+ assertTrue(status.isServerRunning());
controller.stopServer();
- assert (!status.isServerRunning());
+ assertTrue(!status.isServerRunning());
}
/**
@@ -70,9 +75,9 @@
if (status.isServerRunning()) {
controller.stopServer();
}
- assert (!status.isServerRunning());
+ assertTrue(!status.isServerRunning());
controller.startServer();
- assert (status.isServerRunning());
+ assertTrue(status.isServerRunning());
}
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/IntegerPropertyDefinitionTest.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/IntegerPropertyDefinitionTest.java
index 435ec5a..b3fae5d 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/IntegerPropertyDefinitionTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/IntegerPropertyDefinitionTest.java
@@ -22,14 +22,15 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.admin;
import static org.testng.Assert.*;
-import org.opends.server.admin.std.meta.RootCfgDefn;
import org.opends.server.DirectoryServerTestCase;
+import org.opends.server.admin.std.meta.RootCfgDefn;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
@@ -39,7 +40,7 @@
public class IntegerPropertyDefinitionTest extends DirectoryServerTestCase {
/**
- * Tests creation of builder succeeds
+ * Tests creation of builder succeeds.
*/
@Test
public void testCreateBuilder() {
@@ -48,18 +49,18 @@
}
/**
- * Tests setting/getting of lower limit as long
+ * Tests setting/getting of lower limit as long.
*/
@Test
public void testLowerLimit1() {
IntegerPropertyDefinition.Builder builder = createTestBuilder();
builder.setLowerLimit(1);
IntegerPropertyDefinition spd = buildTestDefinition(builder);
- assert spd.getLowerLimit() == 1;
+ assertTrue(spd.getLowerLimit() == 1);
}
/**
- * Creates data for testing string-based limit values
+ * Creates data for testing string-based limit values.
* @return data
*/
@DataProvider(name = "limitData")
@@ -71,7 +72,7 @@
}
/**
- * Creates data for testing limit values
+ * Creates data for testing limit values.
* @return data
*/
@DataProvider(name = "illegalLimitData")
@@ -86,7 +87,7 @@
/**
- * Tests setting/getting of lower limit as String
+ * Tests setting/getting of lower limit as String.
* @param limit unit limit
* @param expectedValue to compare
*/
@@ -95,22 +96,22 @@
IntegerPropertyDefinition.Builder builder = createTestBuilder();
builder.setLowerLimit(limit);
IntegerPropertyDefinition spd = buildTestDefinition(builder);
- assert spd.getLowerLimit() == expectedValue;
+ assertTrue(spd.getLowerLimit() == expectedValue);
}
/**
- * Tests setting/getting of lower limit as long
+ * Tests setting/getting of lower limit as long.
*/
@Test
public void testUpperLimit1() {
IntegerPropertyDefinition.Builder builder = createTestBuilder();
builder.setLowerLimit(1);
IntegerPropertyDefinition spd = buildTestDefinition(builder);
- assert spd.getLowerLimit() == 1;
+ assertTrue(spd.getLowerLimit() == 1);
}
/**
- * Tests setting/getting of lower limit as String
+ * Tests setting/getting of lower limit as String.
* @param limit upper limit
* @param expectedValue to compare
*/
@@ -119,11 +120,11 @@
IntegerPropertyDefinition.Builder builder = createTestBuilder();
builder.setUpperLimit(limit);
IntegerPropertyDefinition spd = buildTestDefinition(builder);
- assert spd.getUpperLimit().equals(expectedValue);
+ assertTrue(spd.getUpperLimit().equals(expectedValue));
}
/**
- * Tests setting/getting of lower limit as String
+ * Tests setting/getting of lower limit as String.
* @param upper upper limit
* @param lower lower limit
* @param lowerFirst when true sets the lower limit property first
@@ -141,7 +142,7 @@
}
/**
- * Tests the allowUnlimited property
+ * Tests the allowUnlimited property.
*/
@Test
public void testIsAllowUnlimited1() {
@@ -152,7 +153,7 @@
}
/**
- * Tests the allowUnlimited property
+ * Tests the allowUnlimited property.
*/
@Test(expectedExceptions = PropertyException.class)
public void testIsAllowUnlimited2() {
@@ -163,7 +164,7 @@
}
/**
- * Tests the allowUnlimited property
+ * Tests the allowUnlimited property.
*/
@Test(expectedExceptions = PropertyException.class)
public void testIsAllowUnlimited3() {
@@ -174,7 +175,7 @@
}
/**
- * Creates illegal data for validate value
+ * Creates illegal data for validate value.
* @return data
*/
@DataProvider(name = "validateValueData")
@@ -187,7 +188,7 @@
}
/**
- * Tests that validateValue works
+ * Tests that validateValue works.
* @param value to validate
* @param allowUnlimited when true allows unlimited
* @param high upper limit
@@ -204,7 +205,7 @@
}
/**
- * Creates illegal data for validate value
+ * Creates illegal data for validate value.
* @return data
*/
@DataProvider(name = "illegalValidateValueData")
@@ -220,7 +221,7 @@
}
/**
- * Tests that validateValue throws exceptions
+ * Tests that validateValue throws exceptions.
* @param value to validate
* @param low lower limit
* @param high upper limit
@@ -238,7 +239,7 @@
}
/**
- * Creates encode test data
+ * Creates encode test data.
* @return data
*/
@DataProvider(name = "encodeValueData")
@@ -250,7 +251,7 @@
}
/**
- * Tests encode value
+ * Tests encode value.
* @param value to encode
* @param expectedValue to compare
*/
@@ -263,7 +264,7 @@
}
/**
- * Test that accept doesn't throw and exception
+ * Test that accept doesn't throw and exception.
*/
@Test
public void testAccept() {
@@ -272,11 +273,13 @@
IntegerPropertyDefinition spd = buildTestDefinition(builder);
PropertyDefinitionVisitor<Boolean, Void> v = new PropertyDefinitionVisitor<Boolean, Void>() {
+ @Override
public Boolean visitInteger(IntegerPropertyDefinition d,
Void o) {
return true;
}
+ @Override
public Boolean visitUnknown(PropertyDefinition d, Void o)
throws PropertyException {
return false;
@@ -288,7 +291,7 @@
}
/**
- * Make sure toString doesn't barf
+ * Make sure toString doesn't barf.
*/
@Test
public void testToString() {
@@ -311,6 +314,7 @@
IntegerPropertyDefinition.Builder builder = createTestBuilder();
builder.setAllowUnlimited(true);
builder.setDefaultBehaviorProvider(new DefaultBehaviorProvider<Integer>() {
+ @Override
public <R, P> R accept(DefaultBehaviorProviderVisitor<Integer, R, P> v, P p) {
return null;
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/SizePropertyDefinitionTest.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/SizePropertyDefinitionTest.java
index 4cb0452..07268a1 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/SizePropertyDefinitionTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/SizePropertyDefinitionTest.java
@@ -22,14 +22,15 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
package org.opends.server.admin;
import static org.testng.Assert.*;
-import org.opends.server.TestCaseUtils;
import org.opends.server.DirectoryServerTestCase;
+import org.opends.server.TestCaseUtils;
import org.opends.server.admin.std.meta.RootCfgDefn;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
@@ -54,7 +55,7 @@
}
/**
- * Tests creation of builder succeeds
+ * Tests creation of builder succeeds.
*/
@Test
public void testCreateBuilder() {
@@ -63,18 +64,18 @@
}
/**
- * Tests setting/getting of lower limit as long
+ * Tests setting/getting of lower limit as long.
*/
@Test
public void testLowerLimit1() {
SizePropertyDefinition.Builder builder = createTestBuilder();
- builder.setLowerLimit((long) 1);
+ builder.setLowerLimit(1);
SizePropertyDefinition spd = buildTestDefinition(builder);
- assert spd.getLowerLimit() == 1;
+ assertTrue(spd.getLowerLimit() == 1);
}
/**
- * Creates data for testing string-based limit values
+ * Creates data for testing string-based limit values.
* @return data
*/
@DataProvider(name = "stringLimitData")
@@ -86,7 +87,7 @@
}
/**
- * Creates data for testing limit values
+ * Creates data for testing limit values.
* @return data
*/
@DataProvider(name = "illegalLimitData")
@@ -101,7 +102,7 @@
/**
- * Tests setting/getting of lower limit as String
+ * Tests setting/getting of lower limit as String.
* @param limit unit limit
* @param expectedValue to compare
*/
@@ -110,22 +111,22 @@
SizePropertyDefinition.Builder builder = createTestBuilder();
builder.setLowerLimit(limit);
SizePropertyDefinition spd = buildTestDefinition(builder);
- assert spd.getLowerLimit() == expectedValue;
+ assertTrue(spd.getLowerLimit() == expectedValue);
}
/**
- * Tests setting/getting of lower limit as long
+ * Tests setting/getting of lower limit as long.
*/
@Test
public void testUpperLimit1() {
SizePropertyDefinition.Builder builder = createTestBuilder();
- builder.setLowerLimit((long) 1);
+ builder.setLowerLimit(1);
SizePropertyDefinition spd = buildTestDefinition(builder);
- assert spd.getLowerLimit() == 1;
+ assertTrue(spd.getLowerLimit() == 1);
}
/**
- * Tests setting/getting of lower limit as String
+ * Tests setting/getting of lower limit as String.
* @param limit upper limit
* @param expectedValue to compare
*/
@@ -134,11 +135,11 @@
SizePropertyDefinition.Builder builder = createTestBuilder();
builder.setUpperLimit(limit);
SizePropertyDefinition spd = buildTestDefinition(builder);
- assert spd.getUpperLimit().equals(expectedValue);
+ assertTrue(spd.getUpperLimit().equals(expectedValue));
}
/**
- * Tests setting/getting of lower limit as String
+ * Tests setting/getting of lower limit as String.
* @param upper upper limit
* @param lower lower limit
* @param lowerFirst when true sets the lower limit property first
@@ -156,7 +157,7 @@
}
/**
- * Tests the allowUnlimited property
+ * Tests the allowUnlimited property.
*/
@Test
public void testIsAllowUnlimited1() {
@@ -167,7 +168,7 @@
}
/**
- * Tests the allowUnlimited property
+ * Tests the allowUnlimited property.
*/
@Test(expectedExceptions = PropertyException.class)
public void testIsAllowUnlimited2() {
@@ -178,7 +179,7 @@
}
/**
- * Tests the allowUnlimited property
+ * Tests the allowUnlimited property.
*/
@Test(expectedExceptions = PropertyException.class)
public void testIsAllowUnlimited3() {
@@ -189,7 +190,7 @@
}
/**
- * Creates illegal data for validate value
+ * Creates illegal data for validate value.
* @return data
*/
@DataProvider(name = "validateValueData")
@@ -202,7 +203,7 @@
}
/**
- * Tests that validateValue works
+ * Tests that validateValue works.
* @param value to validate
* @param allowUnlimited when true allows unlimited
* @param high upper limit
@@ -219,7 +220,7 @@
}
/**
- * Creates illegal data for validate value
+ * Creates illegal data for validate value.
* @return data
*/
@DataProvider(name = "illegalValidateValueData")
@@ -235,7 +236,7 @@
}
/**
- * Tests that validateValue throws exceptions
+ * Tests that validateValue throws exceptions.
* @param value to validate
* @param low lower limit
* @param high upper limit
@@ -253,7 +254,7 @@
}
/**
- * Creates encode test data
+ * Creates encode test data.
* @return data
*/
@DataProvider(name = "encodeValueData")
@@ -278,7 +279,7 @@
}
/**
- * Tests encode value
+ * Tests encode value.
* @param value to encode
* @param expectedValue to compare
*/
@@ -291,7 +292,7 @@
}
/**
- * Test that accept doesn't throw and exception
+ * Test that accept doesn't throw and exception.
*/
@Test
public void testAccept() {
@@ -300,11 +301,13 @@
SizePropertyDefinition spd = buildTestDefinition(builder);
PropertyDefinitionVisitor<Boolean, Void> v = new PropertyDefinitionVisitor<Boolean, Void>() {
+ @Override
public Boolean visitSize(SizePropertyDefinition d,
Void o) {
return true;
}
+ @Override
public Boolean visitUnknown(PropertyDefinition d, Void o)
throws PropertyException {
return false;
@@ -316,7 +319,7 @@
}
/**
- * Make sure toString doesn't barf
+ * Make sure toString doesn't barf.
*/
@Test
public void testToString() {
@@ -345,6 +348,7 @@
SizePropertyDefinition.Builder builder = createTestBuilder();
builder.setAllowUnlimited(true);
builder.setDefaultBehaviorProvider(new DefaultBehaviorProvider<Long>() {
+ @Override
public <R, P> R accept(DefaultBehaviorProviderVisitor<Long, R, P> v, P p) {
return null;
}
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/admin/client/spi/PropertySetTest.java b/opendj-server-legacy/src/test/java/org/opends/server/admin/client/spi/PropertySetTest.java
index f7b4245..912ccaf 100755
--- a/opendj-server-legacy/src/test/java/org/opends/server/admin/client/spi/PropertySetTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/admin/client/spi/PropertySetTest.java
@@ -60,22 +60,23 @@
*/
public class PropertySetTest extends AdminTestCase {
- /** Default value for boolean property */
+ /** Default value for boolean property. */
private static final Boolean BOOL_DEFAULT = Boolean.TRUE;
- /** Default value for string properties */
+ /** Default value for string properties. */
private static final String STR_DEFAULT = "str def";
- /** Test boolean property def */
+ /** Test boolean property def. */
private BooleanPropertyDefinition testBoolPropertyDefinition;
- /** Test single valued string property def */
+ /** Test single valued string property def. */
private StringPropertyDefinition testSvStringPropertyDefinition;
- /** Test multi-valued string property def */
+ /** Test multi-valued string property def. */
private StringPropertyDefinition testMvStringPropertyDefinition;
private PropertyProvider emptyPropertyProvider = new PropertyProvider() {
+ @Override
public <T> Collection<T> getPropertyValues(PropertyDefinition<T> d) throws IllegalArgumentException {
return Collections.emptySet();
}
@@ -83,7 +84,7 @@
/**
- * Creates property definitions for testing
+ * Creates property definitions for testing.
*/
@BeforeClass
public void setUp() {
@@ -111,7 +112,7 @@
}
/**
- * Creates data for tests requiring property definitions
+ * Creates data for tests requiring property definitions.
* @return Object[][] or property definitions
*/
@DataProvider(name = "propertyDefinitionData")
@@ -125,7 +126,7 @@
/**
* Creates data for tests requiring property definitions
- * and sample data
+ * and sample data.
* @return Object[][] consisting of property defs and sets
* of sample data
*/
@@ -150,7 +151,7 @@
}
/**
- * Test basic property set creation
+ * Test basic property set creation.
*/
@Test
public void testCreate() {
@@ -159,7 +160,7 @@
}
/**
- * Tests setting and getting property values
+ * Tests setting and getting property values.
* @param pd PropertyDefinition for which values are set and gotten
* @param values property values to test
*/
@@ -172,14 +173,14 @@
p = ps.getProperty(pd);
assertTrue(p.isModified());
SortedSet<T> vs = p.getPendingValues();
- assert(values.size() == vs.size());
+ assertEquals(values.size(), vs.size());
for (T value : values) {
assertTrue(vs.contains(value));
}
}
/**
- * Tests toString()
+ * Tests toString().
* @param pd PropertyDefinition for testing
*/
@Test(dataProvider = "propertyDefinitionData")
@@ -189,7 +190,7 @@
}
/**
- * Tests the active values property
+ * Tests the active values property.
* @param pd PropertyDefinition for testing
* @param values for testing
*/
@@ -206,7 +207,7 @@
}
/**
- * Creates data for default test
+ * Creates data for default test.
* @return Object[][] data for test
*/
@DataProvider(name = "defaultData")
@@ -229,7 +230,7 @@
}
/**
- * Tests default values property
+ * Tests default values property.
* @param pd PropertyDefinition to test
* @param expected default values
*/
@@ -245,7 +246,7 @@
}
/**
- * Creates data for effective test
+ * Creates data for effective test.
* @return Object[][] data for test
*/
@DataProvider(name = "effectiveData")
@@ -278,7 +279,7 @@
}
/**
- * Tests effective values property
+ * Tests effective values property.
* @param pd PropertyDefinition
* @param newValues to apply
* @param expectedDefaults for test comparison
@@ -309,7 +310,7 @@
}
/**
- * Tests pending values property
+ * Tests pending values property.
* @param pd PropertyDefinition
* @param newValues set of new values to apply
* @param ignore parameter
@@ -332,7 +333,7 @@
}
/**
- * Tests getPropertyDefinition()
+ * Tests getPropertyDefinition().
* @param pd property definition to test
*/
@Test(dataProvider = "propertyDefinitionData")
@@ -344,7 +345,7 @@
}
/**
- * Tests isEmpty property
+ * Tests isEmpty property.
* @param pd PropertyDefinition
* @param newValues set of new values to apply
* @param ignore parameter
@@ -360,7 +361,7 @@
}
/**
- * Tests isEmpty property
+ * Tests isEmpty property.
* @param pd PropertyDefinition
* @param newValues set of new values to apply
* @param ignore parameter
@@ -378,7 +379,7 @@
}
/**
- * Tests wasEmpty property
+ * Tests wasEmpty property.
* @param pd property def to test
*/
@Test(dataProvider = "propertyDefinitionData")
@@ -389,7 +390,7 @@
}
/**
- * Tests property toString()
+ * Tests property toString().
* @param pd definition of property to test
*/
@Test(dataProvider = "propertyDefinitionData")
@@ -441,25 +442,22 @@
registerPropertyDefinition(testMvStringPropertyDefinition);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public C createClientConfiguration(ManagedObject managedObject) {
System.out.println("createClientConfiguration mo=" + managedObject);
return null;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public S createServerConfiguration(ServerManagedObject serverManagedObject) {
System.out.println("createServerConfiguration smo=" + serverManagedObject);
return null;
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
+ @Override
public Class<S> getServerConfigurationClass() {
System.out.println("getServerConfigurationClass");
return null;
@@ -476,6 +474,7 @@
this.values = values;
}
+ @Override
@SuppressWarnings("unchecked")
public <S> Collection<S> getPropertyValues(PropertyDefinition<S> d) throws IllegalArgumentException {
if (d.equals(pd)) {
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/SambaPasswordPluginTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/SambaPasswordPluginTestCase.java
index d66ec99..41eedd5 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/SambaPasswordPluginTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/SambaPasswordPluginTestCase.java
@@ -26,6 +26,9 @@
*/
package org.opends.server.plugins;
+import static org.opends.server.util.StaticUtils.*;
+import static org.testng.Assert.*;
+
import java.util.LinkedList;
import java.util.List;
@@ -47,9 +50,6 @@
import org.opends.server.util.ServerConstants;
import org.testng.annotations.*;
-import static org.opends.server.util.StaticUtils.*;
-import static org.testng.Assert.*;
-
/**
* Unit tests for the Samba password synchronization plugin.
*/
@@ -493,7 +493,7 @@
ExtendedOperation extOp = conn.processExtendedOperation(
ServerConstants.OID_PASSWORD_MODIFY_REQUEST, bsBuilder.toByteString());
- assert (extOp.getResultCode() == ResultCode.SUCCESS);
+ assertTrue(extOp.getResultCode() == ResultCode.SUCCESS);
// Verification of the result
assertThatPasswordsAreEqualTo(testEntry,
@@ -570,7 +570,7 @@
ExtendedOperation extOp = conn.processExtendedOperation(
ServerConstants.OID_PASSWORD_MODIFY_REQUEST, bsBuilder.toByteString());
- assert (extOp.getResultCode() == ResultCode.SUCCESS);
+ assertTrue(extOp.getResultCode() == ResultCode.SUCCESS);
// Verification of the result
@@ -651,7 +651,7 @@
ExtendedOperation extOp = conn.processExtendedOperation(
ServerConstants.OID_PASSWORD_MODIFY_REQUEST, bsBuilder.toByteString());
- assert (extOp.getResultCode() == ResultCode.SUCCESS);
+ assertTrue(extOp.getResultCode() == ResultCode.SUCCESS);
// Verification of the result
assertThatPasswordsAreEqualTo(testEntry,
@@ -822,7 +822,7 @@
ExtendedOperation extOp = conn.processExtendedOperation(
ServerConstants.OID_PASSWORD_MODIFY_REQUEST, bsBuilder.toByteString());
- assert (extOp.getResultCode() == ResultCode.SUCCESS);
+ assertTrue(extOp.getResultCode() == ResultCode.SUCCESS);
// Verification of the result
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/util/TestStaticUtils.java b/opendj-server-legacy/src/test/java/org/opends/server/util/TestStaticUtils.java
index 830fa42..3210088 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/util/TestStaticUtils.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/util/TestStaticUtils.java
@@ -22,10 +22,12 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.util;
+import static org.testng.Assert.*;
+
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
@@ -44,9 +46,9 @@
import java.util.LinkedList;
import java.util.List;
-import org.opends.server.TestCaseUtils;
-import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteSequence;
+import org.forgerock.opendj.ldap.ByteString;
+import org.opends.server.TestCaseUtils;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
@@ -57,19 +59,18 @@
* {@link org.opends.server.util.StaticUtils} class.
*/
public final class TestStaticUtils extends UtilTestCase {
- // Lower case hex digit lookup table.
+ /** Lower case hex digit lookup table. */
private static final char[] HEX_DIGITS_LOWER = new char[] { '0', '1',
'2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
- // Upper case hex digit lookup table.
+ /** Upper case hex digit lookup table. */
private static final char[] HEX_DIGITS_UPPER = new char[] { '0', '1',
'2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
- // Lookup table for 8-bit strings.
+ /** Lookup table for 8-bit strings. */
private static final String[] BIT_STRINGS = new String[256];
static {
- final char[] ZEROS = new char[] { '0', '0', '0', '0', '0', '0', '0',
- '0' };
+ final char[] ZEROS = new char[] { '0', '0', '0', '0', '0', '0', '0', '0' };
for (int i = 0; i < 256; i++) {
String bits = Integer.toBinaryString(i);
@@ -882,11 +883,11 @@
try {
if (target.exists()) {
target.delete();
- assert(!target.exists());
+ assertTrue(!target.exists());
}
StaticUtils.renameFile(src, target);
- assert(!src.exists());
- assert(target.exists());
+ assertTrue(!src.exists());
+ assertTrue(target.exists());
} finally {
src.delete();
target.delete();
@@ -905,8 +906,8 @@
File target = File.createTempFile("target", null);
try {
StaticUtils.renameFile(src, target);
- assert(!src.exists());
- assert(target.exists());
+ assertTrue(!src.exists());
+ assertTrue(target.exists());
} finally {
src.delete();
target.delete();
--
Gitblit v1.10.0