From 8ea401e9c7d07f5a32e048742f4c342b747a13e7 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Fri, 14 Feb 2014 08:40:06 +0000
Subject: [PATCH] Minor fix for OPENDJ-1303. Added static initialization on OperatingSystem. Removed modifications on previous test cases. Thanks to JN.
---
opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFTestCase.java | 8 --------
opendj-cli/src/test/java/com/forgerock/opendj/cli/ConsoleApplicationTestCase.java | 4 ----
opendj-core/src/main/java/com/forgerock/opendj/util/OperatingSystem.java | 3 +++
3 files changed, 3 insertions(+), 12 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 3d76afd..4b291a6 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
@@ -32,8 +32,6 @@
import org.forgerock.i18n.LocalizableMessage;
import org.testng.annotations.Test;
-import com.forgerock.opendj.util.OperatingSystem;
-
import static org.fest.assertions.Assertions.assertThat;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
@@ -62,8 +60,6 @@
}
final static MockConsoleApplication getDefault() {
- // The console app needs the operating system.
- OperatingSystem.getOperatingSystem();
out = new ByteArrayOutputStream();
final PrintStream psOut = new PrintStream(out);
err = new ByteArrayOutputStream();
diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/OperatingSystem.java b/opendj-core/src/main/java/com/forgerock/opendj/util/OperatingSystem.java
index 788eb79..d772947 100644
--- a/opendj-core/src/main/java/com/forgerock/opendj/util/OperatingSystem.java
+++ b/opendj-core/src/main/java/com/forgerock/opendj/util/OperatingSystem.java
@@ -99,6 +99,9 @@
private boolean isUnixBased;
private static OperatingSystem os;
+ static {
+ OperatingSystem.getOperatingSystem();
+ }
/**
* Creates a new operating system value with the provided name.
diff --git a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFTestCase.java b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFTestCase.java
index da0c42d..bd33975 100644
--- a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFTestCase.java
+++ b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFTestCase.java
@@ -36,20 +36,12 @@
import java.io.UnsupportedEncodingException;
import org.forgerock.i18n.LocalizableMessage;
-import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-import com.forgerock.opendj.util.OperatingSystem;
-
@SuppressWarnings("javadoc")
public class MakeLDIFTestCase extends ToolsTestCase {
- @BeforeClass
- public void getOperatingSystem() {
- OperatingSystem.getOperatingSystem();
- }
-
@DataProvider(name = "validArguments")
Object[][] createValidArguments() throws Exception {
Object[][] data = new Object[][] {
--
Gitblit v1.10.0