From a771fcaf1dc80a6c7ea29bde04adba0179f420d8 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 24 Nov 2014 07:54:47 +0000
Subject: [PATCH] AutoRefactor: sanitizing annotations

---
 opendj-core/src/test/java/com/forgerock/opendj/util/OperatingSystemTestCase.java                          |    2 
 opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java                                     |   87 ++--
 opendj-cli/src/test/java/com/forgerock/opendj/cli/UtilsTestCase.java                                      |   10 
 opendj-cli/src/test/java/com/forgerock/opendj/cli/ConsoleApplicationTestCase.java                         |   14 
 opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java             |   16 
 opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java                            |   51 +-
 opendj-core/src/test/java/org/forgerock/opendj/ldif/EntryGeneratorTestCase.java                           |    2 
 opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithmTestCase.java           |    4 
 opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnectionTestCase.java           |   50 +-
 opendj-core/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java               |    4 
 opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java                            |    2 
 opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java                    |    4 
 opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/ListenerSettingsTestCase.java         |    4 
 opendj-core/src/test/java/org/forgerock/opendj/io/ASN1WriterTestCase.java                                 |    4 
 opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/RuntimeOptionsTestCase.java           |    8 
 opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java                                          |    2 
 opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/UnbindRequestTestCase.java                   |    3 
 opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/CertificateTestCase.java              |    6 
 opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/ModelTestCase.java                    |   12 
 opendj-server/src/main/java/org/forgerock/opendj/server/setup/model/RuntimeOptions.java                   |    6 
 opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ReaderTestCase.java                                 |    6 
 opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java                        |    2 
 opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/AdaptersTestCase.java         |   28 -
 opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/ConvertersTestCase.java       |   29 -
 opendj-server3x-adapter/src/test/java/org/forgerock/opendj/adapter/server3x/AdaptersTestCase.java         |   28 -
 opendj-server3x-adapter/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java       |   26 
 opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxTest.java                         |   10 
 opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListenerTestCase.java                |    4 
 opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java                    |    8 
 opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java                   |   94 ++---
 opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java                          |   49 +-
 opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTestCase.java                      |   42 +-
 opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java                   |  130 ++-----
 opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java                                       |    4 
 opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/DataConfigurationTestCase.java        |    6 
 opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java                     |   76 ++--
 opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java                          |   17 
 opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java                          |   81 +---
 opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControlTestCase.java |    4 
 opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControlTestCase.java  |    2 
 opendj-core/src/test/java/org/forgerock/opendj/ldap/GSERParserTestCase.java                               |    6 
 41 files changed, 412 insertions(+), 531 deletions(-)

diff --git a/opendj-cli/src/test/java/com/forgerock/opendj/cli/ConsoleApplicationTestCase.java b/opendj-cli/src/test/java/com/forgerock/opendj/cli/ConsoleApplicationTestCase.java
index 1022b9c..601b9ce 100644
--- a/opendj-cli/src/test/java/com/forgerock/opendj/cli/ConsoleApplicationTestCase.java
+++ b/opendj-cli/src/test/java/com/forgerock/opendj/cli/ConsoleApplicationTestCase.java
@@ -112,7 +112,7 @@
         }
     }
 
-    @Test()
+    @Test
     public void testWriteLineInOutputStream() throws UnsupportedEncodingException {
         final MockConsoleApplication ca = MockConsoleApplication.getDefault();
         ca.print(msg);
@@ -120,7 +120,7 @@
         assertThat(ca.getErr()).isEmpty();
     }
 
-    @Test()
+    @Test
     public void testWriteLineInErrorStream() throws UnsupportedEncodingException {
         final MockConsoleApplication ca = MockConsoleApplication.getDefault();
         ca.errPrintln(msg);
@@ -128,7 +128,7 @@
         assertThat(ca.getErr()).contains(msg.toString());
     }
 
-    @Test()
+    @Test
     public void testWriteOutputStreamVerbose() throws UnsupportedEncodingException {
         final MockConsoleApplication ca = MockConsoleApplication.getDefault();
         ca.printVerboseMessage(msg);
@@ -142,7 +142,7 @@
         assertThat(ca.getErr()).isEmpty();
     }
 
-    @Test()
+    @Test
     public void testWriteErrorStreamVerbose() throws UnsupportedEncodingException {
         final MockConsoleApplication ca = MockConsoleApplication.getDefault();
         ca.errPrintVerboseMessage(msg);
@@ -162,7 +162,7 @@
      *
      * @throws UnsupportedEncodingException
      */
-    @Test()
+    @Test
     public void testNonInteractiveApplicationShouldNotStdoutErrors() throws UnsupportedEncodingException {
         final MockConsoleApplication ca = MockConsoleApplication.getDefault();
 
@@ -180,7 +180,7 @@
      *
      * @throws UnsupportedEncodingException
      */
-    @Test()
+    @Test
     public void testInteractiveApplicationShouldStdoutErrors() throws UnsupportedEncodingException {
         final MockConsoleApplication ca = MockConsoleApplication.getDefault();
 
@@ -199,7 +199,7 @@
      * In quiet mode, only the stderr should contain lines.
      * @throws UnsupportedEncodingException
      */
-    @Test()
+    @Test
     public void testQuietMode() throws UnsupportedEncodingException {
         final MockConsoleApplication ca = MockConsoleApplication.getDefault();
         ca.setQuiet(true);
diff --git a/opendj-cli/src/test/java/com/forgerock/opendj/cli/UtilsTestCase.java b/opendj-cli/src/test/java/com/forgerock/opendj/cli/UtilsTestCase.java
index 2f16717..f7eb772 100644
--- a/opendj-cli/src/test/java/com/forgerock/opendj/cli/UtilsTestCase.java
+++ b/opendj-cli/src/test/java/com/forgerock/opendj/cli/UtilsTestCase.java
@@ -47,12 +47,12 @@
         }
     }
 
-    @Test()
+    @Test
     public void testValidJavaVersion() throws ClientException {
         Utils.checkJavaVersion();
     }
 
-    @Test()
+    @Test
     public void testCanWriteOnNewFile() throws ClientException, IOException {
         final File f = File.createTempFile("tempFile", ".txt");
         f.deleteOnExit();
@@ -60,7 +60,7 @@
         assertTrue(Utils.canWrite(f.getPath()));
     }
 
-    @Test()
+    @Test
     public void testCannotWriteOnNewFile() throws ClientException, IOException {
         final File f = File.createTempFile("tempFile", ".txt");
         f.setReadOnly();
@@ -69,7 +69,7 @@
         assertFalse(Utils.canWrite(f.getPath()));
     }
 
-    @Test()
+    @Test
     public void testGetHostNameForLdapUrl() {
         assertEquals(Utils.getHostNameForLdapUrl("2a01:e35:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx"),
                 "[2a01:e35:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx]");
@@ -82,7 +82,7 @@
                 "[2a01:e35:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx]");
     }
 
-    @Test()
+    @Test
     public void isDN() {
         assertTrue(Utils.isDN("cn=Jensen,ou=people,dc=example,dc=com"));
         assertTrue(Utils.isDN("cn=John Doe,dc=example,dc=org"));
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java
index f37d05f..a8ff686 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java
@@ -628,7 +628,7 @@
     }
 
     /** {@inheritDoc} */
-    @Override()
+    @Override
     public boolean equals(final Object o) {
         if (o == this) {
             return true;
diff --git a/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControlTestCase.java b/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControlTestCase.java
index 6668a7d..260c375 100644
--- a/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControlTestCase.java
+++ b/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControlTestCase.java
@@ -47,7 +47,7 @@
  */
 @SuppressWarnings("javadoc")
 public class AccountUsabilityRequestControlTestCase extends ControlsTestCase {
-    @Test()
+    @Test
     public void testControl() throws Exception {
         // Send this control with a search request and see that you get
         // a valid response.
diff --git a/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControlTestCase.java b/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControlTestCase.java
index 217bfa3..61922d1 100644
--- a/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControlTestCase.java
+++ b/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControlTestCase.java
@@ -50,7 +50,7 @@
  */
 @SuppressWarnings("javadoc")
 public class AccountUsabilityResponseControlTestCase extends ControlsTestCase {
-    @Test()
+    @Test
     public void testInvalidResponseControl() throws Exception {
         // Don't send the request control and hence there
         // shouldn't be response.
@@ -67,7 +67,7 @@
         assertNull(aurctrl);
     }
 
-    @Test()
+    @Test
     public void testValidResponseControl() throws Exception {
         // Send this control with a search request and see that you get
         // a valid response.
diff --git a/opendj-core/src/test/java/com/forgerock/opendj/util/OperatingSystemTestCase.java b/opendj-core/src/test/java/com/forgerock/opendj/util/OperatingSystemTestCase.java
index fe23e65..a3dd03f 100644
--- a/opendj-core/src/test/java/com/forgerock/opendj/util/OperatingSystemTestCase.java
+++ b/opendj-core/src/test/java/com/forgerock/opendj/util/OperatingSystemTestCase.java
@@ -82,7 +82,7 @@
         }
     }
 
-    @Test()
+    @Test
     private void run() {
         final OperatingSystem os = OperatingSystem.getOperatingSystem();
 
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ReaderTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ReaderTestCase.java
index e41b022..5c79233 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ReaderTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ReaderTestCase.java
@@ -102,7 +102,7 @@
      * @throws Exception
      *             If an unexpected problem occurs.
      */
-    @Test()
+    @Test
     public void testDecodeExtendedZeroLengthArrayAsNull() throws Exception {
         final byte[] b = new byte[] { 0x05, (byte) 0x81, 0x00 };
         getReader(b, 0).readNull();
@@ -651,7 +651,7 @@
      * @throws Exception
      *             If an unexpected problem occurs.
      */
-    @Test()
+    @Test
     public void testDecodeZeroLengthArrayAsNull() throws Exception {
         final byte[] b = new byte[] { 0x05, 0x00 };
         getReader(b, 0).readNull();
@@ -757,7 +757,7 @@
     /**
      * Tests the <CODE>skipElement</CODE> method providing a specific type.
      */
-    @Test()
+    @Test
     public void testSkipElementWithType() throws Exception {
         final byte[] b =
                 new byte[] { 0x30, 0x09, 0x02, 0x01, 0x00, 0x02, 0x01, 0x01, 0x02, 0x01, 0x02 };
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1WriterTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1WriterTestCase.java
index 00d9687..7fba32a 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1WriterTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1WriterTestCase.java
@@ -475,7 +475,7 @@
      * @throws Exception
      *             If an unexpected problem occurs.
      */
-    @Test()
+    @Test
     public void testNegativeIntEncoding() throws Exception {
         // Some negative integers of interest
         // to test specific ranges/boundaries.
@@ -539,7 +539,7 @@
      * @throws Exception
      *             If an unexpected problem occurs.
      */
-    @Test()
+    @Test
     public void testNegativeLongEncoding() throws Exception {
         // Some negative integers of interest
         // to test specific ranges/boundaries.
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnectionTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnectionTestCase.java
index 2d94714..8204140 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnectionTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnectionTestCase.java
@@ -192,14 +192,14 @@
 
     }
 
-    @Test()
+    @Test
     public void testAddRequestSuccess() throws Exception {
         final Connection mockConnection = new MockConnection(ResultCode.SUCCESS);
         final AddRequest addRequest = newAddRequest("cn=test");
         assertThat(mockConnection.add(addRequest).getResultCode()).isEqualTo(ResultCode.SUCCESS);
     }
 
-    @Test()
+    @Test
     public void testAddRequestFail() throws Exception {
         final Connection mockConnection = new MockConnection(ResultCode.UNWILLING_TO_PERFORM);
         final AddRequest addRequest = newAddRequest("cn=test");
@@ -211,14 +211,14 @@
         }
     }
 
-    @Test()
+    @Test
     public void testBindRequestSuccess() throws Exception {
         final Connection mockConnection = new MockConnection(ResultCode.SUCCESS);
         final BindRequest bindRequest = newSimpleBindRequest();
         assertThat(mockConnection.bind(bindRequest).getResultCode()).isEqualTo(ResultCode.SUCCESS);
     }
 
-    @Test()
+    @Test
     public void testBindRequestFail() throws Exception {
         final Connection mockConnection = new MockConnection(ResultCode.UNWILLING_TO_PERFORM);
         final BindRequest bindRequest = newSimpleBindRequest();
@@ -230,7 +230,7 @@
         }
     }
 
-    @Test()
+    @Test
     public void testCompareRequestSuccess() throws Exception {
         final Connection mockConnection = new MockConnection(ResultCode.SUCCESS);
         final CompareRequest compareRequest = newCompareRequest("cn=test", "cn", "test");
@@ -238,7 +238,7 @@
                 ResultCode.SUCCESS);
     }
 
-    @Test()
+    @Test
     public void testCompareRequestFail() throws Exception {
         final Connection mockConnection = new MockConnection(ResultCode.UNWILLING_TO_PERFORM);
         final CompareRequest compareRequest = newCompareRequest("cn=test", "cn", "test");
@@ -250,7 +250,7 @@
         }
     }
 
-    @Test()
+    @Test
     public void testDeleteRequestSuccess() throws Exception {
         final Connection mockConnection = new MockConnection(ResultCode.SUCCESS);
         final DeleteRequest deleteRequest = newDeleteRequest("cn=test");
@@ -258,7 +258,7 @@
                 ResultCode.SUCCESS);
     }
 
-    @Test()
+    @Test
     public void testDeleteRequestFail() throws Exception {
         final Connection mockConnection = new MockConnection(ResultCode.UNWILLING_TO_PERFORM);
         final DeleteRequest deleteRequest = newDeleteRequest("cn=test");
@@ -270,7 +270,7 @@
         }
     }
 
-    @Test()
+    @Test
     public void testExtendedRequestSuccess() throws Exception {
         final Connection mockConnection = new MockConnection(ResultCode.SUCCESS);
         final GenericExtendedRequest extendedRequest = newGenericExtendedRequest("test");
@@ -278,7 +278,7 @@
                 ResultCode.SUCCESS);
     }
 
-    @Test()
+    @Test
     public void testExtendedRequestFail() throws Exception {
         final Connection mockConnection = new MockConnection(ResultCode.UNWILLING_TO_PERFORM);
         final GenericExtendedRequest extendedRequest = newGenericExtendedRequest("test");
@@ -290,7 +290,7 @@
         }
     }
 
-    @Test()
+    @Test
     public void testModifyRequestSuccess() throws Exception {
         final Connection mockConnection = new MockConnection(ResultCode.SUCCESS);
         final ModifyRequest modifyRequest = newModifyRequest("cn=test");
@@ -298,7 +298,7 @@
                 ResultCode.SUCCESS);
     }
 
-    @Test()
+    @Test
     public void testModifyRequestFail() throws Exception {
         final Connection mockConnection = new MockConnection(ResultCode.UNWILLING_TO_PERFORM);
         final ModifyRequest modifyRequest = newModifyRequest("cn=test");
@@ -310,7 +310,7 @@
         }
     }
 
