From 641e89ef0e15c9edde69f3b8cf82c7dd5f68687a Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <ylecaillez@forgerock.com>
Date: Wed, 30 Sep 2015 14:28:07 +0000
Subject: [PATCH] OPENDJ-2016: New on disk merge import strategy based on storage engine.
---
opendj-server-legacy/src/test/java/org/opends/server/util/PackageInfoTestCase.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/util/PackageInfoTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/util/PackageInfoTestCase.java
index a7e97f1..e56bcf2 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/util/PackageInfoTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/util/PackageInfoTestCase.java
@@ -34,7 +34,7 @@
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-
+import org.forgerock.util.Reject;
import org.opends.server.TestCaseUtils;
import static org.testng.Assert.*;
@@ -82,7 +82,7 @@
@DataProvider(name = "adsSourceDirectories")
public Object[][] getADSSourceDirectories()
{
- File adsSourceRoot = new File(sourceRoot, "ads");
+ File adsSourceRoot = new File(sourceRoot, "main/java/org/opends/admin/ads");
ArrayList<File> sourceDirs = new ArrayList<>();
getSourceDirectories(adsSourceRoot, sourceDirs);
@@ -182,7 +182,7 @@
@DataProvider(name = "guiToolsSourceDirectories")
public Object[][] getGUIToolsSourceDirectories()
{
- File guiToolsSourceRoot = new File(sourceRoot, "guitools");
+ File guiToolsSourceRoot = new File(sourceRoot, "main/java/org/opends/guitools");
ArrayList<File> sourceDirs = new ArrayList<>();
getSourceDirectories(guiToolsSourceRoot, sourceDirs);
@@ -207,7 +207,7 @@
@DataProvider(name = "quickSetupSourceDirectories")
public Object[][] getQuickSetupSourceDirectories()
{
- File quickSetupSourceRoot = new File(sourceRoot, "quicksetup");
+ File quickSetupSourceRoot = new File(sourceRoot, "main/java/org/opends/quicksetup");
ArrayList<File> sourceDirs = new ArrayList<>();
getSourceDirectories(quickSetupSourceRoot, sourceDirs);
@@ -232,7 +232,7 @@
@DataProvider(name = "serverSourceDirectories")
public Object[][] getServerSourceDirectories()
{
- File serverSourceRoot = new File(sourceRoot, "server");
+ File serverSourceRoot = new File(sourceRoot, "main/java");
ArrayList<File> sourceDirs = new ArrayList<>();
getSourceDirectories(serverSourceRoot, sourceDirs);
@@ -259,6 +259,7 @@
private void getSourceDirectories(File startingPoint,
ArrayList<File> sourceDirectories)
{
+ Reject.ifFalse(startingPoint.isDirectory(), startingPoint.getAbsolutePath() + " is not a directory.");
boolean added = false;
for (File f : startingPoint.listFiles())
{
--
Gitblit v1.10.0