From e485aca509e24e99e4916ede40b4e1900c3ba59f Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 10 Feb 2014 10:47:02 +0000
Subject: [PATCH] StaticUtilsTestCase.java: Extracted DataProvider methods.
---
opendj-sdk/opendj-core/src/test/java/com/forgerock/opendj/util/StaticUtilsTestCase.java | 74 ++++++++++++++++++++----------------
1 files changed, 41 insertions(+), 33 deletions(-)
diff --git a/opendj-sdk/opendj-core/src/test/java/com/forgerock/opendj/util/StaticUtilsTestCase.java b/opendj-sdk/opendj-core/src/test/java/com/forgerock/opendj/util/StaticUtilsTestCase.java
index effeb01..92db93d 100644
--- a/opendj-sdk/opendj-core/src/test/java/com/forgerock/opendj/util/StaticUtilsTestCase.java
+++ b/opendj-sdk/opendj-core/src/test/java/com/forgerock/opendj/util/StaticUtilsTestCase.java
@@ -22,14 +22,10 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
+ * Portions copyright 2014 ForgeRock AS
*/
-
package com.forgerock.opendj.util;
-import static com.forgerock.opendj.util.StaticUtils.*;
-
-import static org.fest.assertions.Assertions.*;
-
import java.lang.reflect.InvocationTargetException;
import java.util.Calendar;
import java.util.Date;
@@ -40,6 +36,10 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
+import static com.forgerock.opendj.util.StaticUtils.*;
+
+import static org.fest.assertions.Assertions.*;
+
/**
* Test {@code StaticUtils}.
*/
@@ -197,37 +197,45 @@
}
}
- @Test
- public void testStackTraceToSingleLineLimitedStack() throws Exception {
- String trace = stackTraceToSingleLineString(
- new InvocationTargetException(new RuntimeException("message")), false);
- assertThat(trace).as("case 1").startsWith("message (StaticUtilsTestCase.java");
- assertThat(trace).as("case 1").endsWith("...)");
-
- trace = stackTraceToSingleLineString(new RuntimeException("message"), false);
- assertThat(trace).as("case 2").startsWith("message (StaticUtilsTestCase.java");
- assertThat(trace).as("case 2").endsWith("...)");
-
- trace = stackTraceToSingleLineString(new RuntimeException(""), false);
- assertThat(trace).as("case 3").startsWith("RuntimeException (StaticUtilsTestCase.java");
- assertThat(trace).as("case 3").endsWith("...)");
+ @DataProvider
+ public Object[][] stackTraceToSingleLineLimitedStackProvider() {
+ return new Object[][] {
+ { new InvocationTargetException(new RuntimeException("message")), "message (StaticUtilsTestCase.java" },
+ { new RuntimeException("message"), "message (StaticUtilsTestCase.java" },
+ { new RuntimeException(""), "RuntimeException (StaticUtilsTestCase.java" },
+ { new RuntimeException(), "RuntimeException (StaticUtilsTestCase.java" },
+ };
}
- @Test
- public void testStackTraceToSingleLineFullStack() throws Exception {
- String trace = stackTraceToSingleLineString(
- new InvocationTargetException(new RuntimeException("message")), true);
- assertThat(trace).as("case 1").startsWith(
- "java.lang.reflect.InvocationTargetException / StaticUtilsTestCase.java:");
- assertThat(trace).as("case 1").contains("message");
- assertThat(trace).as("case 1").doesNotContain("...)");
+ @Test(dataProvider = "stackTraceToSingleLineLimitedStackProvider")
+ public void testStackTraceToSingleLineLimitedStack(Throwable t, String expectedStartWith) {
+ final String trace = stackTraceToSingleLineString(t, false);
+ assertThat(trace).startsWith(expectedStartWith);
+ assertThat(trace).endsWith("...)");
+ }
- trace = stackTraceToSingleLineString(new RuntimeException("message"), true);
- assertThat(trace).as("case 2").startsWith("java.lang.RuntimeException: message / StaticUtilsTestCase.java:");
- assertThat(trace).as("case 2").doesNotContain("...)");
+ @DataProvider
+ public Object[][] stackTraceToSingleLineFullStackStackProvider() {
+ return new Object[][] {
+ {
+ new InvocationTargetException(new RuntimeException("message")),
+ "java.lang.reflect.InvocationTargetException / StaticUtilsTestCase.java:", "message"
+ },
+ {
+ new RuntimeException("message"),
+ "java.lang.RuntimeException: message / StaticUtilsTestCase.java:", "message"
+ },
+ { new RuntimeException(""), "java.lang.RuntimeException: / StaticUtilsTestCase.java:", "" },
+ { new RuntimeException(), "java.lang.RuntimeException / StaticUtilsTestCase.java:", "" },
+ };
+ }
- trace = stackTraceToSingleLineString(new RuntimeException(""), true);
- assertThat(trace).as("case 3").startsWith("java.lang.RuntimeException: / StaticUtilsTestCase.java:");
- assertThat(trace).as("case 3").doesNotContain("...)");
+ @Test(dataProvider = "stackTraceToSingleLineFullStackStackProvider")
+ public void testStackTraceToSingleLineFullStack(Exception throwable, String expectedStartWith,
+ String expectedContains) {
+ String trace = stackTraceToSingleLineString(throwable, true);
+ assertThat(trace).startsWith(expectedStartWith);
+ assertThat(trace).contains(expectedContains);
+ assertThat(trace).doesNotContain("...)");
}
}
--
Gitblit v1.10.0