From 2c7bc5dd4d5042b08411afdd6dd4da250191662b Mon Sep 17 00:00:00 2001
From: vharseko <vharseko@openam.org.ru>
Date: Fri, 05 Oct 2018 09:23:38 +0000
Subject: [PATCH] update testng version & fix testng tests
---
opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java | 2 +-
opendj-server-legacy/pom.xml | 17 ++++++++---------
opendj-server-legacy/src/test/java/org/opends/quicksetup/TestUtilities.java | 6 +++---
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/opendj-server-legacy/pom.xml b/opendj-server-legacy/pom.xml
index 1e4e66f..2dc3bff 100644
--- a/opendj-server-legacy/pom.xml
+++ b/opendj-server-legacy/pom.xml
@@ -206,14 +206,6 @@
<version>1.5.1</version>
</dependency>
- <!-- We need to override testNG version to make test works (see OPENDJ-2389) -->
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.0.1</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
@@ -237,7 +229,6 @@
<dependency>
<groupId>com.github.stephenc.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
- <version>1.0-1</version>
</dependency>
<dependency>
@@ -1223,6 +1214,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <classpathDependencyExcludes>
+ <classpathDependencyExcludes>org.slf4j:slf4j-jdk14</classpathDependencyExcludes>
+ </classpathDependencyExcludes>
+ </configuration>
<executions>
<execution>
<goals>
@@ -1261,6 +1257,7 @@
<name>configfailurepolicy</name>
<value>skip</value>
</property>
+
</properties>
<systemPropertyVariables>
<org.opends.server.BuildRoot>${basedir}</org.opends.server.BuildRoot>
@@ -1273,6 +1270,8 @@
<org.opends.test.copyClassesToTestPackage>false</org.opends.test.copyClassesToTestPackage>
</systemPropertyVariables>
<argLine>-server -Xmx2048M -XX:MaxPermSize=256m</argLine>
+ <parallel>methods</parallel>
+ <threadCount>1</threadCount>
</configuration>
</execution>
</executions>
diff --git a/opendj-server-legacy/src/test/java/org/opends/quicksetup/TestUtilities.java b/opendj-server-legacy/src/test/java/org/opends/quicksetup/TestUtilities.java
index ee70470..5154b29 100644
--- a/opendj-server-legacy/src/test/java/org/opends/quicksetup/TestUtilities.java
+++ b/opendj-server-legacy/src/test/java/org/opends/quicksetup/TestUtilities.java
@@ -103,11 +103,11 @@
ServerController controller = new ServerController(getInstallation());
controller.stopServer();
}
-
+//-Dorg.opends.server.ServerRoot=/Users/vharseko/git/OpenIdentityPlatform/OpenAM/OpenDJ/opendj-server-legacy/target/unit-tests/package-instance -Dorg.opends.quicksetup.Root=/Users/vharseko/git/OpenIdentityPlatform/OpenAM/OpenDJ/opendj-server-legacy/target/package/opendj
public static File getInstallPackageFile() throws FileNotFoundException {
File installPackageFile = null;
- String buildRoot = System.getProperty(PROPERTY_BUILD_ROOT);
- File buildDir = new File(buildRoot, "build");
+ String buildRoot = System.getProperty(PROPERTY_BUILD_ROOT,System.getProperty("user.dir"));
+ File buildDir = new File(buildRoot, "target");
File packageDir = new File(buildDir, "package");
if (!packageDir.exists()) {
throw new FileNotFoundException("Package directory " + packageDir +
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java b/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
index 116dea5..39f127c 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/TestCaseUtils.java
@@ -654,7 +654,7 @@
public static File getBuildRoot()
{
- String buildRoot = System.getProperty(PROPERTY_BUILD_ROOT);
+ String buildRoot = System.getProperty(PROPERTY_BUILD_ROOT,System.getProperty("user.dir"));
return new File(buildRoot);
}
--
Gitblit v1.10.0