-    @Test()
+    @Test
     public void testModifyDNRequestSuccess() throws Exception {
         final Connection mockConnection = new MockConnection(ResultCode.SUCCESS);
         final ModifyDNRequest modifyDNRequest = newModifyDNRequest("cn=test", "cn=newrdn");
@@ -318,7 +318,7 @@
                 ResultCode.SUCCESS);
     }
 
-    @Test()
+    @Test
     public void testModifyDNRequestFail() throws Exception {
         final Connection mockConnection = new MockConnection(ResultCode.UNWILLING_TO_PERFORM);
         final ModifyDNRequest modifyDNRequest = newModifyDNRequest("cn=test", "cn=newrdn");
@@ -330,7 +330,7 @@
         }
     }
 
-    @Test()
+    @Test
     public void testSearchRequestSuccess() throws Exception {
         final SearchResultEntry entry = newSearchResultEntry("cn=test");
         final Connection mockConnection = new MockConnection(ResultCode.SUCCESS, entry);
@@ -343,7 +343,7 @@
         assertThat(entries.iterator().next()).isSameAs(entry);
     }
 
-    @Test()
+    @Test
     public void testSearchRequestFail() throws Exception {
         final Connection mockConnection = new MockConnection(ResultCode.UNWILLING_TO_PERFORM);
         final SearchRequest searchRequest =
@@ -358,7 +358,7 @@
         }
     }
 
-    @Test()
+    @Test
     public void testSingleEntrySearchRequestSuccess() throws Exception {
         final SearchResultEntry entry = newSearchResultEntry("cn=test");
         final Connection mockConnection = new MockConnection(ResultCode.SUCCESS, entry);
@@ -368,7 +368,7 @@
     }
 
     @SuppressWarnings("unchecked")
-    @Test()
+    @Test
     public void testSingleEntrySearchAsyncRequestSuccess() throws Exception {
         final SearchResultEntry entry = newSearchResultEntry("cn=test");
         final Connection mockConnection = new MockConnection(ResultCode.SUCCESS, entry);
@@ -380,7 +380,7 @@
         verify(successHandler).handleResult(any(SearchResultEntry.class));
     }
 
-    @Test()
+    @Test
     public void testSingleEntrySearchRequestNoEntryReturned() throws Exception {
         final Connection mockConnection = new MockConnection(ResultCode.SUCCESS);
         final SearchRequest request =
@@ -393,7 +393,7 @@
         }
     }
 
-    @Test()
+    @Test
     public void testSingleEntrySearchRequestMultipleEntriesToReturn() throws Exception {
         final Connection mockConnection = new MockConnection(ResultCode.SIZE_LIMIT_EXCEEDED,
                 newSearchResultEntry("cn=test"));
@@ -407,7 +407,7 @@
         }
     }
 
-    @Test()
+    @Test
     public void testSingleEntrySearchRequestMultipleEntriesReturnedByServer() throws Exception {
         // could happen if server does not enforce size limit
         final Connection mockConnection = new MockConnection(ResultCode.SUCCESS, newSearchResultEntry("cn=test"),
@@ -423,7 +423,7 @@
     }
 
     @SuppressWarnings("unchecked")
-    @Test()
+    @Test
     public void testSingleEntrySearchAsyncRequestMultipleEntriesToReturn() throws Exception {
         final Connection mockConnection = new MockConnection(ResultCode.SIZE_LIMIT_EXCEEDED,
                 newSearchResultEntry("cn=test"));
@@ -440,7 +440,7 @@
         }
     }
 
-    @Test()
+    @Test
     public void testSingleEntrySearchAsyncRequestMultipleEntriesReturnedByServer() throws Exception {
         // could happen if server does not enfore size limit
         final Connection mockConnection = new MockConnection(ResultCode.SUCCESS, newSearchResultEntry("cn=test"),
@@ -458,7 +458,7 @@
         }
     }
 
-    @Test()
+    @Test
     public void testSingleEntrySearchRequestFail() throws Exception {
         final Connection mockConnection = new MockConnection(ResultCode.UNWILLING_TO_PERFORM);
         final SearchRequest request =
@@ -471,7 +471,7 @@
         }
     }
 
-    @Test()
+    @Test
     public void testSingleEntrySearchAsyncRequestFail() throws Exception {
         final Connection mockConnection = new MockConnection(ResultCode.UNWILLING_TO_PERFORM);
         final SearchRequest request =
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithmTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithmTestCase.java
index 26504a7..4573939 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithmTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithmTestCase.java
@@ -75,7 +75,7 @@
     /**
      * Disables logging before the tests.
      */
-    @BeforeClass()
+    @BeforeClass
     public void disableLogging() {
         TestCaseUtils.setDefaultLogLevel(Level.SEVERE);
     }
@@ -83,7 +83,7 @@
     /**
      * Re-enable logging after the tests.
      */
-    @AfterClass()
+    @AfterClass
     public void enableLogging() {
         TestCaseUtils.setDefaultLogLevel(Level.INFO);
     }
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java
index d7f2c9e..c5fe282 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java
@@ -331,7 +331,7 @@
             { "dc=opendj,dc=org", "dc=opendj,dc=com", false }, };
     }
 
