From 310df200f78f7d98cc52e4ab97d8a5feb744fa52 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 28 Apr 2016 09:04:35 +0000
Subject: [PATCH] UCDetector and AutoRefactor code cleanup
---
opendj-server-legacy/src/test/java/org/opends/server/extensions/TLSByteChannelTestCase.java | 31 +++++++------------------------
1 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/extensions/TLSByteChannelTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/TLSByteChannelTestCase.java
index 5921e22..2837674 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/extensions/TLSByteChannelTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/TLSByteChannelTestCase.java
@@ -11,7 +11,7 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Copyright 2012-2015 ForgeRock AS.
+ * Copyright 2012-2016 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -35,22 +35,16 @@
import javax.xml.xpath.XPathFactory;
import org.opends.server.DirectoryServerTestCase;
-import org.opends.server.util.StaticUtils;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
-/**
- * Tests for {@link TLSByteChannel} class.
- */
-@Test(groups = { "slow" }, sequential = true)
+/** Tests for {@link TLSByteChannel} class. */
+@Test(groups = "slow", sequential = true)
public class TLSByteChannelTestCase extends DirectoryServerTestCase
{
-
- /**
- * Cipher suite hardcoded from the IANA registry on internet.
- */
+ /** Cipher suite hardcoded from the IANA registry on internet. */
static final String[][] HARDCODED_CIPHER_SUITE = new String[][] {
{ "TLS_NULL_WITH_NULL_NULL" },
{ "TLS_RSA_WITH_NULL_MD5" },
@@ -378,9 +372,8 @@
String url =
"http://www.iana.org/assignments/tls-parameters/tls-parameters.xml";
URLConnection conn = new URL(url).openConnection();
- BufferedInputStream bis = new BufferedInputStream(conn.getInputStream());
- try
+ try (BufferedInputStream bis = new BufferedInputStream(conn.getInputStream()))
{
// JAXP boilerplate
DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
@@ -395,10 +388,6 @@
List<String> realCiphers = retrieveRealCiphers(doc, xpath, xPathExpr);
return toDataProviderResult(realCiphers);
}
- finally
- {
- StaticUtils.close(bis);
- }
}
private String[][] toDataProviderResult(List<String> realCiphers)
@@ -496,9 +485,7 @@
.getSSF("TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA"));
}
- /**
- * Ensures that no new overlapping cipher strings are added to the cipher map.
- */
+ /** Ensures that no new overlapping cipher strings are added to the cipher map. */
@Test
public void checkNoUnknownOverlappingCiphers()
{
@@ -520,15 +507,11 @@
}
}
- /**
- * Ensure the set (cipher1, cipher2) is different from the set (match1,
- * match2).
- */
+ /** Ensure the set (cipher1, cipher2) is different from the set (match1, match2). */
private boolean not(String cipher1, String cipher2, String match1,
String match2)
{
return (!cipher1.equals(match1) || !cipher2.equals(match2))
&& (!cipher2.equals(match1) || !cipher1.equals(match2));
}
-
}
--
Gitblit v1.10.0