From 10ece6b20983eeb185f6b5cb6fc2ad71e596c993 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 31 Oct 2016 15:41:17 +0000
Subject: [PATCH] Make more use of the Args class
---
opendj-server-legacy/src/test/java/org/opends/server/tools/UpgradeTestCase.java | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/tools/UpgradeTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/tools/UpgradeTestCase.java
index 8faafa8..ed63c67 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/tools/UpgradeTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/tools/UpgradeTestCase.java
@@ -18,20 +18,18 @@
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.PrintStream;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
import org.assertj.core.api.Assertions;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.TestCaseUtils;
import org.opends.server.core.DirectoryServer;
import org.opends.server.tools.upgrade.UpgradeCli;
+import org.opends.server.util.Args;
import org.opends.server.util.StaticUtils;
import org.testng.annotations.Test;
-import static org.opends.messages.ToolMessages.*;
import static com.forgerock.opendj.cli.ArgumentConstants.*;
+import static org.opends.messages.ToolMessages.*;
import static org.testng.Assert.*;
/** A set of test cases for the Upgrade tool. */
@@ -56,14 +54,10 @@
*/
private String[] setArgs(String... args)
{
- final List<String> argsList = new LinkedList<>();
- argsList.add("--configFile");
- argsList.add(configFilePath);
- if (args != null)
- {
- Collections.addAll(argsList, args);
- }
- return argsList.toArray(new String[argsList.size()]);
+ return new Args()
+ .add("--configFile", configFilePath)
+ .addAll(args)
+ .toArray();
}
/**
--
Gitblit v1.10.0