-    @Test()
+    @Test
     public void testAdminData() {
         DN.valueOf("cn=cn\\=admin data");
         final DN theDN = DN.valueOf("cn=my dn");
@@ -604,7 +604,7 @@
     /**
      * Tests the parent method that require iteration.
      */
-    @Test()
+    @Test
     public void testIterableParent() {
         final String str = "ou=people,dc=example,dc=com";
         final DN dn = DN.valueOf(str);
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/GSERParserTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/GSERParserTestCase.java
index 69b0cf0..e33b3bb 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/GSERParserTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/GSERParserTestCase.java
@@ -47,7 +47,7 @@
     /**
      * Test the <CODE>hasNext</CODE> method.
      */
-    @Test()
+    @Test
     public void testHasNext() throws Exception {
         GSERParser parser = new GSERParser("0");
         assertTrue(parser.hasNext());
@@ -58,7 +58,7 @@
     /**
      * Test the <CODE>skipSP</CODE> method.
      */
-    @Test()
+    @Test
     public void testSkipSP() throws Exception {
         String[] values = {" 42", "  42", "42"};
         for (String value : values) {
@@ -71,7 +71,7 @@
     /**
      * Test the <CODE>skipMSP</CODE> method.
      */
-    @Test()
+    @Test
     public void testSkipMSP() throws Exception {
         String[] values = {" 42", "  42", "           42"};
         for (String value : values) {
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java
index 3f484fd..e650e16 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java
@@ -99,7 +99,7 @@
     /**
      * Disables logging before the tests.
      */
-    @BeforeClass()
+    @BeforeClass
     public void disableLogging() {
         TestCaseUtils.setDefaultLogLevel(Level.SEVERE);
     }
@@ -107,7 +107,7 @@
     /**
      * Re-enable logging after the tests.
      */
-    @AfterClass()
+    @AfterClass
     public void enableLogging() {
         TestCaseUtils.setDefaultLogLevel(Level.INFO);
     }
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java
index 2a444b8..b33a336 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java
@@ -72,7 +72,7 @@
      * @throws Exception
      *             If an unexpected problem occurs.
      */
-    @BeforeClass()
+    @BeforeClass
     public void startServer() throws Exception {
         TestCaseUtils.startServer();
     }
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/UnbindRequestTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/UnbindRequestTestCase.java
index 7624bc2..67e6f42 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/UnbindRequestTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/UnbindRequestTestCase.java
@@ -58,7 +58,8 @@
     protected Request unmodifiableOf(Request original) {
         return Requests.unmodifiableUnbindRequest((UnbindRequest) original);
     }
-    @Test()
+
+    @Test
     public void testModifiableRequest() {
         final UnbindRequest copy = (UnbindRequest) copyOf(Requests.newUnbindRequest());
         assertThat(copy.toString()).isEqualTo("UnbindRequest(controls=[])");
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTestCase.java
index 36ccb4d..1f52275 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTestCase.java
@@ -45,7 +45,7 @@
 @SuppressWarnings("javadoc")
 public class MatchingRuleTestCase extends AbstractSchemaTestCase {
 
-    @Test()
+    @Test
     public final void testCreatesBasicMatchingRule() {
 
         // @formatter:off
@@ -72,7 +72,7 @@
         assertThat(mr.isObsolete()).isFalse();
     }
 
-    @Test()
+    @Test
     public final void testCreatesOverrideBasicMatchingRule() {
 
         // @formatter:off
@@ -149,7 +149,7 @@
     /**
      * Matching rule name is optional.
      */
-    @Test()
+    @Test
     public final void testBuilderAllowsEmptyName() {
         // @formatter:off
         final Schema schema = new SchemaBuilder(Schema.getCoreSchema())
@@ -176,7 +176,7 @@
     /**
      * Multiple names can be set to the matching rule.
      */
-    @Test()
+    @Test
     public final void testBuilderAllowsMultipleNames() {
         // @formatter:off
         final Schema schema = new SchemaBuilder(Schema.getCoreSchema())
@@ -208,7 +208,7 @@
     /**
      * Name in optional for a matching rule. (RFC 4512)
      */
-    @Test()
+    @Test
     public final void testBuilderRemoveNames() {
         // @formatter:off
         final Schema schema = new SchemaBuilder(Schema.getCoreSchema())
@@ -239,7 +239,7 @@
     /**
      * The builder allows to remove selected name.
      */
-    @Test()
+    @Test
     public final void testBuilderRemoveSelectedName() {
         // @formatter:off
         final Schema schema = new SchemaBuilder(Schema.getCoreSchema())
@@ -271,7 +271,7 @@
     /**
      * The builder allows a missing description.
      */
-    @Test()
+    @Test
     public final void testBuilderAllowsNoDescription() {
         // @formatter:off
         final Schema schema = new SchemaBuilder(Schema.getCoreSchema())
@@ -298,7 +298,7 @@
     /**
      * The builder allows empty description.
      */
-    @Test()
+    @Test
     public final void testBuilderAllowsEmptyDescription() {
         // @formatter:off
         final Schema schema = new SchemaBuilder(Schema.getCoreSchema())
@@ -325,7 +325,7 @@
     /**
      * Extra properties is not a mandatory field.
      */
-    @Test()
+    @Test
     public final void testBuilderAllowsNoExtraProperties() {
         // @formatter:off
         final Schema schema = new SchemaBuilder(Schema.getCoreSchema())
@@ -367,7 +367,7 @@
     /**
      * Removes all the extra properties.
      */
-    @Test()
+    @Test
     public final void testBuilderRemoveExtraProperties() {
         // @formatter:off
         final Schema schema = new SchemaBuilder(Schema.getCoreSchema())
@@ -395,7 +395,7 @@
     /**
      * If the implementation is not set, the schema will use the default matching rule for this one.
      */
-    @Test()
+    @Test
     public final void testBuilderAllowsNoImplementation() {
         // @formatter:off
         final Schema schema = new SchemaBuilder(Schema.getCoreSchema())
@@ -419,7 +419,7 @@
     /**
      * If the implementation is null, the schema will use the default matching rule for this one.
      */
-    @Test()
+    @Test
     public final void testBuilderAllowsNullImplementation() {
         // @formatter:off
         final Schema schema = new SchemaBuilder(Schema.getCoreSchema())
@@ -446,7 +446,7 @@
     /**
      * Sets a matching rule using a string definition.
      */
-    @Test()
+    @Test
     public final void testAddingAMatchingRuleDefinitionStringNoOverride() {
         final SchemaBuilder sb = new SchemaBuilder();
         sb.addSchema(Schema.getCoreSchema(), false);
@@ -471,7 +471,7 @@
     /**
      * Sets a matching rule using a string definition.
      */
-    @Test()
+    @Test
     public final void testAddingAMatchingRuleDefinitionStringOverride() {
         final SchemaBuilder sb = new SchemaBuilder();
         sb.addSchema(Schema.getCoreSchema(), false);
@@ -494,7 +494,7 @@
     /**
      * Duplicates an existing matching rule.
      */
-    @Test()
+    @Test
     public final void testDuplicatesExistingMatchingRule() {
 
         final SchemaBuilder sb = new SchemaBuilder();
@@ -540,7 +540,7 @@
     /**
      * Equality between matching rules.
      */
-    @Test()
+    @Test
     public final void testMatchingRuleEqualsTrue() {
 
         // @formatter:off
@@ -576,7 +576,7 @@
     /**
      * Equality between matching rules fails.
      */
-    @Test()
+    @Test
     public final void testMatchingRuleEqualsFalse() {
 
         // @formatter:off
@@ -612,7 +612,7 @@
     /**
      * Verifies the builder definition.
      */
-    @Test()
+    @Test
     public final void testVerifyMatchingRuleDefinition() {
 
         final SchemaBuilder sb = new SchemaBuilder();
@@ -645,7 +645,7 @@
     /**
      * Equality between builder and definition.
      */
-    @Test()
+    @Test
     public final void testMatchingRuleEqualityReturnsTrueBetweenBuilderAndDefinition() {
 
         // @formatter:off
@@ -678,7 +678,7 @@
     /**
      * Equality between builder and definition fails.
      */
-    @Test()
+    @Test
     public final void testMatchingRuleEqualityReturnsTrueBetweenBuilderAndDefinitionFails() {
 
         // @formatter:off
@@ -711,7 +711,7 @@
     /**
      * The builder allows to create chained matching rules.
      */
-    @Test()
+    @Test
     public final void testCreatesMatchingRulesUsingChainingMethods() {
         final Map<String, List<String>> extraProperties = new TreeMap<String, List<String>>();
         final List<String> extra = new ArrayList<String>();
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java
index c3c1b28..0bb07cf 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java
@@ -48,9 +48,8 @@
      * Creates a new form using the required parameters only (oid, structural
      * OID and required attributes).
      */
-    @Test()
+    @Test
     public final void testCreatesANewFormWithOnlyRequiredParameters() {
-
         final Schema schema = new SchemaBuilder(Schema.getCoreSchema())
                 .buildNameForm("1.3.6.1.4.1.1466.115.121.1.35")
                     .structuralObjectClassOID("person")
@@ -72,7 +71,7 @@
     /**
      * Creates a new form with a name.
      */
-    @Test()
+    @Test
     public final void testCreatesANewFormWithAName() {
 
         // @formatter:off
@@ -102,7 +101,7 @@
     /**
      * Creates a new form with optional attributes OID.
      */
-    @Test()
+    @Test
     public final void testCreatesANewFormWithOptionalAttributesOid() {
 
         final SchemaBuilder sb = new SchemaBuilder();
@@ -135,7 +134,7 @@
     /**
      * Creates a new form with ExtraProperties.
      */
-    @Test()
+    @Test
     public final void testCreatesANewNameFormWithExtraProperties() {
         // @formatter:off
         final Schema schema = new SchemaBuilder(Schema.getCoreSchema())
@@ -275,9 +274,8 @@
      *
      * @throws SchemaException
      */
-    @Test()
+    @Test
     public final void testBuilderAllowsEmptyOptionalAttributes() {
-
         // @formatter:off
         new SchemaBuilder(Schema.getCoreSchema())
             .buildNameForm("1.3.6.1.4.1.1466.115.121.1.35")
@@ -297,9 +295,8 @@
      *
      * @throws SchemaException
      */
-    @Test()
+    @Test
     public final void testBuilderAllowRemovingNonexistentAttributes() {
-
         // @formatter:off
         final Schema schema = new SchemaBuilder(Schema.getCoreSchema())
             .buildNameForm("1.3.6.1.4.1.1466.115.121.1.35")
@@ -328,7 +325,7 @@
      * Verifying the schema builder allows to add directly a definition. The
      * name form is created as well.
      */
-    @Test()
+    @Test
     public final void testNameFormDefinition() {
         final SchemaBuilder sb = new SchemaBuilder();
         sb.addSchema(Schema.getCoreSchema(), false);
@@ -392,9 +389,8 @@
      *
      * @throws SchemaException
      */
-    @Test()
+    @Test
     public final void testDuplicatesTheNameForm() {
-
         final SchemaBuilder sb = new SchemaBuilder();
         sb.addSchema(Schema.getCoreSchema(), false);
         // @formatter:off
@@ -438,9 +434,8 @@
      *
      * @throws SchemaException
      */
-    @Test()
+    @Test
     public final void testDuplicatesTheNameFormFails() {
-
         final SchemaBuilder sb = new SchemaBuilder();
         sb.addSchema(Schema.getCoreSchema(), false);
         // @formatter:off
@@ -473,7 +468,7 @@
     /**
      * Compare two same name forms using the equal function.
      */
-    @Test()
+    @Test
     public final void testNameFormEqualsTrue() {
 
         // @formatter:off
@@ -506,7 +501,7 @@
     /**
      * Equals between two name forms fails.
      */
-    @Test()
+    @Test
     public final void testNameFormEqualsFalse() {
 
         // @formatter:off
@@ -546,7 +541,7 @@
      *
      * @throws SchemaException
      */
-    @Test()
+    @Test
     public final void testCreateFormUsingDefinitionAndSchemaBuilder() {
         final SchemaBuilder sb = new SchemaBuilder();
 
@@ -577,7 +572,7 @@
      * name form builder, the other by the schema builder directly using the
      * definition.
      */
-    @Test()
+    @Test
     public final void testNameFormEqualityReturnsTrueBetweenBuilderAndDefinition() {
 
         // @formatter:off
@@ -618,7 +613,7 @@
      * name form builder, the other by the schema builder directly using the
      * definition with different OID.
      */
-    @Test()
+    @Test
     public final void testNameFormEqualityReturnsFalseBetweenBuilderAndDefinition() {
 
         // @formatter:off
@@ -660,7 +655,7 @@
      *
      * @throws SchemaException
      */
-    @Test()
+    @Test
     public final void testNameFormValidateDoesntAllowAbstractObjectClass() {
 
         // @formatter:off
@@ -689,7 +684,7 @@
      *
      * @throws SchemaException
      */
-    @Test()
+    @Test
     public final void testNameFormValidateAllowsStructuralObjectClass() {
 
         // @formatter:off
@@ -718,7 +713,7 @@
      *
      * @throws SchemaException
      */
-    @Test()
+    @Test
     public final void testBuildsANewFormWithMultipleAttributes() {
 
         // @formatter:off
@@ -784,7 +779,7 @@
      *
      * @throws SchemaException
      */
-    @Test()
+    @Test
     public final void testCreatesANewFormUsingChainingMethods() {
         final Map<String, List<String>> extraProperties = new TreeMap<String, List<String>>();
         final List<String> extra = new ArrayList<String>();
@@ -833,7 +828,7 @@
      *
      * @throws SchemaException
      */
-    @Test()
+    @Test
     public final void testCreatesNewFormAndRemovesAttributes() {
 
         // @formatter:off
@@ -876,7 +871,7 @@
      *
      * @throws SchemaException
      */
-    @Test()
+    @Test
     public final void testDuplicatesNameFormAndRemovesAttributes() {
 
         // @formatter:off
@@ -942,7 +937,7 @@
      *
      * @throws SchemaException
      */
-    @Test()
+    @Test
     public final void testDuplicatesNameFormAndClears() {
 
         final SchemaBuilder sb = new SchemaBuilder();
@@ -1002,7 +997,7 @@
      *
      * @throws SchemaException
      */
-    @Test()
+    @Test
     public final void testAddsSeveralFormsToSchemaBuilder() {
 
         // @formatter:off
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java
index 496276d..a5eb87b 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java
@@ -388,7 +388,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderWithEntryWithCoreSchema() throws Exception {
         // @formatter:off
         final String[] strEntry = {
@@ -476,7 +476,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderWithEntryAddLdapSyntax() throws Exception {
         // @formatter:off
         final String[] strEntry = {
@@ -517,7 +517,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderWithEntryAddMalformedLdapSyntax() throws Exception {
         // @formatter:off
         final String[] strEntry = {
@@ -556,7 +556,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderWithEntryAddMatchingRuleUse() throws Exception {
         // @formatter:off
         final String[] strEntry = {
@@ -598,7 +598,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderWithEntryAddMalformedMatchingRuleUse() throws Exception {
         // @formatter:off
         final String[] strEntry = {
@@ -637,7 +637,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderWithEntryAddMatchingRule() throws Exception {
         // @formatter:off
         final String[] strEntry = {
@@ -680,7 +680,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderWithEntryAddMalformedMatchingRule() throws Exception {
         // @formatter:off
         final String[] strEntry = {
@@ -720,7 +720,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderWithEntryAddDITContentRule() throws Exception {
         // @formatter:off
         final String[] strEntry = {
@@ -763,7 +763,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderWithEntryAddMalformedDITContentRule() throws Exception {
         // @formatter:off
         final String[] strEntry = {
@@ -803,7 +803,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderWithEntryAddObjectClass() throws Exception {
         // @formatter:off
         final String[] strEntry = {
@@ -844,7 +844,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderWithEntryAddMalformedObjectClass() throws Exception {
         // @formatter:off
         final String[] strEntry = {
@@ -885,7 +885,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderAddAttributeWithEntryContainingDescriptionWithCoreSchema()
             throws Exception {
         // @formatter:off
@@ -940,7 +940,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderAddAttributeContainingDescriptionWithCoreSchema()
             throws Exception {
 
@@ -1065,7 +1065,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderCompareAddAttributeTypesSucceed() throws Exception {
 
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getDefaultSchema());
@@ -1148,7 +1148,7 @@
     /**
      * Rewrite an existing object class.
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderAddObjectClass() throws Exception {
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getDefaultSchema());
         Set<String> attrs = new HashSet<String>();
@@ -1201,9 +1201,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderAllowsConflictingAttributesOverwriteTrue() throws Exception {
-
         final SchemaBuilder scBuild = new SchemaBuilder();
 
         //@formatter:off
@@ -1281,7 +1280,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderAllowsConflictingDITStructureRuleOverwriteTrue()
             throws Exception {
         // @formatter:off
@@ -1329,7 +1328,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderAddDITContentRuleBuilder() throws Exception {
         // @formatter:off
         final Schema schema =
@@ -1389,7 +1388,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderAllowsConflictingDITContentRuleOverwriteTrue()
             throws Exception {
         // @formatter:off
@@ -1446,7 +1445,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderAllowsConflictingMatchingRuleOverwriteTrue()
             throws Exception {
         // @formatter:off
@@ -1492,7 +1491,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderAllowsConflictingMatchingRuleUseOverwriteTrue()
             throws Exception {
         // @formatter:off
@@ -1550,7 +1549,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderAllowsConflictingNameFormOverwriteTrue() throws Exception {
         // @formatter:off
         final Schema schema =
@@ -1612,9 +1611,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderRemoveInexistantAttributeType() throws Exception {
-
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getCoreSchema());
         boolean isRemoved = scBuild.removeAttributeType("wrongName");
         assertThat(isRemoved).isFalse();
@@ -1625,9 +1623,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderRemoveInexistantSyntax() throws Exception {
-
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getCoreSchema());
         boolean isRemoved = scBuild.removeSyntax("1.3.6.1.4.1.14aa");
         assertThat(isRemoved).isFalse();
@@ -1655,9 +1652,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderRemoveDitContentRule() throws Exception {
-
         // @formatter:off
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getCoreSchema());
         scBuild.addObjectClass("( 2.16.840.1.113730.3.2.2 NAME 'myCustomObjClass"
@@ -1682,9 +1678,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderRemoveInexistantDitContentRule() throws Exception {
-
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getCoreSchema());
         boolean isRemoved = scBuild.removeDITContentRule("badDITContentRule");
         assertThat(isRemoved).isFalse();
@@ -1732,9 +1727,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderRemoveInexistantDitStructureRule() throws Exception {
-
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getCoreSchema());
         boolean isRemoved = scBuild.removeDITStructureRule(999014);
         assertThat(isRemoved).isFalse();
@@ -1766,9 +1760,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderRemoveInexistantMatchingRule() throws Exception {
-
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getCoreSchema());
         boolean isRemoved = scBuild.removeMatchingRule("bitStringMatchZ");
         assertThat(isRemoved).isFalse();
@@ -1798,9 +1791,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderRemoveInexistantMatchingRuleUse() throws Exception {
-
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getCoreSchema());
         boolean isRemoved = scBuild.removeMatchingRuleUse("bitStringMatchZ");
         assertThat(isRemoved).isFalse();
@@ -1831,9 +1823,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderRemoveInexistantNameForm() throws Exception {
-
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getCoreSchema());
         boolean isRemoved = scBuild.removeNameForm("bitStringMatchZ");
         assertThat(isRemoved).isFalse();
@@ -1863,9 +1854,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderRemoveInexistantObjectClass() throws Exception {
-
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getCoreSchema());
         boolean isRemoved = scBuild.removeObjectClass("bitStringMatchZ");
         assertThat(isRemoved).isFalse();
@@ -1923,7 +1913,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderAddSchemaForEntryMockConnection() throws Exception {
         Connection connection = mock(Connection.class);
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getCoreSchema());
@@ -1973,7 +1963,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testSchemaBuilderAddSchemaForEntryAsyncMockConnection() throws Exception {
         Connection connection = mock(Connection.class);
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getCoreSchema());
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java
index d7b649a..56a9e14 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java
@@ -65,7 +65,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testReadSchemaAsyncMethodsMockConnection() throws Exception {
         Connection connection = mock(Connection.class);
 
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java
index 7147fed..544f1a1 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java
@@ -38,9 +38,8 @@
 @SuppressWarnings("javadoc")
 public class SyntaxTestCase extends AbstractSchemaTestCase {
 
-    @Test()
+    @Test
     public final void testCreatesANewSyntax() {
-
         // @formatter:off
         final Schema schema = new SchemaBuilder(Schema.getCoreSchema())
             .buildSyntax("1.9.1.2.3")
@@ -89,7 +88,7 @@
      * Tests that unrecognized syntaxes are automatically substituted with the
      * default syntax and matching rule.
      */
-    @Test()
+    @Test
     public final void testDefaultSyntaxSubstitution() {
         final Syntax syntax = Schema.getCoreSchema().getSyntax("1.2.3.4.5");
         assertThat(syntax).isNotNull();
@@ -137,7 +136,7 @@
     /**
      * When syntax is missing, the default one is set. Actual default is OctetString.(case match)
      */
-    @Test()
+    @Test
     public final void testBuilderAllowsNullSyntax() {
         // @formatter:off
         final Schema schema = new SchemaBuilder(Schema.getCoreSchema())
@@ -166,7 +165,7 @@
     /**
      * When syntax is missing, the default one is set. Actual default is OctetString.(case match)
      */
-    @Test()
+    @Test
     public final void testBuilderAllowsNoSyntax() {
         // @formatter:off
         final Schema schema = new SchemaBuilder(Schema.getCoreSchema())
@@ -195,9 +194,8 @@
      * When syntax is missing, the default one is set. Actual default is set to directory string
      * (1.3.6.1.4.1.1466.115.121.1.15) - matchingRules of caseIgnoreMatch and caseIgnoreSubstringsMatch.
      */
-    @Test()
+    @Test
     public final void testBuilderAllowsNoSyntaxCaseWhereDefaultSyntaxIsChanged() {
-
         // @formatter:off
         final Schema schema = new SchemaBuilder(Schema.getCoreSchema())
             .defaultSyntax("1.3.6.1.4.1.1466.115.121.1.15")
@@ -225,7 +223,7 @@
     /**
      * The builder allows a missing description.
      */
-    @Test()
+    @Test
     public final void testBuilderAllowsNoDescription() {
         // @formatter:off
         final Schema schema = new SchemaBuilder(Schema.getCoreSchema())
@@ -250,7 +248,7 @@
     /**
      * The builder allows a missing description.
      */
-    @Test()
+    @Test
     public final void testBuilderAllowsNullDescription() {
         // @formatter:off
         final Schema schema = new SchemaBuilder(Schema.getCoreSchema())
@@ -276,7 +274,7 @@
     /**
      * The builder allows a missing description.
      */
-    @Test()
+    @Test
     public final void testBuilderAllowsEmptyDescription() {
         // @formatter:off
         final Schema schema = new SchemaBuilder(Schema.getCoreSchema())
@@ -302,7 +300,7 @@
     /**
      * Extra properties is not a mandatory field.
      */
-    @Test()
+    @Test
     public final void testBuilderAllowsNoExtraProperties() {
         // @formatter:off
         final Schema schema = new SchemaBuilder(Schema.getCoreSchema())
@@ -343,7 +341,7 @@
     /**
      * Removes all the extra properties.
      */
-    @Test()
+    @Test
     public final void testBuilderRemoveExtraProperties() {
         // @formatter:off
         final Schema schema = new SchemaBuilder(Schema.getCoreSchema())
@@ -370,7 +368,7 @@
     /**
      * Removes specified extra properties.
      */
-    @Test()
+    @Test
     public final void testBuilderRemoveSpecifiedExtraProperties() {
         // @formatter:off
         final Schema schema = new SchemaBuilder(Schema.getCoreSchema())
@@ -401,7 +399,7 @@
     /**
      * Sets a syntax using a string definition.
      */
-    @Test()
+    @Test
     public final void testAddingBERSyntaxDefinition() {
         final SchemaBuilder sb = new SchemaBuilder();
         sb.addSchema(Schema.getCoreSchema(), false);
@@ -427,7 +425,7 @@
     /**
      * Sets a syntax using a string definition.
      */
-    @Test()
+    @Test
     public final void testAddingASyntaxDefinitionStringOverride() {
         final SchemaBuilder sb = new SchemaBuilder();
         sb.addSchema(Schema.getCoreSchema(), false);
@@ -453,7 +451,7 @@
     /**
      * Sets a syntax using a string definition.
      */
-    @Test()
+    @Test
     public final void testAddingUnknownSyntaxDefinitionString() {
         final SchemaBuilder sb = new SchemaBuilder();
         sb.addSchema(Schema.getCoreSchema(), false);
@@ -479,9 +477,8 @@
     /**
      * Duplicates a syntax.
      */
-    @Test()
+    @Test
     public final void testBuilderDuplicatesExistingSyntax() {
-
         final SchemaBuilder sb = new SchemaBuilder();
         sb.addSchema(Schema.getCoreSchema(), false);
 
@@ -522,9 +519,8 @@
     /**
      * Another duplicated syntax example.
      */
-    @Test()
+    @Test
     public final void testBuilderDuplicatesSyntax() {
-
         final SchemaBuilder sb = new SchemaBuilder();
         sb.addSchema(Schema.getCoreSchema(), false);
         // @formatter:off
@@ -561,9 +557,8 @@
     /**
      * Equality between syntaxes.
      */
-    @Test()
+    @Test
     public final void testBuilderSyntaxesEqualsTrue() {
-
         // @formatter:off
         final Schema schema = new SchemaBuilder(Schema.getCoreSchema())
                 .buildSyntax("1.9.1.2.3")
@@ -593,9 +588,8 @@
     /**
      * Equality between syntaxes.
      */
-    @Test()
+    @Test
     public final void testBuilderSyntaxesEqualsFalse() {
-
         // @formatter:off
         final Schema schema = new SchemaBuilder(Schema.getCoreSchema())
                 .buildSyntax("1.9.1.2.3")
@@ -625,9 +619,8 @@
     /**
      * Equality between builder and definition.
      */
-    @Test()
+    @Test
     public final void testBuilderEqualityReturnsTrueBetweenBuilderAndDefinition() {
-
         // @formatter:off
         final Schema schema = new SchemaBuilder(Schema.getCoreSchema())
             .buildSyntax("1.9.1.2.3")
@@ -655,9 +648,8 @@
     /**
      * Equality between builder and definition fails.
      */
-    @Test()
+    @Test
     public final void testBuilderEqualityReturnsFalseBetweenBuilderAndDefinition() {
-
         // @formatter:off
         final Schema schema = new SchemaBuilder(Schema.getCoreSchema())
             .buildSyntax("1.9.1.2.3")
@@ -685,9 +677,8 @@
     /**
      * The builder allows to create chained syntaxes.
      */
-    @Test()
+    @Test
     public final void testBuilderCreatesSyntaxesUsingChainingMethods() {
-
         // @formatter:off
         final Schema schema = new SchemaBuilder(Schema.getCoreSchema())
             .buildSyntax("1.9.1.2.3")
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxTest.java
index 10d04f7..aac77d5 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxTest.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxTest.java
@@ -78,7 +78,7 @@
      * @throws Exception
      *             If an unexpected problem occurs.
      */
-    @Test()
+    @Test
     public void testCreateAndDecodeUTCTimeValue() throws Exception {
         final Date d = new Date();
         final String timeValue = UTCTimeSyntaxImpl.createUTCTimeValue(d);
@@ -97,7 +97,7 @@
      * @throws Exception
      *             If an unexpected problem occurs.
      */
-    @Test()
+    @Test
     public void testDecode50to99() throws Exception {
         Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
 
@@ -119,7 +119,7 @@
      * @throws Exception
      *             If an unexpected problem occurs.
      */
-    @Test()
+    @Test
     public void testDecode00to49() throws Exception {
         Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
 
@@ -141,7 +141,7 @@
      * @throws Exception
      *             If an unexpected problem occurs.
      */
-    @Test()
+    @Test
     public void testCreate50to99() throws Exception {
         Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
 
@@ -163,7 +163,7 @@
      * @throws Exception
      *             If an unexpected problem occurs.
      */
-    @Test()
+    @Test
     public void testCreate00to49() throws Exception {
         Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
 
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java
index 36c879a..914111c 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java
@@ -85,7 +85,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testWriteChangeRecordAddRequest() throws Exception {
         Connection connection = mock(Connection.class);
         ConnectionChangeRecordWriter writer = null;
@@ -122,7 +122,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testWriteChangeRecordContainingAddRequest() throws Exception {
         Connection connection = mock(Connection.class);
         ConnectionChangeRecordWriter writer = null;
@@ -143,7 +143,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testWriteChangeRecordContainingDeleteRequest() throws Exception {
         Connection connection = mock(Connection.class);
         ConnectionChangeRecordWriter writer = null;
@@ -287,7 +287,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testWriteChangeRecordDeleteRequest() throws Exception {
         Connection connection = mock(Connection.class);
         ConnectionChangeRecordWriter writer = null;
@@ -324,7 +324,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testWriteChangeRecordModifyDNRequest() throws Exception {
         Connection connection = mock(Connection.class);
         ConnectionChangeRecordWriter writer = null;
@@ -365,7 +365,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testWriteChangeRecordModifyRequest() throws Exception {
         Connection connection = mock(Connection.class);
         ConnectionChangeRecordWriter writer = null;
@@ -410,7 +410,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testWriteCommentDoNotSupportComment() throws Exception {
         Connection connection = mock(Connection.class);
         ConnectionChangeRecordWriter writer = null;
@@ -465,7 +465,7 @@
      * @throws Exception
      *             If the test failed unexpectedly.
      */
-    @Test()
+    @Test
     public final void testConnectionChangeRecordWriterClose() throws Exception {
         Connection connection = mock(Connection.class);
         ConnectionChangeRecordWriter writer = null;
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java
index 60a7bb3..ec26ad8 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java
@@ -81,7 +81,7 @@
         }
     }
 
-    @Test()
+    @Test
     public final void testReadEntry() throws Exception {
         final ConnectionEntryReader reader = newReader(ENTRY1, SUCCESS);
         try {
@@ -138,7 +138,7 @@
         }
     }
 
-    @Test()
+    @Test
     public final void testReadMultipleResults() throws Exception {
         final ConnectionEntryReader reader = newReader(ENTRY1, ENTRY2, REF, ENTRY3, SUCCESS);
         try {
@@ -157,7 +157,7 @@
         }
     }
 
-    @Test()
+    @Test
     public final void testReadReference() throws Exception {
         final ConnectionEntryReader reader = newReader(REF, SUCCESS);
         try {
@@ -172,7 +172,7 @@
         }
     }
 
-    @Test()
+    @Test
     public final void testReadReferenceWhenEntry() throws Exception {
         final ConnectionEntryReader reader = newReader(ENTRY1, SUCCESS);
         try {
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java
index c48dbf9..691fd7b 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java
@@ -53,7 +53,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testConnectionEntryWriterWritesEntry() throws Exception {
         Connection connection = mock(Connection.class);
         ConnectionEntryWriter writer = null;
@@ -125,7 +125,7 @@
      * @throws Exception
      *             If the test failed unexpectedly.
      */
-    @Test()
+    @Test
     public final void testConnectionEntryWriterClose() throws Exception {
         Connection connection = mock(Connection.class);
         ConnectionEntryWriter writer = null;
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/EntryGeneratorTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/EntryGeneratorTestCase.java
index 5b3b79e..f1e3c02 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/EntryGeneratorTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/EntryGeneratorTestCase.java
@@ -370,7 +370,7 @@
      * Test to show that reporting an error about an uninitialized variable when
      * generating templates reports the correct line.
      */
-    @Test()
+    @Test
     public void testMissingVariableErrorReport() throws Exception {
         String[] lines = {
         /* 0 */"template: template",
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java
index 04f4bf9..1096fdf 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java
@@ -97,9 +97,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testSetExcludeAllOperationalAttributesFalse() throws Exception {
-
         final LDIFChangeRecordReader reader =
                 new LDIFChangeRecordReader(getStandardLDIFChangeRecord());
 
@@ -124,9 +123,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testSetExcludeAllOperationalAttributesTrue() throws Exception {
-
         final LDIFChangeRecordReader reader =
                 new LDIFChangeRecordReader(getStandardLDIFChangeRecord());
 
@@ -153,9 +151,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testSetExcludeAllUserAttributesFalse() throws Exception {
-
         final LDIFChangeRecordReader reader =
                 new LDIFChangeRecordReader(getStandardLDIFChangeRecord());
 
@@ -181,9 +178,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testSetExcludeAllUserAttributesTrue() throws Exception {
-
         final LDIFChangeRecordReader reader =
                 new LDIFChangeRecordReader(getStandardLDIFChangeRecord());
 
@@ -281,9 +277,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testSetIncludeAttributeWithMatch() throws Exception {
-
         final LDIFChangeRecordReader reader =
                 new LDIFChangeRecordReader(getStandardLDIFChangeRecord());
 
@@ -311,9 +306,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testSetIncludeAttributeWithNoMatch() throws Exception {
-
         final LDIFChangeRecordReader reader =
                 new LDIFChangeRecordReader(getStandardLDIFChangeRecord());
 
@@ -353,9 +347,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testSetIncludeBranchWithMatch() throws Exception {
-
         final LDIFChangeRecordReader reader =
                 new LDIFChangeRecordReader(getStandardLDIFChangeRecord());
         reader.setIncludeBranch(DN.valueOf("dc=example,dc=com"));
@@ -413,9 +406,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testSetExcludeBranchWithMatch() throws Exception {
-
         final LDIFChangeRecordReader reader =
                 new LDIFChangeRecordReader(getStandardLDIFChangeRecord());
         reader.setExcludeBranch(DN.valueOf("dc=example,dc=org"));
@@ -523,9 +515,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testSetSchemaValidationPolicyDefaultAllowsEntry() throws Exception {
-
         // @formatter:off
         final String[] strChangeRecord = {
             "dn: uid=user.0,ou=People,dc=example,dc=com",
@@ -605,7 +596,7 @@
      * @throws Exception
      *             if an unexpected error occurred.
      */
-    @Test()
+    @Test
     public void testReadAddRecordWithChangeType() throws Exception {
         // @formatter:off
         LDIFChangeRecordReader reader = new LDIFChangeRecordReader(
@@ -635,7 +626,7 @@
      * @throws Exception
      *             if an unexpected error occurred.
      */
-    @Test()
+    @Test
     public void testReadAddRecordWithoutChangeType() throws Exception {
         // @formatter:off
         LDIFChangeRecordReader reader = new LDIFChangeRecordReader(
@@ -663,7 +654,7 @@
      * @throws Exception
      *             if an unexpected error occurred.
      */
-    @Test()
+    @Test
     public void testReadModifyRecord() throws Exception {
         // @formatter:off
         LDIFChangeRecordReader reader = new LDIFChangeRecordReader(
@@ -766,7 +757,7 @@
      * @throws Exception
      *             if an unexpected error occurred.
      */
-    @Test()
+    @Test
     public void testReadModdnRecordWithoutNewSuperior() throws Exception {
         // @formatter:off
         LDIFChangeRecordReader reader = new LDIFChangeRecordReader(
@@ -794,7 +785,7 @@
      * @throws Exception
      *             if an unexpected error occurred.
      */
-    @Test()
+    @Test
     public void testReadModdnRecordWithNewSuperior() throws Exception {
         // @formatter:off
         LDIFChangeRecordReader reader = new LDIFChangeRecordReader(
@@ -823,9 +814,8 @@
      * @throws Exception
      *             if an unexpected error occurred.
      */
-    @Test()
+    @Test
     public void testRejectedRecordListenerMalformedFirstRecord() throws Exception {
-
         RejectedLDIFListener listener = mock(RejectedLDIFListener.class);
 
         // @formatter:off
@@ -854,9 +844,8 @@
      * @throws Exception
      *             if an unexpected error occurred.
      */
-    @Test()
+    @Test
     public void testRejectedRecordListenerMalformedSecondRecord() throws Exception {
-
         RejectedLDIFListener listener = mock(RejectedLDIFListener.class);
 
         // @formatter:off
@@ -892,7 +881,7 @@
      * @throws Exception
      *             if an unexpected error occurred.
      */
-    @Test()
+    @Test
     public void testRejectedRecordListenerSkipsRecord() throws Exception {
         RejectedLDIFListener listener = mock(RejectedLDIFListener.class);
 
@@ -923,7 +912,7 @@
      * @throws Exception
      *             if an unexpected error occurred.
      */
-    @Test()
+    @Test
     public void testRejectedRecordListenerRejectsBadSchemaRecord() throws Exception {
         RejectedLDIFListener listener = mock(RejectedLDIFListener.class);
 
@@ -959,7 +948,7 @@
      * @throws Exception
      *             if an unexpected error occurred.
      */
-    @Test()
+    @Test
     public void testRejectedRecordListenerWarnsBadSchemaRecord() throws Exception {
         RejectedLDIFListener listener = mock(RejectedLDIFListener.class);
 
@@ -1037,7 +1026,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testReadFileContainingSerieOfChanges() throws Exception {
         final File file = File.createTempFile("sdk", ".png");
         final String url = file.toURI().toURL().toString();
@@ -1123,7 +1112,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testParseChangeRecordEntryWithDeleteControl() throws Exception {
 
         // @formatter:off
@@ -1156,7 +1145,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testParseChangeRecordEntryWithAddControl() throws Exception {
 
         // @formatter:off
@@ -1214,7 +1203,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testParseChangeRecordEntryWithAddControlWithoutSpacesBetweenCriticalityValue()
             throws Exception {
 
@@ -1247,7 +1236,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testParseChangeRecordEntryWithAddControlContainingWhiteSpaces() throws Exception {
 
         // @formatter:off
@@ -1279,7 +1268,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testParseChangeRecordEntryWithAddControlContainingBase64Value() throws Exception {
 
         // @formatter:off
@@ -1333,7 +1322,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testParseChangeRecordEntryWithAddControlContainingURL() throws Exception {
         final File file = File.createTempFile("sdk", ".png");
         final String url = file.toURI().toURL().toString();
@@ -1391,7 +1380,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testParseChangeRecordEntryWithAddControlWithoutValue() throws Exception {
 
         // @formatter:off
@@ -1423,7 +1412,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testParseChangeRecordEntryWithAddControlWithoutCriticality() throws Exception {
 
         // @formatter:off
@@ -1455,7 +1444,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testParseChangeRecordEntryWithAddControlProvidedByChangeRecordWriter()
             throws Exception {
 
@@ -1487,7 +1476,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testParseChangeRecordEntryWithMultipleControls() throws Exception {
 
         // @formatter:off
@@ -1604,7 +1593,7 @@
      * @throws Exception
      *             if an unexpected error occurred.
      */
-    @Test()
+    @Test
     public void testParseDeleteChangeRecordEntry() throws Exception {
         // @formatter:off
         LDIFChangeRecordReader reader = new LDIFChangeRecordReader(
@@ -1651,7 +1640,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testParseModifyChangeRecordEntryDeleteMultipleValuableAttributes() throws Exception {
         // @formatter:off
         final LDIFChangeRecordReader reader = new LDIFChangeRecordReader(
@@ -1718,7 +1707,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testParseModifyChangeRecordBEREncodingRequired() throws Exception {
         // @formatter:off
         String validcert1 = // a valid certificate but wrong can be used => no errors
@@ -1798,7 +1787,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testParseModifyChangeRecordEntryReplaceOk() throws Exception {
 
         // @formatter:off
@@ -1960,7 +1949,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testParseModifyChangeRecordEntryIncrement() throws Exception {
         // @formatter:off
         final ChangeRecord cr = LDIFChangeRecordReader.valueOfLDIFChangeRecord(
@@ -1987,7 +1976,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testParseModifyDNChangeRecordEntryRecordBase64NewRDN() throws Exception {
 
         // @formatter:off
@@ -2016,7 +2005,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testParseModifyDNChangeRecordEntry() throws Exception {
         // @formatter:off
         final LDIFChangeRecordReader reader = new LDIFChangeRecordReader(
@@ -2191,7 +2180,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testParseModifyRecordEntryDeleteOldRDNFalse() throws Exception {
 
         // @formatter:off
@@ -2222,7 +2211,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testParseModifyRecordEntryNewSuperior() throws Exception {
         // @formatter:off
         LDIFChangeRecordReader reader = new LDIFChangeRecordReader(
@@ -2321,7 +2310,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testChangeRecordReaderUseListConstructor() throws Exception {
         // @formatter:off
         List<String> cr = Arrays.asList(
@@ -2508,9 +2497,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testValueOfLDIFChangeRecordStandardLDIF() throws Exception {
-
         // @formatter:off
         final ChangeRecord cr =
                 LDIFChangeRecordReader.valueOfLDIFChangeRecord(getStandardLDIFChangeRecord());
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java
index ed05752..e7eb016 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java
@@ -96,9 +96,8 @@
      * @throws Exception
      *             If the test failed unexpectedly.
      */
-    @Test()
+    @Test
     public void testSetExcludeAllOperationalAttributesTrue() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
 
@@ -123,9 +122,8 @@
      * @throws Exception
      *             If the test failed unexpectedly.
      */
-    @Test()
+    @Test
     public void testSetExcludeAllOperationalAttributesFalse() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
 
@@ -145,9 +143,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testSetExcludeAllUserAttributesTrue() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
 
@@ -168,9 +165,8 @@
      * @throws Exception
      *             If the test failed unexpectedly.
      */
-    @Test()
+    @Test
     public void testSetExcludeAllUserAttributesFalse() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
 
@@ -210,9 +206,8 @@
      * @throws Exception
      *             If the test failed unexpectedly.
      */
-    @Test()
+    @Test
     public void testSetExcludeBranchWrongDN() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
 
@@ -235,9 +230,8 @@
      * @throws Exception
      *             If the test failed unexpectedly.
      */
-    @Test()
+    @Test
     public void testSetExcludeBranchWithNoMatch() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
 
@@ -258,9 +252,8 @@
      * @throws Exception
      *             If the test failed unexpectedly.
      */
-    @Test()
+    @Test
     public void testSetExcludeBranchWithMatch() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
 
@@ -302,9 +295,8 @@
      * @throws Exception
      *             If the test failed unexpectedly.
      */
-    @Test()
+    @Test
     public void testSetExcludeAttributeWithMatch() throws Exception {
-
         final AttributeDescription attribute = AttributeDescription.valueOf("cn");
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
@@ -330,9 +322,8 @@
      * @throws Exception
      *             If the test failed unexpectedly.
      */
-    @Test()
+    @Test
     public void testSetExcludeAttributeWithNoMatch() throws Exception {
-
         final AttributeDescription attribute = AttributeDescription.valueOf("vip");
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
@@ -357,9 +348,8 @@
      * @throws Exception
      *             If the test failed unexpectedly.
      */
-    @Test()
+    @Test
     public void testSetIncludeAttributeWithMatch() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
 
@@ -384,9 +374,8 @@
      * @throws Exception
      *             If the test failed unexpectedly.
      */
-    @Test()
+    @Test
     public void testSetIncludeAttributeWithNoMatch() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
 
@@ -426,8 +415,7 @@
      *
      * @throws Exception
      *             If the test failed unexpectedly.
-     */
-    @Test()
+     */    @Test
     public void testSetIncludeBranchWithNoMatch() throws Exception {
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
@@ -450,7 +438,7 @@
      * @throws Exception
      *             If the test failed unexpectedly.
      */
-    @Test()
+    @Test
     public void testSetIncludeBranchWithMatch() throws Exception {
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
@@ -510,9 +498,8 @@
      * @throws Exception
      *             If the test failed unexpectedly.
      */
-    @Test()
+    @Test
     public void testWriteCommentUsingTheWrapFunction() throws Exception {
-
         final CharSequence comment = "Lorem ipsum dolor sit amet, consectetur adipisicing elit";
 
         final List<String> actual = new ArrayList<String>();
@@ -538,9 +525,8 @@
      * @throws Exception
      *             If the test failed unexpectedly.
      */
-    @Test()
+    @Test
     public void testWriteCommentUsingTheWrapFunctionShortComment() throws Exception {
-
         final CharSequence comment = "Lorem ipsum dolor";
 
         final List<String> actual = new ArrayList<String>();
@@ -565,9 +551,8 @@
      * @throws Exception
      *             If the test failed unexpectedly.
      */
-    @Test()
+    @Test
     public void testWriteCommentUsingTheWrapFunctionNoEmptySpace() throws Exception {
-
         final CharSequence comment = "Lorem ipsumdolorsitamet,consecteturadipisicingelit";
 
         final List<String> actual = new ArrayList<String>();
@@ -591,9 +576,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testWriteChangeRecord() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
 
@@ -620,9 +604,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testWriteAddRequest() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
 
@@ -639,9 +622,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testWriteAddRequestNoBranchExcluded() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
 
@@ -668,9 +650,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testWriteAddRequestBranchExcluded() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
 
@@ -694,9 +675,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testWriteAddRequestJpegAttributeOk() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
         final File file = File.createTempFile("sdk", ".jpeg");
@@ -729,9 +709,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testWriteAddBinaryRequest() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
 
@@ -759,9 +738,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testWriteAddBinaryNonAsciiRequest() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
 
@@ -789,9 +767,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testWriteDeleteRequestBranchExcluded() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
         // @formatter:off
@@ -814,9 +791,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testWriteDeleteRequestBranchNotExcluded() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
         // @formatter:off
@@ -843,9 +819,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testWriteDeleteRequest() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
 
@@ -870,9 +845,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testWriteDeleteRequestContainingControl() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
         final DN dn = DN.valueOf("uid=scarter,ou=People,dc=example,dc=com");
@@ -935,9 +909,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testWriteModdnRequest() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
 
@@ -962,9 +935,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testWriteModdnRequestNewSuperior() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
         // @formatter:off
@@ -991,9 +963,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testWriteModdnRequestDeleterdnFalse() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
         // @formatter:off
@@ -1019,9 +990,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testWriteModifyRequest() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
 
@@ -1051,9 +1021,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testWriteModifyRequestUsingControl() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
 
@@ -1081,9 +1050,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testWriteModifyRequestNoModifications() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
 
@@ -1107,9 +1075,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testWriteModifyRequestFilterAttributesExcluded() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
 
@@ -1139,9 +1106,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testWriteModifyRequestBranchExcludedNoMatch() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
 
@@ -1172,9 +1138,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testWriteModifyRequestBranchExcludedMatch() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
 
@@ -1202,9 +1167,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testWriteModifyDNRequestBranchExcludedNoMatch() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
 
@@ -1232,9 +1196,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testWriteModifyDNRequestBranchExcludedMatch() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
 
@@ -1261,9 +1224,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testWriteModifyDNRequest() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
 
@@ -1288,9 +1250,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testWriteMultipleChangeRecords() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
         final ChangeRecord changeRequest = Requests.newAddRequest(getAddLDIFChangeRecord());
@@ -1361,7 +1322,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testWriteMultipleChangesRecord() throws Exception {
         // @formatter:off
         final ChangeRecord changeRequest = Requests.newChangeRecord(
@@ -1391,9 +1352,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testWriteComment() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(actual);
 
@@ -1408,9 +1368,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testWriteChangeRecordFlushClose() throws Exception {
-
         final OutputStream mockOutput = mock(OutputStream.class);
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(mockOutput);
         try {
@@ -1431,9 +1390,8 @@
      * @throws Exception
      *             If the test failed unexpectedly.
      */
-    @Test()
+    @Test
     public void testWriteEntryOutputStreamUsingByteArrayOutputStream() throws Exception {
-
         final OutputStream out = new ByteArrayOutputStream();
         final LDIFChangeRecordWriter writer = new LDIFChangeRecordWriter(out);
 
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java
index ae47e51..c9ee50b 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java
@@ -136,9 +136,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testSetExcludeBranchWithMatch() throws Exception {
-
         final LDIFEntryReader reader = new LDIFEntryReader(getStandardEntry());
         reader.setExcludeBranch(DN.valueOf("dc=example,dc=org"));
         final Entry entry = reader.readEntry();
@@ -166,9 +165,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testSetExcludeAllUserAttributesFalse() throws Exception {
-
         final LDIFEntryReader reader = new LDIFEntryReader(getStandardEntry());
         reader.setExcludeAllUserAttributes(false);
         final Entry entry = reader.readEntry();
@@ -186,12 +184,11 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testSetExcludeAllUserAttributesTrue() throws Exception {
-
         final LDIFEntryReader reader = new LDIFEntryReader(getStandardEntry());
-
         reader.setExcludeAllUserAttributes(true);
+
         final Entry entry = reader.readEntry();
         reader.close();
 
@@ -213,9 +210,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testSetExcludeAttributeWithNoMatch() throws Exception {
-
         final LDIFEntryReader reader = new LDIFEntryReader(getStandardEntry());
         reader.setExcludeAttribute(AttributeDescription.valueOf("vip"));
 
@@ -234,9 +230,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testSetExcludeAttributeWithMatch() throws Exception {
-
         final LDIFEntryReader reader = new LDIFEntryReader(getStandardEntry());
 
         reader.setExcludeAttribute(AttributeDescription.valueOf("cn"));
@@ -276,9 +271,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testSetExcludeAllOperationalAttributesFalse() throws Exception {
-
         final LDIFEntryReader reader = new LDIFEntryReader(getStandardEntry());
 
         reader.setExcludeAllOperationalAttributes(false);
@@ -298,9 +292,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testSetExcludeAllOperationalAttributesTrue() throws Exception {
-
         final LDIFEntryReader reader = new LDIFEntryReader(getStandardEntry());
 
         reader.setExcludeAllOperationalAttributes(true);
@@ -337,9 +330,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testSetExcludeFilterWithMatch() throws Exception {
-
         final LDIFEntryReader reader = new LDIFEntryReader(getStandardEntry());
         final Filter filter = Filter.equality("objectclass", "vip");
         final Matcher excludeFilter = filter.matcher();
@@ -381,7 +373,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testSetIncludeAttributeWithMatch() throws Exception {
         final LDIFEntryReader reader = new LDIFEntryReader(getStandardEntry());
         reader.setIncludeAttribute(AttributeDescription.valueOf("cn"));
@@ -406,7 +398,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testSetIncludeAttributeWithNoMatch() throws Exception {
         final LDIFEntryReader reader = new LDIFEntryReader(getStandardEntry());
         reader.setIncludeAttribute(AttributeDescription.valueOf("manager"));
@@ -458,9 +450,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testSetIncludeBranchWithMatch() throws Exception {
-
         final LDIFEntryReader reader = new LDIFEntryReader(getStandardEntry());
         reader.setIncludeBranch(DN.valueOf("dc=example,dc=com"));
         final Entry entry = reader.readEntry();
@@ -514,9 +505,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testSetIncludeFilterWithMatch() throws Exception {
-
         final LDIFEntryReader reader = new LDIFEntryReader(getStandardEntry());
         final Filter filter = Filter.equality("objectclass", "person");
         final Matcher includeFilter = filter.matcher();
@@ -550,7 +540,7 @@
      * @throws Exception
      *             if an unexpected error occurred.
      */
-    @Test()
+    @Test
     public void testRejectedLDIFListenerMalformedFirstRecord() throws Exception {
         RejectedLDIFListener listener = mock(RejectedLDIFListener.class);
 
@@ -576,7 +566,7 @@
      * @throws Exception
      *             if an unexpected error occurred.
      */
-    @Test()
+    @Test
     public void testRejectedLDIFListenerMalformedSecondRecord() throws Exception {
         RejectedLDIFListener listener = mock(RejectedLDIFListener.class);
 
@@ -616,7 +606,7 @@
      * @throws Exception
      *             if an unexpected error occurred.
      */
-    @Test()
+    @Test
     public void testRejectedRecordListenerRejectsBadSchemaRecord() throws Exception {
         RejectedLDIFListener listener = mock(RejectedLDIFListener.class);
 
@@ -651,9 +641,8 @@
      * @throws Exception
      *             if an unexpected error occurred.
      */
-    @Test()
+    @Test
     public void testRejectedLDIFListenerWarnsBadSchemaRecord() throws Exception {
-
         RejectedLDIFListener listener = mock(RejectedLDIFListener.class);
 
         LDIFEntryReader reader =
@@ -684,9 +673,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testRejectedLDIFListenerSkipsRecord() throws Exception {
-
         RejectedLDIFListener listener = mock(RejectedLDIFListener.class);
 
         LDIFEntryReader reader = new LDIFEntryReader(getStandardEntry());
@@ -704,9 +692,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testSetRejectedLDIFListenerDoesAllowNull() throws Exception {
-
         final LDIFEntryReader reader = new LDIFEntryReader(getStandardEntry());
         reader.setRejectedLDIFListener(null);
         Entry entry = reader.readEntry();
@@ -750,9 +737,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testSetSchemaValidationPolicyDefaultAllowsEntry() throws Exception {
-
         // @formatter:off
         String[] strEntry = {
             "dn: uid=user.0,ou=People,dc=example,dc=com", "objectClass: person",
@@ -799,10 +785,9 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testSetSchemaSetSchemaValidationPolicyDefaultAllowsEntryWithNewAttribute()
             throws Exception {
-
         // @formatter:off
         final String[] strEntry = {
             "dn: uid=user.0,ou=People,dc=example,dc=com",
@@ -924,7 +909,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testReadEntryWithNoSpaces() throws Exception {
         // @formatter:off
         final String[] strEntry = {
@@ -961,7 +946,7 @@
     /**
      * Test to read an entry containing spaces before the attribute.
      */
-    @Test()
+    @Test
     public void testReadEntryWithAttributesSpacesAtStart() throws Exception {
         // @formatter:off
         final String[] strEntry = {
@@ -1102,9 +1087,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testLDIFEntryReaderFullEntry() throws Exception {
-
         // @formatter:off
         final String[] strEntry = {
             "version: 1",
@@ -1304,9 +1288,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testValueOfLDIFEntryReadEntryContainingURL() throws Exception {
-
         final File file = File.createTempFile("sdk", ".jpeg");
         final String url = file.toURI().toURL().toString();
 
@@ -1440,9 +1423,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testReadEntryBase64Encoded() throws Exception {
-
         // @formatter:off
         final LDIFEntryReader reader = new LDIFEntryReader(Arrays.asList(
             "version: 1",
@@ -1488,9 +1470,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testReadEntryBase64EncodedDN() throws Exception {
-
         // @formatter:off
         final LDIFEntryReader reader = new LDIFEntryReader(Arrays.asList(
             "dn::  dWlkPXJvZ2FzYXdhcmEsb3U95Za25qWt6YOoLG89QWlyaXVz", // adding space before ok, after : ko
@@ -1549,9 +1530,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testLDIFEntryReaderEntryAsArray() throws Exception {
-
         final LDIFEntryReader reader = new LDIFEntryReader(Arrays.asList(getStandardEntry()));
 
         try {
@@ -1653,7 +1633,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testValueOfLDIFEntryWellFormedEntry() throws Exception {
         // @formatter:off
         final Entry entry = LDIFEntryReader.valueOfLDIFEntry(
@@ -1675,9 +1655,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testValueOfLDIFEntryReadStandardEntry() throws Exception {
-
         final Entry entry = LDIFEntryReader.valueOfLDIFEntry(getStandardEntry());
 
         assertThat(entry).isNotNull();
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java
index e8cba29..0b7f135 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java
@@ -608,9 +608,8 @@
      * @throws Exception
      *             If the test failed unexpectedly.
      */
-    @Test()
+    @Test
     public void testWriteCommentUsingTheWrapFunction() throws Exception {
-
         final CharSequence comment = "Lorem ipsum dolor sit amet, consectetur adipisicing elit";
 
         final List<String> actual = new ArrayList<String>();
@@ -636,9 +635,8 @@
      * @throws Exception
      *             If the test failed unexpectedly.
      */
-    @Test()
+    @Test
     public void testWriteCommentUsingTheWrapFunctionShortComment() throws Exception {
-
         final CharSequence comment = "Lorem ipsum dolor";
 
         final List<String> actual = new ArrayList<String>();
@@ -663,9 +661,8 @@
      * @throws Exception
      *             If the test failed unexpectedly.
      */
-    @Test()
+    @Test
     public void testWriteCommentUsingTheWrapFunctionNoEmptySpace() throws Exception {
-
         final CharSequence comment = "Lorem ipsumdolorsitamet,consecteturadipisicingelit";
 
         final List<String> actual = new ArrayList<String>();
@@ -690,9 +687,8 @@
      * @throws Exception
      *             If the test failed unexpectedly.
      */
-    @Test()
+    @Test
     public void testWriteComment() throws Exception {
-
         final CharSequence comment1 = "This is a new comment";
         final CharSequence comment2 = "Another one";
 
@@ -734,9 +730,8 @@
      * @throws Exception
      *             If the test failed unexpectedly.
      */
-    @Test()
+    @Test
     public void testWriteEntryUsingStandardEntry() throws Exception {
-
         final List<String> actual = new ArrayList<String>();
         final LDIFEntryWriter writer = new LDIFEntryWriter(actual);
         final int wrapColumn = 15;
@@ -765,7 +760,7 @@
      * @throws Exception
      *             If the test failed unexpectedly.
      */
-    @Test()
+    @Test
     public void testWriteEntry() throws Exception {
         final Entry entry = new LinkedHashMapEntry("cn=John Doe,ou=people,dc=example,dc=com");
         entry.addAttribute("objectClass", "top", "person", "inetOrgPerson");
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java
index 17cf434..d5a6d23 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java
@@ -117,9 +117,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifSearchWithMatch() throws Exception {
-
         final EntryReader reader = new LDIFEntryReader(getStandardEntry());
         final SearchRequest sr =
                 Requests.newSearchRequest("dc=example,dc=com", SearchScope.WHOLE_SUBTREE,
@@ -140,9 +139,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifSearchWithNoMatch() throws Exception {
-
         final EntryReader reader = new LDIFEntryReader(getStandardEntry());
         final SearchRequest sr =
                 Requests.newSearchRequest("dc=example,dc=org", SearchScope.WHOLE_SUBTREE,
@@ -204,9 +202,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifSearchWithSchemaMatchNoAttributeDescription() throws Exception {
-
         // @formatter:off
         final EntryReader reader = new LDIFEntryReader(
             "dn: uid=user.0,ou=People,dc=example,dc=com",
@@ -238,10 +235,9 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifSearchWithSchemaMatchNoAttributeDescriptionTypeOnly()
             throws Exception {
-
         // @formatter:off
         final EntryReader reader = new LDIFEntryReader(
             "dn: uid=user.0,ou=People,dc=example,dc=com",
@@ -273,7 +269,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifSearchWithSchemaMatchFullAttributes() throws Exception {
 
         // @formatter:off
@@ -346,7 +342,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifSearchWithSchemaMatchOnlyOperationalAttributes() throws Exception {
 
         // @formatter:off
@@ -387,7 +383,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifSearchWithSchemaMatchOnlyOperationalAttributesTypeOnly()
             throws Exception {
 
@@ -427,7 +423,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifSearchWithSchemaMatchSpecifiedAttribute() throws Exception {
 
         // @formatter:off
@@ -492,7 +488,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifSearchWithSchemaNoMatchSpecifiedAttribute() throws Exception {
 
         // @formatter:off
@@ -649,7 +645,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifNewEntryCollectionReader() throws Exception {
 
         // @formatter:off
@@ -702,7 +698,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifNewEntryIteratorReader() throws Exception {
 
         // @formatter:off
@@ -757,7 +753,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifCopyToChangeRecord() throws Exception {
 
         // @formatter:off
@@ -831,7 +827,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifCopyToEntryWriter() throws Exception {
 
         // @formatter:off
@@ -898,7 +894,7 @@
      *      -1 result”>Admin Guide</a>
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifDiffEntriesModsOnSameDN() throws Exception {
 
         // @formatter:off
@@ -973,7 +969,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifDiffEntriesEntryInSourceNotInTarget() throws Exception {
 
         // @formatter:off
@@ -1021,7 +1017,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifDiffEntriesEntryInTargetNotInSource() throws Exception {
 
         // @formatter:off
@@ -1070,7 +1066,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifDiffEntriesNoDiff() throws Exception {
 
         // @formatter:off
@@ -1100,7 +1096,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifDiffEntriesShortExamples() throws Exception {
 
         // @formatter:off
@@ -1293,7 +1289,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifDiffEntriesNoDiffBase64() throws Exception {
 
         // @formatter:off
@@ -1349,7 +1345,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifPatchAddNoDiff() throws Exception {
         // @formatter:off
         final LDIFEntryReader input = new LDIFEntryReader(
@@ -1384,7 +1380,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifPatchAddDiff() throws Exception {
         // @formatter:off
         final LDIFEntryReader input = new LDIFEntryReader(
@@ -1421,7 +1417,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifPatchAddDiffNewEntry() throws Exception {
         // @formatter:off
         final LDIFEntryReader input = new LDIFEntryReader(
@@ -1475,7 +1471,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifPatchAddModifyNonExistantEntryDoNothing() throws Exception {
         // @formatter:off
         final LDIFEntryReader input = new LDIFEntryReader(
@@ -1508,7 +1504,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifPatchDeleteEntry() throws Exception {
         // @formatter:off
         final LDIFEntryReader input = new LDIFEntryReader(
@@ -1537,7 +1533,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifPatchDeleteEntryAmongSeveral() throws Exception {
         // @formatter:off
         final LDIFEntryReader input = new LDIFEntryReader(
@@ -1598,7 +1594,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifPatchDeleteAttributesEntry() throws Exception {
         // @formatter:off
         final LDIFEntryReader input = new LDIFEntryReader(
@@ -1644,7 +1640,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifPatchModifyEntry() throws Exception {
         // @formatter:off
         final LDIFEntryReader input = new LDIFEntryReader(
@@ -1678,7 +1674,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifPatchModifyDNEntryUppercaseUid() throws Exception {
         // @formatter:off
         final LDIFEntryReader input = new LDIFEntryReader(
@@ -1726,7 +1722,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifPatchModifyDNEntryUpperCaseDnNameSurname() throws Exception {
         // @formatter:off
         final LDIFEntryReader input = new LDIFEntryReader(
@@ -1775,7 +1771,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifPatchModifyDNEntry() throws Exception {
         // @formatter:off
         final LDIFEntryReader input = new LDIFEntryReader(
@@ -1819,7 +1815,7 @@
         reader.close();
     }
 
-    @Test()
+    @Test
     public final void testLdifPatchModifyDnEntry2() throws Exception {
         // @formatter:off
         final LDIFEntryReader input = new LDIFEntryReader(
@@ -1887,7 +1883,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifPatchModifyDnEntryBranch() throws Exception {
         // @formatter:off
         final LDIFEntryReader input = new LDIFEntryReader(
@@ -1983,7 +1979,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifPatchModifyDnEntryBranchKeepsOldRdn() throws Exception {
         // @formatter:off
         final LDIFEntryReader input = new LDIFEntryReader(
@@ -2078,7 +2074,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifPatchModifyDnEntryNewSuperior() throws Exception {
         // @formatter:off
         final LDIFEntryReader input = new LDIFEntryReader(
@@ -2135,7 +2131,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifPatchAddReplace() throws Exception {
         // @formatter:off
         final LDIFEntryReader input = new LDIFEntryReader(
@@ -2174,7 +2170,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifPatchAddReplaceLanguageTagExample() throws Exception {
         // @formatter:off
         final LDIFEntryReader input = new LDIFEntryReader(
@@ -2216,7 +2212,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifPatchVariousChanges() throws Exception {
         // @formatter:off
         final LDIFEntryReader input = new LDIFEntryReader(
@@ -2327,7 +2323,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testLdifPatchContainingChanges() throws Exception {
         // @formatter:off
         final LDIFEntryReader input = new LDIFEntryReader(
@@ -2510,9 +2506,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testOverwritePatchOnModifyRequestSucceedsEvenIfWrongDN() throws Exception {
-
         final RejectedChangeRecordListener listener = RejectedChangeRecordListener.OVERWRITE;
         // @formatter:off
         final LDIFEntryReader input = new LDIFEntryReader(
@@ -2593,7 +2588,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testOverwritePatchOnModifyDNRequestSucceedsEvenWithWrongDN() throws Exception {
         final RejectedChangeRecordListener listener = RejectedChangeRecordListener.OVERWRITE;
         // @formatter:off
@@ -2685,7 +2680,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public final void testOverwritePatchOnModifyDNRequestSucceedsEvenWithDuplicateEntry() throws Exception {
         final RejectedChangeRecordListener listener = RejectedChangeRecordListener.OVERWRITE;
         // @formatter:off
diff --git a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListenerTestCase.java b/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListenerTestCase.java
index 05cc7a8..4bc9740 100644
--- a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListenerTestCase.java
+++ b/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListenerTestCase.java
@@ -209,7 +209,7 @@
     /**
      * Disables logging before the tests.
      */
-    @BeforeClass()
+    @BeforeClass
     public void disableLogging() {
         TestCaseUtils.setDefaultLogLevel(Level.SEVERE);
     }
@@ -217,7 +217,7 @@
     /**
      * Re-enable logging after the tests.
      */
-    @AfterClass()
+    @AfterClass
     public void enableLogging() {
         TestCaseUtils.setDefaultLogLevel(Level.INFO);
     }
diff --git a/opendj-server/src/main/java/org/forgerock/opendj/server/setup/model/RuntimeOptions.java b/opendj-server/src/main/java/org/forgerock/opendj/server/setup/model/RuntimeOptions.java
index 05224b0..286d524 100644
--- a/opendj-server/src/main/java/org/forgerock/opendj/server/setup/model/RuntimeOptions.java
+++ b/opendj-server/src/main/java/org/forgerock/opendj/server/setup/model/RuntimeOptions.java
@@ -105,7 +105,7 @@
     }
 
     /** {@inheritDoc} */
-    @Override()
+    @Override
     public boolean equals(Object o) {
         if (o == this) {
             return true;
@@ -128,7 +128,7 @@
     }
 
     /** {@inheritDoc} */
-    @Override()
+    @Override
     public int hashCode() {
         int hashCode = 44 + initialMemory + maximumMemory;
         for (String arg : additionalArguments) {
@@ -138,7 +138,7 @@
     }
 
     /** {@inheritDoc} */
-    @Override()
+    @Override
     public String toString() {
         final StringBuilder sb = new StringBuilder();
         sb.append("Initial Memory: ").append(initialMemory).append("  Max Memory: ").append(maximumMemory);
diff --git a/opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/CertificateTestCase.java b/opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/CertificateTestCase.java
index e180b77..270bc9b 100644
--- a/opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/CertificateTestCase.java
+++ b/opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/CertificateTestCase.java
@@ -39,7 +39,7 @@
     /**
      * Default is a self-signed certificate.
      */
-    @Test()
+    @Test
     public void testGetDefault() {
         final Certificate cert = new Certificate();
         assertThat(cert.getType()).isEqualTo(CertificateType.SELF_SIGNED);
@@ -47,7 +47,7 @@
         assertThat(cert.getKeyStorePin()).isEmpty();
     }
 
-    @Test()
+    @Test
     public void testValidateDefaultCertificate() throws ConfigException {
         final Certificate cert = new Certificate();
         cert.validate();
@@ -111,7 +111,7 @@
      * @throws IOException
      *             If an exception occurs when creating the temp keystore.
      */
-    @Test()
+    @Test
     public void testValidateJKSCertificate() throws ConfigException, IOException {
         final Certificate cert = new Certificate();
         cert.setType(CertificateType.JKS);
diff --git a/opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/DataConfigurationTestCase.java b/opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/DataConfigurationTestCase.java
index b0b4e80..5a08be0 100644
--- a/opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/DataConfigurationTestCase.java
+++ b/opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/DataConfigurationTestCase.java
@@ -43,7 +43,7 @@
     /**
      * Creates a default data configuration.
      */
-    @Test()
+    @Test
     public void testGetDefaultDataConfiguration() {
         final DataConfiguration data = new DataConfiguration();
         assertThat(data.getDirectoryBaseDN()).isEqualTo(DataConfiguration.DEFAULT_DIRECTORY_BASE_DN);
@@ -61,7 +61,7 @@
      *
      * @throws IOException
      */
-    @Test()
+    @Test
     public void testCustomDataConfiguration() throws IOException {
         final DataConfiguration data = new DataConfiguration();
         final int userEntries = 300;
@@ -94,7 +94,7 @@
     /**
      * Tests the type of the data configuration to make sure the boolean types are correctly assigned.
      */
-    @Test()
+    @Test
     public void testDataConfigurationType() {
         final DataConfiguration data = new DataConfiguration();
         assertTrue(data.isAutomaticallyImportGenerated());
diff --git a/opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/ListenerSettingsTestCase.java b/opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/ListenerSettingsTestCase.java
index cda9940..2d7f26d 100644
--- a/opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/ListenerSettingsTestCase.java
+++ b/opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/ListenerSettingsTestCase.java
@@ -41,7 +41,7 @@
     /**
      * Retrieves default settings.
      */
-    @Test()
+    @Test
     public void testGetDefault() {
         final ListenerSettings dsSettings = new ListenerSettings();
         assertThat(dsSettings.getAdminPort()).isEqualTo(DEFAULT_ADMIN_PORT);
@@ -68,7 +68,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testGetFreePort() throws Exception {
         // Finds a free socket
         final InetSocketAddress isa = TestCaseUtils.findFreeSocketAddress();
diff --git a/opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/ModelTestCase.java b/opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/ModelTestCase.java
index 4a26887..425ea16 100644
--- a/opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/ModelTestCase.java
+++ b/opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/ModelTestCase.java
@@ -51,7 +51,7 @@
      *
      * @throws ConfigException
      */
-    @Test()
+    @Test
     public void testCreateDefaultDS() throws ConfigException {
         final Model ds = new DataStoreModel();
 
@@ -170,7 +170,7 @@
      * @throws IOException
      *             If an error occurred when the temporary file is created.
      */
-    @Test()
+    @Test
     public void testIsValidDSAllowsPasswordFile() throws ConfigException, IOException {
         final Model ds = new DataStoreModel();
         File passwordFile = null;
@@ -189,14 +189,14 @@
         ds.validate();
     }
 
-    @Test()
+    @Test
     public void testCreateDSAllowsNullCertificate() throws ConfigException {
         final Model ds = new DataStoreModel();
         ds.getListenerSettings().setCertificate(null);
         assertFalse(ds.isSecure());
     }
 
-    @Test()
+    @Test
     public void testCreateSecureDS() throws ConfigException {
         final Model ds = new DataStoreModel();
         final Certificate cert = new Certificate();
@@ -361,7 +361,7 @@
      * @throws ConfigException
      *             If a configuration exception occurs.
      */
-    @Test()
+    @Test
     public void testCreateDSFirstInTopology() throws ConfigException {
         final Model ds = new DataStoreModel();
         ds.getListenerSettings().setPassword("password");
@@ -388,7 +388,7 @@
      * @throws ConfigException
      *             If a configuration exception occurs.
      */
-    @Test()
+    @Test
     public void testCreateDefaultDSWithLicense() throws ConfigException {
         final Model ds = new DataStoreModel();
         final String license = "This is a CDDL License";
diff --git a/opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/RuntimeOptionsTestCase.java b/opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/RuntimeOptionsTestCase.java
index fae17a5..e3ff28d 100644
--- a/opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/RuntimeOptionsTestCase.java
+++ b/opendj-server/src/test/java/org/forgerock/opendj/server/setup/model/RuntimeOptionsTestCase.java
@@ -36,7 +36,7 @@
  */
 public class RuntimeOptionsTestCase  extends AbstractSetupTestCase {
 
-    @Test()
+    @Test
     public void testGetDefault() {
         final RuntimeOptions options = RuntimeOptions.getDefault();
         assertThat(options.getInitialMemory()).isEqualTo(INITIAL_MEMORY);
@@ -52,7 +52,7 @@
         options.setAdditionalArguments((String[]) null);
     }
 
-    @Test()
+    @Test
     public void testEqualitySucceed() {
         final RuntimeOptions options = RuntimeOptions.getDefault();
         assertThat(options.getInitialMemory()).isEqualTo(INITIAL_MEMORY);
@@ -67,7 +67,7 @@
         assertThat(options).isEqualTo(options2);
     }
 
-    @Test()
+    @Test
     public void testEqualityFails() {
         final RuntimeOptions options = RuntimeOptions.getDefault();
         assertThat(options.getInitialMemory()).isEqualTo(INITIAL_MEMORY);
@@ -82,7 +82,7 @@
         assertThat(options).isNotEqualTo(options2);
     }
 
-    @Test()
+    @Test
     public void testRuntimeOptionsToString() {
 
         final RuntimeOptions options = new RuntimeOptions();
diff --git a/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/AdaptersTestCase.java b/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/AdaptersTestCase.java
index 655d623..d0cc6e2 100644
--- a/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/AdaptersTestCase.java
+++ b/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/AdaptersTestCase.java
@@ -82,7 +82,7 @@
  * This class defines a set of tests for the Adapters.class.
  */
 @SuppressWarnings("javadoc")
-@Test()
+@Test
 public class AdaptersTestCase extends ForgeRockTestCase {
 
     /**
@@ -211,7 +211,7 @@
      *
      * @throws LdapException
      */
-    @Test()
+    @Test
     public void testSimpleLDAPConnectionFactorySimpleBind() throws LdapException {
         final LDAPConnectionFactory factory =
                 new LDAPConnectionFactory("localhost",
@@ -236,7 +236,7 @@
      * @throws GeneralSecurityException
      * @throws LdapException
      */
-    @Test()
+    @Test
     public void testLDAPSASLBind() throws NumberFormatException, GeneralSecurityException, LdapException {
         LDAPConnectionFactory factory =
                 new LDAPConnectionFactory("localhost",
@@ -260,7 +260,7 @@
      *
      * @throws LdapException
      */
-    @Test()
+    @Test
     public void testAdapterConnectionSASLBindRequest() throws LdapException,
             GeneralSecurityException {
         final Connection connection = Adapters.newRootConnection();
@@ -297,9 +297,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testAdapterConnectionSimpleBindAsRoot() throws Exception {
-
         final Connection connection = Adapters.newRootConnection();
         final BindResult result = connection.bind("cn=Directory Manager", "password".toCharArray());
         assertThat(connection.isValid()).isTrue();
@@ -312,7 +311,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testAdapterConnectionSimpleBindAsAUser() throws Exception {
         // user
         final Connection connection =
@@ -346,7 +345,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testAdapterConnectionSimpleBind() throws Exception {
         // Anonymous
         final Connection connection = Adapters.newAnonymousConnection();
@@ -360,7 +359,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testAdapterAddRequest() throws Exception {
         final Connection connection = Adapters.newRootConnection();
         // @formatter:off
@@ -419,9 +418,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testAdapterSearchRequest() throws Exception {
-
         final Connection connection = Adapters.newRootConnection();
 
         final SearchRequest request =
@@ -612,9 +610,8 @@
      *
      * @throws LdapException
      */
-    @Test()
+    @Test
     public void testAdapterDeleteRequest() throws LdapException {
-
         final Connection connection = Adapters.newRootConnection();
         // Checks if the entry exists.
         SearchResultEntry sre =
@@ -645,9 +642,8 @@
      * @throws LdapException
      * @throws DecodeException
      */
-    @Test()
+    @Test
     public void testAdapterModifyRequest() throws LdapException, DecodeException {
-
         final ModifyRequest changeRequest =
                 Requests.newModifyRequest("uid=user.2, dc=example,dc=org").addControl(
                         PreReadRequestControl.newControl(true, "mail")).addModification(
@@ -979,7 +975,7 @@
      * @throws LdapException
      * @throws SearchResultReferenceIOException
      */
-    @Test()
+    @Test
     public void testLDAPConnectionAndAdapterComparison() throws LdapException, SearchResultReferenceIOException {
         // @formatter:off
         final AddRequest addRequest = Requests.newAddRequest(
diff --git a/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/ConvertersTestCase.java b/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/ConvertersTestCase.java
index b65d99b..85ca9d8 100644
--- a/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/ConvertersTestCase.java
+++ b/opendj-server2x-adapter/src/test/java/org/forgerock/opendj/adapter/server2x/ConvertersTestCase.java
@@ -91,7 +91,7 @@
  * </pre>
  */
 @SuppressWarnings("javadoc")
-@Test()
+@Test
 public class ConvertersTestCase extends ForgeRockTestCase {
 
     /**
@@ -118,7 +118,7 @@
      * Converts a SDK {@link SearchResultEntry} to an LDAP Server
      * {@link SearchResultEntry}.
      */
-    @Test()
+    @Test
     public final void testToSearchResultEntry() throws Exception {
         org.forgerock.opendj.ldap.responses.SearchResultEntry entry =
             Responses.newSearchResultEntry(org.forgerock.opendj.ldap.DN
@@ -166,7 +166,7 @@
      *
      * @throws DirectoryException
      */
-    @Test()
+    @Test
     public final void testToByteString() throws DirectoryException {
         org.forgerock.opendj.ldap.ByteString sdkByteString = ByteString.valueOf("This is a test");
 
@@ -179,7 +179,7 @@
      *
      * @throws DirectoryException
      */
-    @Test()
+    @Test
     public final void testToDeferencePolicy() {
         org.forgerock.opendj.ldap.DereferenceAliasesPolicy sdkDeferenceAliasesPolicy =
                 org.forgerock.opendj.ldap.DereferenceAliasesPolicy.ALWAYS;
@@ -194,9 +194,8 @@
      *
      * @throws DirectoryException
      */
-    @Test()
+    @Test
     public final void testToControl() throws DirectoryException {
-
         final PersistentSearchRequestControl control =
                 PersistentSearchRequestControl.newControl(false, true,
                         true, // isCritical, changesOnly, returnECs
@@ -228,7 +227,7 @@
      *
      * @throws DirectoryException
      */
-    @Test()
+    @Test
     public final void testToListOfControl() throws DirectoryException {
         List<org.forgerock.opendj.ldap.controls.Control> mySDKControlsList =
             generateSdkControlsList();
@@ -272,7 +271,7 @@
     /**
      * Converts an SDK attribute to an LDAP server attribute.
      */
-    @Test()
+    @Test
     public final void testToRawAttribute() throws DirectoryException {
         org.forgerock.opendj.ldap.Attribute attribute = new LinkedAttribute("test", "value1");
 
@@ -368,7 +367,7 @@
     /**
      * Converts a SDK modification to an LDAP server raw modification.
      */
-    @Test()
+    @Test
     public final void testToRawModification() {
         org.forgerock.opendj.ldap.Attribute attribute =
                 new LinkedAttribute("test", ByteString.valueOf("value1"), ByteString
@@ -407,7 +406,7 @@
     /**
      * Converts a SDK filter to an LDAP server filter.
      */
-    @Test()
+    @Test
     public final void testToFilter() throws LDAPException {
         Filter filter = Filter.valueOf("!(description=*)");
         org.opends.server.protocols.ldap.LDAPFilter srvFilter =
@@ -427,7 +426,7 @@
      * Converts a SDK search result reference to a LDAP server search result
      * reference.
      */
-    @Test()
+    @Test
     public final void testToSearchResultReference() throws LDAPException {
         String uri = "ldap://hostb/OU=People,O=MNN,C=WW??sub";
         final org.forgerock.opendj.ldap.responses.SearchResultReference sdkSearchResultReference =
@@ -447,7 +446,6 @@
      */
     @Test(groups = { "needRunningServer" })
     public final void testFromAttribute() throws DirectoryException {
-
         final org.opends.server.types.Attribute srvAttribute = Attributes.create("CN", "JOHN DOE");
         final org.forgerock.opendj.ldap.Attribute sdkAttribute = from(srvAttribute);
 
@@ -461,7 +459,6 @@
      */
     @Test(groups = { "needRunningServer" })
     public final void testFromAttributeUsingBinary() throws DirectoryException {
-
         byte[] data = { 0x00, 0x01, 0x02, (byte) 0xff };
 
         AttributeValue value = AttributeValues.create(org.opends.server.types.ByteString.wrap(data),
@@ -473,7 +470,7 @@
     /**
      * Converts an LDAP byte string to an SDK byte string.
      */
-    @Test()
+    @Test
     public final void testFromByteString() throws LDAPException {
         String str = "This is a test";
         org.opends.server.types.ByteString srvByteString =
@@ -487,7 +484,7 @@
     /**
      * Converts an LDAP control to an SDK control.
      */
-    @Test()
+    @Test
     public static void testFromLDAPControl() {
         org.opends.server.protocols.ldap.LDAPControl ldapControl =
                 new LDAPControl("1.2.3.4", false, to("myData"));
@@ -502,7 +499,7 @@
     /**
      * Converts a server control to an SDK control.
      */
-    @Test()
+    @Test
     public static void testFromControl() {
         final org.opends.server.types.Control control =
                 new LDAPControl("1.2.3.4", false, to("myData"));
diff --git a/opendj-server3x-adapter/src/test/java/org/forgerock/opendj/adapter/server3x/AdaptersTestCase.java b/opendj-server3x-adapter/src/test/java/org/forgerock/opendj/adapter/server3x/AdaptersTestCase.java
index cd22057..87acf0d 100644
--- a/opendj-server3x-adapter/src/test/java/org/forgerock/opendj/adapter/server3x/AdaptersTestCase.java
+++ b/opendj-server3x-adapter/src/test/java/org/forgerock/opendj/adapter/server3x/AdaptersTestCase.java
@@ -82,7 +82,7 @@
  * This class defines a set of tests for the Adapters.class.
  */
 @SuppressWarnings("javadoc")
-@Test()
+@Test
 public class AdaptersTestCase extends ForgeRockTestCase {
 
     /**
@@ -211,7 +211,7 @@
      *
      * @throws LdapException
      */
-    @Test()
+    @Test
     public void testSimpleLDAPConnectionFactorySimpleBind() throws LdapException {
         final LDAPConnectionFactory factory =
                 new LDAPConnectionFactory("localhost",
@@ -236,7 +236,7 @@
      * @throws GeneralSecurityException
      * @throws LdapException
      */
-    @Test()
+    @Test
     public void testLDAPSASLBind() throws NumberFormatException, GeneralSecurityException, LdapException {
         LDAPConnectionFactory factory =
                 new LDAPConnectionFactory("localhost",
@@ -260,7 +260,7 @@
      *
      * @throws LdapException
      */
-    @Test()
+    @Test
     public void testAdapterConnectionSASLBindRequest() throws LdapException,
             GeneralSecurityException {
         final Connection connection = Adapters.newRootConnection();
@@ -297,9 +297,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testAdapterConnectionSimpleBindAsRoot() throws Exception {
-
         final Connection connection = Adapters.newRootConnection();
         final BindResult result = connection.bind("cn=Directory Manager", "password".toCharArray());
         assertThat(connection.isValid()).isTrue();
@@ -312,7 +311,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testAdapterConnectionSimpleBindAsAUser() throws Exception {
         // user
         final Connection connection =
@@ -346,7 +345,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testAdapterConnectionSimpleBind() throws Exception {
         // Anonymous
         final Connection connection = Adapters.newAnonymousConnection();
@@ -360,7 +359,7 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testAdapterAddRequest() throws Exception {
         final Connection connection = Adapters.newRootConnection();
         // @formatter:off
@@ -419,9 +418,8 @@
      *
      * @throws Exception
      */
-    @Test()
+    @Test
     public void testAdapterSearchRequest() throws Exception {
-
         final Connection connection = Adapters.newRootConnection();
 
         final SearchRequest request =
@@ -612,9 +610,8 @@
      *
      * @throws LdapException
      */
-    @Test()
+    @Test
     public void testAdapterDeleteRequest() throws LdapException {
-
         final Connection connection = Adapters.newRootConnection();
         // Checks if the entry exists.
         SearchResultEntry sre =
@@ -645,9 +642,8 @@
      * @throws LdapException
      * @throws DecodeException
      */
-    @Test()
+    @Test
     public void testAdapterModifyRequest() throws LdapException, DecodeException {
-
         final ModifyRequest changeRequest =
                 Requests.newModifyRequest("uid=user.2, dc=example,dc=org").addControl(
                         PreReadRequestControl.newControl(true, "mail")).addModification(
@@ -979,7 +975,7 @@
      * @throws LdapException
      * @throws SearchResultReferenceIOException
      */
-    @Test()
+    @Test
     public void testLDAPConnectionAndAdapterComparison() throws LdapException, SearchResultReferenceIOException {
         // @formatter:off
         final AddRequest addRequest = Requests.newAddRequest(
diff --git a/opendj-server3x-adapter/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java b/opendj-server3x-adapter/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java
index 6d2f26d..d73581f 100644
--- a/opendj-server3x-adapter/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java
+++ b/opendj-server3x-adapter/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java
@@ -90,7 +90,7 @@
  * </pre>
  */
 @SuppressWarnings("javadoc")
-@Test()
+@Test
 public class ConvertersTestCase extends ForgeRockTestCase {
 
     /**
@@ -117,7 +117,7 @@
      * Converts a SDK {@link SearchResultEntry} to an LDAP Server
      * {@link SearchResultEntry}.
      */
-    @Test()
+    @Test
     public final void testToSearchResultEntry() throws Exception {
         org.forgerock.opendj.ldap.responses.SearchResultEntry entry =
             Responses.newSearchResultEntry(org.forgerock.opendj.ldap.DN
@@ -138,7 +138,7 @@
      * Converts a SDK {@link Entry} to an LDAP Server
      * {@link Entry}.
      */
-    @Test()
+    @Test
     public final void testToEntry() throws Exception {
         org.forgerock.opendj.ldap.Entry entry =
             new LinkedHashMapEntry(org.forgerock.opendj.ldap.DN
@@ -182,7 +182,7 @@
      *
      * @throws DirectoryException
      */
-    @Test()
+    @Test
     public final void testToControl() throws DirectoryException {
         final PersistentSearchRequestControl control =
                 PersistentSearchRequestControl.newControl(false, true,
@@ -215,7 +215,7 @@
      *
      * @throws DirectoryException
      */
-    @Test()
+    @Test
     public final void testToListOfControl() throws DirectoryException {
         List<org.forgerock.opendj.ldap.controls.Control> mySDKControlsList =
             generateSdkControlsList();
@@ -259,7 +259,7 @@
     /**
      * Converts an SDK attribute to an LDAP server attribute.
      */
-    @Test()
+    @Test
     public final void testToRawAttribute() throws DirectoryException {
         org.forgerock.opendj.ldap.Attribute attribute = new LinkedAttribute("test", "value1");
 
@@ -355,7 +355,7 @@
     /**
      * Converts a SDK modification to an LDAP server raw modification.
      */
-    @Test()
+    @Test
     public final void testToRawModification() {
         org.forgerock.opendj.ldap.Attribute attribute =
                 new LinkedAttribute("test", ByteString.valueOf("value1"), ByteString
@@ -394,7 +394,7 @@
     /**
      * Converts a SDK filter to an LDAP server filter.
      */
-    @Test()
+    @Test
     public final void testToFilter() throws LDAPException {
         Filter filter = Filter.valueOf("!(description=*)");
         org.opends.server.protocols.ldap.LDAPFilter srvFilter =
@@ -414,7 +414,7 @@
      * Converts a SDK search result reference to a LDAP server search result
      * reference.
      */
-    @Test()
+    @Test
     public final void testToSearchResultReference() throws LDAPException {
         String uri = "ldap://hostb/OU=People,O=MNN,C=WW??sub";
         final org.forgerock.opendj.ldap.responses.SearchResultReference sdkSearchResultReference =
@@ -457,7 +457,7 @@
     /**
      * Converts an LDAP control to an SDK control.
      */
-    @Test()
+    @Test
     public static void testFromLDAPControl() {
         org.opends.server.protocols.ldap.LDAPControl ldapControl =
                 new LDAPControl("1.2.3.4", false, ByteString.valueOf("myData"));
@@ -472,7 +472,7 @@
     /**
      * Converts an Scope to an SDK Scope.
      */
-    @Test()
+    @Test
     public static void testFromScope() {
         // WHOLE SUBTREE
         assertThat(org.forgerock.opendj.ldap.SearchScope.WHOLE_SUBTREE).isEqualTo(from(Scope.WHOLE_SUBTREE));
@@ -487,7 +487,7 @@
     /**
      * Converts a server control to an SDK control.
      */
-    @Test()
+    @Test
     public static void testFromControl() {
         final org.opends.server.types.Control control =
                 new LDAPControl("1.2.3.4", false, ByteString.valueOf("myData"));
@@ -504,7 +504,7 @@
      *
      * @throws DirectoryException
      */
-    @Test()
+    @Test
     public final void testFromDN() throws DirectoryException {
         final String dnString = "uid=scarter,ou=People,dc=example,dc=com";
         org.opends.server.types.DN srvDN = org.opends.server.types.DN.valueOf(dnString);

--
Gitblit v1.10.0