You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by jo...@apache.org on 2018/09/25 18:11:17 UTC
[incubator-netbeans] branch master updated: [NETBEANS-6] Adding
Support for JUnit 5 (#892)
This is an automated email from the ASF dual-hosted git repository.
johnmcdonnell pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 073c42c [NETBEANS-6] Adding Support for JUnit 5 (#892)
073c42c is described below
commit 073c42c1cd7279c1d7441f860f3dba0e9930da9d
Author: John McDonnell <mc...@gmail.com>
AuthorDate: Tue Sep 25 19:11:09 2018 +0100
[NETBEANS-6] Adding Support for JUnit 5 (#892)
* [NETBEANS-6] Adding Support for JUnit 5
* [NETBEANS-6] Fixed License text which had an additional line break at line 1
* Added Junit5 to list of not loaded libraries
* Added Licenseinfo.xml entry for JUnit 5 logo file
---
.../modules/ide/ergonomics/LibrariesCheck.java | 2 +-
.../netbeans/modules/java/hints/bugs/NPECheck.java | 3 +-
.../netbeans/modules/java/hints/testing/Tiny.java | 112 +++++-
java/junit.ui/licenseinfo.xml | 5 +
java/junit.ui/manifest.mf | 2 +-
java/junit.ui/nbproject/project.xml | 2 +-
.../netbeans/modules/junit/ui/Bundle.properties | 2 +
.../junit/ui/actions/TestClassInfoTask.java | 18 +-
.../junit/ui/resources/JUnit5Suite.java.template | 24 ++
.../ui/resources/JUnit5TestClass.java.template | 67 ++++
.../modules/junit/ui/resources/junit5-logo.png | Bin 0 -> 1550 bytes
.../ui/wizards/EmptyTestCaseWizardIterator.java | 5 +
.../junit/ui/wizards/TestSuiteWizardIterator.java | 5 +
java/junit/manifest.mf | 2 +-
java/junit/nbproject/project.xml | 6 +-
.../modules/junit/AbstractTestGenerator.java | 2 +-
.../org/netbeans/modules/junit/Bundle.properties | 11 +
.../src/org/netbeans/modules/junit/ClassMap.java | 23 +-
.../org/netbeans/modules/junit/DefaultPlugin.java | 237 +++++++-----
.../modules/junit/JUnit5TestGenerator.java | 410 +++++++++++++++++++++
.../org/netbeans/modules/junit/JUnitVersion.java | 3 +-
.../org/netbeans/modules/junit/TestCreator.java | 27 +-
.../netbeans/modules/junit/api/JUnitSettings.java | 2 +
.../JunitTestProject/nbproject/private/private.xml | 4 +
java/maven/manifest.mf | 2 +-
.../netbeans/modules/maven/ActionProviderImpl.java | 13 +-
.../modules/maven/ActionProviderImplTest.java | 11 +
nbbuild/cluster.properties | 1 +
nbbuild/licenses/EPL-v20 | 86 +++++
nbbuild/licenses/names.properties | 1 +
platform/junitlib/external/binaries-list | 6 +
.../external/junit-jupiter-api-5.3.1-license.txt | 94 +++++
.../junit-jupiter-engine-5.3.1-license.txt | 93 +++++
.../junit-jupiter-params-5.3.1-license.txt | 93 +++++
platform/junitlib/manifest.mf | 2 +-
platform/junitlib/nbproject/project.properties | 14 +-
.../netbeans/modules/junitlib/Bundle.properties | 3 +-
.../src/org/netbeans/modules/junitlib/junit_5.xml | 54 +++
.../src/org/netbeans/modules/junitlib/layer.xml | 3 +
.../libs.junit5/build.xml | 12 +-
.../external/binaries-list | 5 +-
.../external/junit-jupiter-api-5.3.1-license.txt | 93 +++++
.../junit-jupiter-engine-5.3.1-license.txt | 93 +++++
.../junit-jupiter-params-5.3.1-license.txt | 93 +++++
platform/libs.junit5/manifest.mf | 5 +
.../nbproject/project.properties | 16 +-
platform/libs.junit5/nbproject/project.xml | 59 +++
.../org/netbeans/libs/junit5/Bundle.properties} | 8 +-
48 files changed, 1706 insertions(+), 128 deletions(-)
diff --git a/ergonomics/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/LibrariesCheck.java b/ergonomics/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/LibrariesCheck.java
index ce17279..1cc300e 100644
--- a/ergonomics/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/LibrariesCheck.java
+++ b/ergonomics/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/LibrariesCheck.java
@@ -59,7 +59,7 @@ public class LibrariesCheck extends NbTestCase {
f = f.substring("nblibraries.".length());
FileObject l = fo.getFileObject(f);
if (l == null) {
- if (f.endsWith("jaxb.xml") || f.endsWith("junit.xml") || f.endsWith("junit_4.xml") || f.endsWith("hamcrest.xml")) {
+ if (f.endsWith("jaxb.xml") || f.endsWith("junit.xml") || f.endsWith("junit_4.xml") || f.endsWith("hamcrest.xml") || f.endsWith("junit_5.xml")) {
// this is a library defined in autoload module
// which is not enabled in ergonomic mode right now
continue;
diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/bugs/NPECheck.java b/java/java.hints/src/org/netbeans/modules/java/hints/bugs/NPECheck.java
index 4c2e8b7..51d59fc 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/bugs/NPECheck.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/bugs/NPECheck.java
@@ -1045,7 +1045,8 @@ public class NPECheck {
switch (ownerFQN) {
case "org.testng.Assert": argument = node.getArguments().get(0); break;
case "junit.framework.Assert":
- case "org.junit.Assert": argument = node.getArguments().get(node.getArguments().size() - 1); break;
+ case "org.junit.Assert":
+ case "org.junit.jupiter.api.Assertions": argument = node.getArguments().get(node.getArguments().size() - 1); break;
}
Element param = argument != null && targetState != null ? info.getTrees().getElement(new TreePath(getCurrentPath(), argument)) : null;
diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/testing/Tiny.java b/java/java.hints/src/org/netbeans/modules/java/hints/testing/Tiny.java
index 6d00a64..045c5bf 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/testing/Tiny.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/testing/Tiny.java
@@ -238,10 +238,100 @@ public class Tiny {
@ConstraintVariableType(variable="$expected", type="double[]"),
@ConstraintVariableType(variable="$actual", type="double[]")
}
+ ),
+ @TriggerPattern(value="org.junit.jupiter.api.Assertions.assertEquals($expected, $actual)",
+ constraints={@ConstraintVariableType(variable="$expected", type="java.lang.Object[]"),
+ @ConstraintVariableType(variable="$actual", type="java.lang.Object[]")
+ }
+ ),
+ @TriggerPattern(value="org.junit.jupiter.api.Assertions.assertEquals($expected, $actual, $message, )",
+ constraints={@ConstraintVariableType(variable="$expected", type="java.lang.Object[]"),
+ @ConstraintVariableType(variable="$actual", type="java.lang.Object[]"),
+ @ConstraintVariableType(variable="$message", type="java.lang.String")
+ }
+ ),
+ @TriggerPattern(value="org.junit.jupiter.api.Assertions.assertEquals($expected, $actual)",
+ constraints={@ConstraintVariableType(variable="$expected", type="byte[]"),
+ @ConstraintVariableType(variable="$actual", type="byte[]")
+ }
+ ),
+ @TriggerPattern(value="org.junit.jupiter.api.Assertions.assertEquals($expected, $actual, $message)",
+ constraints={@ConstraintVariableType(variable="$expected", type="byte[]"),
+ @ConstraintVariableType(variable="$actual", type="byte[]"),
+ @ConstraintVariableType(variable="$message", type="java.lang.String")
+ }
+ ),
+ @TriggerPattern(value="org.junit.jupiter.api.Assertions.assertEquals($expected, $actual)",
+ constraints={@ConstraintVariableType(variable="$expected", type="char[]"),
+ @ConstraintVariableType(variable="$actual", type="char[]")
+ }
+ ),
+ @TriggerPattern(value="org.junit.jupiter.api.Assertions.assertEquals($expected, $actual, $message)",
+ constraints={@ConstraintVariableType(variable="$expected", type="char[]"),
+ @ConstraintVariableType(variable="$actual", type="char[]"),
+ @ConstraintVariableType(variable="$message", type="java.lang.String")
+ }
+ ),
+ @TriggerPattern(value="org.junit.jupiter.api.Assertions.assertEquals($expected, $actual)",
+ constraints={@ConstraintVariableType(variable="$expected", type="short[]"),
+ @ConstraintVariableType(variable="$actual", type="short[]")
+ }
+ ),
+ @TriggerPattern(value="org.junit.jupiter.api.Assertions.assertEquals($expected, $actual, $message)",
+ constraints={@ConstraintVariableType(variable="$expected", type="short[]"),
+ @ConstraintVariableType(variable="$actual", type="short[]"),
+ @ConstraintVariableType(variable="$message", type="java.lang.String")
+ }
+ ),
+ @TriggerPattern(value="org.junit.jupiter.api.Assertions.assertEquals($expected, $actual)",
+ constraints={@ConstraintVariableType(variable="$expected", type="int[]"),
+ @ConstraintVariableType(variable="$actual", type="int[]")
+ }
+ ),
+ @TriggerPattern(value="org.junit.jupiter.api.Assertions.assertEquals($expected, $actual, $message)",
+ constraints={@ConstraintVariableType(variable="$expected", type="int[]"),
+ @ConstraintVariableType(variable="$actual", type="int[]"),
+ @ConstraintVariableType(variable="$message", type="java.lang.String")
+ }
+ ),
+ @TriggerPattern(value="org.junit.jupiter.api.Assertions.assertEquals($expected, $actual)",
+ constraints={@ConstraintVariableType(variable="$expected", type="long[]"),
+ @ConstraintVariableType(variable="$actual", type="long[]")
+ }
+ ),
+ @TriggerPattern(value="org.junit.jupiter.api.Assertions.assertEquals($expected, $actual, $message)",
+ constraints={@ConstraintVariableType(variable="$expected", type="long[]"),
+ @ConstraintVariableType(variable="$actual", type="long[]"),
+ @ConstraintVariableType(variable="$message", type="java.lang.String")
+ }
+ ),
+ @TriggerPattern(value="org.junit.jupiter.api.Assertions.assertEquals($expected, $actual)",
+ constraints={@ConstraintVariableType(variable="$expected", type="float[]"),
+ @ConstraintVariableType(variable="$actual", type="float[]")
+ }
+ ),
+ @TriggerPattern(value="org.junit.jupiter.api.Assertions.assertEquals($expected, $actual, $message)",
+ constraints={@ConstraintVariableType(variable="$expected", type="float[]"),
+ @ConstraintVariableType(variable="$actual", type="float[]"),
+ @ConstraintVariableType(variable="$message", type="java.lang.String")
+ }
+ ),
+ @TriggerPattern(value="org.junit.jupiter.api.Assertions.assertEquals($expected, $actual)",
+ constraints={@ConstraintVariableType(variable="$expected", type="double[]"),
+ @ConstraintVariableType(variable="$actual", type="double[]")
+ }
+ ),
+ @TriggerPattern(value="org.junit.jupiter.api.Assertions.assertEquals($expected, $actual, $message)",
+ constraints={@ConstraintVariableType(variable="$expected", type="double[]"),
+ @ConstraintVariableType(variable="$actual", type="double[]"),
+ @ConstraintVariableType(variable="$message", type="java.lang.String")
+ }
)
})
public static ErrorDescription assertEqualsForArrays(HintContext ctx) {
TypeElement ojAssert = ctx.getInfo().getElements().getTypeElement("org.junit.Assert");
+ TypeElement oj5Assertion = ctx.getInfo().getElements().getTypeElement("org.junit.jupiter.api.Assertions");
+
String targetPattern = null;
if (ojAssert != null) {
@@ -254,6 +344,16 @@ public class Tiny {
}
}
}
+ } else if (oj5Assertion != null) {
+ for (ExecutableElement ee : ElementFilter.methodsIn(ojAssert.getEnclosedElements())) {
+ if (ee.getSimpleName().contentEquals("assertArrayEquals")) {
+ if (ctx.getVariables().containsKey("$message")) {
+ targetPattern = "org.junit.jupiter.api.Assertions.assertArrayEquals($expected, $actual, $message)";
+ } else {
+ targetPattern = "org.junit.jupiter.api.Assertions.assertArrayEquals($expected, $actual)";
+ }
+ }
+ }
}
TypeMirror type = ctx.getInfo().getTrees().getTypeMirror(ctx.getVariables().get("$expected"));
@@ -287,16 +387,22 @@ public class Tiny {
@TriggerPattern(value="org.junit.Assert.assertEquals($expected, $actual)"),
@TriggerPattern(value="org.junit.Assert.assertEquals($message, $expected, $actual)",
constraints=@ConstraintVariableType(variable="$message", type="java.lang.String")
+ ),
+ @TriggerPattern(value="org.junit.jupiter.api.Assertions.assertEquals($expected, $actual)"),
+ @TriggerPattern(value="org.junit.jupiter.api.Assertions.assertEquals($expected, $actual, $message)",
+ constraints=@ConstraintVariableType(variable="$message", type="java.lang.String")
)
})
public static ErrorDescription mismatchedConstantVSReal(HintContext ctx) {
if (isConstant(ctx, "$expected") || !isConstant(ctx, "$actual")) return null;
if (!MatcherUtilities.matches(ctx, ctx.getPath(), "$method($arguments$)", true)) return null;
+ TypeElement oj5Assertion = ctx.getInfo().getElements().getTypeElement("org.junit.jupiter.api.Assertions");
+
String targetPattern = null;
if (ctx.getVariables().containsKey("$message")) {
- targetPattern = "$method($message, $actual, $expected)";
+ targetPattern = oj5Assertion == null ? "$method($message, $actual, $expected)" : "$method($actual, $expected, $message)";
} else {
targetPattern = "$method($actual, $expected)";
}
@@ -324,6 +430,10 @@ public class Tiny {
@TriggerPattern(value="org.junit.Assert.assertEquals($expected, $actual)"),
@TriggerPattern(value="org.junit.Assert.assertEquals($message, $expected, $actual)",
constraints=@ConstraintVariableType(variable="$message", type="java.lang.String")
+ ),
+ @TriggerPattern(value="org.junit.jupiter.api.Assertions.assertEquals($expected, $actual)"),
+ @TriggerPattern(value="org.junit.jupiter.api.Assertions.assertEquals($expected, $actual, $message)",
+ constraints=@ConstraintVariableType(variable="$message", type="java.lang.String")
)
})
public static ErrorDescription incovertibleTypes(HintContext ctx) {
diff --git a/java/junit.ui/licenseinfo.xml b/java/junit.ui/licenseinfo.xml
index 88a6da5..7635f78 100644
--- a/java/junit.ui/licenseinfo.xml
+++ b/java/junit.ui/licenseinfo.xml
@@ -25,4 +25,9 @@
<license ref="Apache-2.0-ASF" />
<comment type="COMMENT_UNSUPPORTED" />
</fileset>
+ <fileset>
+ <file>src/org/netbeans/modules/junit/ui/resources/junit5-logo.png</file>
+ <license ref="EPL-v20" />
+ <comment type="COMMENT_UNSUPPORTED" />
+ </fileset>
</licenseinfo>
diff --git a/java/junit.ui/manifest.mf b/java/junit.ui/manifest.mf
index ab1bd8b..9aa7067 100644
--- a/java/junit.ui/manifest.mf
+++ b/java/junit.ui/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.junit.ui
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/junit/ui/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.7
+OpenIDE-Module-Specification-Version: 1.8
diff --git a/java/junit.ui/nbproject/project.xml b/java/junit.ui/nbproject/project.xml
index ea9fb11..f35f3a9 100644
--- a/java/junit.ui/nbproject/project.xml
+++ b/java/junit.ui/nbproject/project.xml
@@ -159,7 +159,7 @@
<compile-dependency/>
<run-dependency>
<release-version>2</release-version>
- <specification-version>2.64</specification-version>
+ <specification-version>2.76</specification-version>
</run-dependency>
</dependency>
<dependency>
diff --git a/java/junit.ui/src/org/netbeans/modules/junit/ui/Bundle.properties b/java/junit.ui/src/org/netbeans/modules/junit/ui/Bundle.properties
index e68a9e4..3f16ed5 100644
--- a/java/junit.ui/src/org/netbeans/modules/junit/ui/Bundle.properties
+++ b/java/junit.ui/src/org/netbeans/modules/junit/ui/Bundle.properties
@@ -25,4 +25,6 @@ Templates/UnitTests/JUnit3TestClass.java=Test Class - JUnit 3.x
Templates/UnitTests/JUnit3Suite.java=Test Suite - JUnit 3.x
Templates/UnitTests/JUnit4TestClass.java=Test Class - JUnit 4.x
Templates/UnitTests/JUnit4Suite.java=Test Suite - JUnit 4.x
+Templates/UnitTests/JUnit5TestClass.java=Test Class - JUnit 5.x
+Templates/UnitTests/JUnit5Suite.java=Test Suite - JUnit 5.x
Templates/UnitTests/junit-custom.xml=Custom JUnit execution script
diff --git a/java/junit.ui/src/org/netbeans/modules/junit/ui/actions/TestClassInfoTask.java b/java/junit.ui/src/org/netbeans/modules/junit/ui/actions/TestClassInfoTask.java
index 2abc271..2ba63c6 100644
--- a/java/junit.ui/src/org/netbeans/modules/junit/ui/actions/TestClassInfoTask.java
+++ b/java/junit.ui/src/org/netbeans/modules/junit/ui/actions/TestClassInfoTask.java
@@ -40,7 +40,8 @@ final class TestClassInfoTask implements CancellableTask<CompilationController>
private String className;
private String methodName;
- private static String ANNOTATION = "org.junit.Test"; //NOI18N
+ private static String JUNIT4_ANNOTATION = "org.junit.Test"; //NOI18N
+ private static String JUNIT5_ANNOTATION = "org.junit.platform.commons.annotation.Testable"; //NOI18N
private static String TESTCASE = "junit.framework.TestCase"; //NOI18N
TestClassInfoTask(int caretPosition) {
@@ -80,8 +81,9 @@ final class TestClassInfoTask implements CancellableTask<CompilationController>
for (Iterator<? extends AnnotationMirror> it = allAnnotationMirrors.iterator(); it.hasNext();) {
AnnotationMirror annotationMirror = it.next();
typeElement = (TypeElement) annotationMirror.getAnnotationType().asElement();
- if (typeElement.getQualifiedName().contentEquals(ANNOTATION)) {
- methodName = mn;
+ if (typeElement.getQualifiedName().contentEquals(JUNIT4_ANNOTATION)
+ || isJunit5Testable(typeElement)) {
+ methodName = mn;
break;
}
}
@@ -101,4 +103,14 @@ final class TestClassInfoTask implements CancellableTask<CompilationController>
String getMethodName() {
return methodName;
}
+
+ private boolean isJunit5Testable(TypeElement typeElement) {
+ for (AnnotationMirror annotationMirror : typeElement.getAnnotationMirrors()) {
+ TypeElement parentTypeElement = (TypeElement) annotationMirror.getAnnotationType().asElement();
+ if (parentTypeElement.getQualifiedName().contentEquals(JUNIT5_ANNOTATION)){
+ return true;
+ }
+ }
+ return false;
+ }
}
diff --git a/java/junit.ui/src/org/netbeans/modules/junit/ui/resources/JUnit5Suite.java.template b/java/junit.ui/src/org/netbeans/modules/junit/ui/resources/JUnit5Suite.java.template
new file mode 100644
index 0000000..29a2fe0
--- /dev/null
+++ b/java/junit.ui/src/org/netbeans/modules/junit/ui/resources/JUnit5Suite.java.template
@@ -0,0 +1,24 @@
+<#-- FreeMarker template (see http://freemarker.org/) -->
+<#assign licenseFirst = "/*">
+<#assign licensePrefix = " * ">
+<#assign licenseLast = " */">
+<#include "${project.licensePath}">
+
+<#if package?? && package != "">
+package ${package};
+
+</#if>
+import org.junit.platform.runner.JUnitPlatform;
+import org.junit.runner.RunWith;
+
+/**
+ *
+ * @author ${user}
+ */
+<#-- classNames: "FooA,FooB" -->
+<#-- classes: "FooA.class,FooB.class" -->
+@RunWith(JUnitPlatform.class)
+@SelectClasses({${classes}})
+public class ${name} {
+
+}
\ No newline at end of file
diff --git a/java/junit.ui/src/org/netbeans/modules/junit/ui/resources/JUnit5TestClass.java.template b/java/junit.ui/src/org/netbeans/modules/junit/ui/resources/JUnit5TestClass.java.template
new file mode 100644
index 0000000..723651e
--- /dev/null
+++ b/java/junit.ui/src/org/netbeans/modules/junit/ui/resources/JUnit5TestClass.java.template
@@ -0,0 +1,67 @@
+<#-- FreeMarker template (see http://freemarker.org/) -->
+<#assign licenseFirst = "/*">
+<#assign licensePrefix = " * ">
+<#assign licenseLast = " */">
+<#include "${project.licensePath}">
+
+ <#if package?? && package != "">
+package ${package};
+
+ </#if>
+<#if methodTearDown!false>
+import org.junit.jupiter.api.AfterEach;
+</#if>
+<#if classTearDown!false>
+import org.junit.jupiter.api.AfterAll;
+</#if>
+<#if methodSetUp!false>
+import org.junit.jupiter.api.BeforeEach;
+</#if>
+<#if classSetUp!false>
+import org.junit.jupiter.api.BeforeAll;
+</#if>
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ *
+ * @author ${user}
+ */
+public class ${name} {
+
+ public ${name}() {
+ }
+
+ <#if classSetUp!false>
+ @BeforeAll
+ public static void setUpClass() {
+ }
+
+ </#if>
+<#if classTearDown!false>
+ @AfterAll
+ public static void tearDownClass() {
+ }
+
+ </#if>
+<#if methodSetUp!false>
+ @BeforeEach
+ public void setUp() {
+ }
+
+ </#if>
+<#if methodTearDown!false>
+ @AfterEach
+ public void tearDown() {
+ }
+
+ </#if>
+<#if testMethodsPlaceholder!false>
+ // TODO add test methods here.
+ // The methods must be annotated with annotation @Test. For example:
+ //
+ // @Test
+ // public void hello() {}
+
+ </#if>
+}
\ No newline at end of file
diff --git a/java/junit.ui/src/org/netbeans/modules/junit/ui/resources/junit5-logo.png b/java/junit.ui/src/org/netbeans/modules/junit/ui/resources/junit5-logo.png
new file mode 100644
index 0000000..6315c8d
Binary files /dev/null and b/java/junit.ui/src/org/netbeans/modules/junit/ui/resources/junit5-logo.png differ
diff --git a/java/junit.ui/src/org/netbeans/modules/junit/ui/wizards/EmptyTestCaseWizardIterator.java b/java/junit.ui/src/org/netbeans/modules/junit/ui/wizards/EmptyTestCaseWizardIterator.java
index 409055e..7824a99 100644
--- a/java/junit.ui/src/org/netbeans/modules/junit/ui/wizards/EmptyTestCaseWizardIterator.java
+++ b/java/junit.ui/src/org/netbeans/modules/junit/ui/wizards/EmptyTestCaseWizardIterator.java
@@ -66,6 +66,11 @@ import org.openide.util.NbBundle;
content = "../resources/JUnit4TestClass.java.template",
displayName = "org.netbeans.modules.junit.ui.Bundle#Templates/UnitTests/JUnit4TestClass.java",
iconBase = "org/netbeans/modules/junit/ui/resources/JUnitLogo.png",
+ description = "/org/netbeans/modules/junit/ui/resources/EmptyJUnitTest.html", category = "invisible"),
+ @TemplateRegistration(folder = "UnitTests", position = 800, scriptEngine = "freemarker",
+ content = "../resources/JUnit5TestClass.java.template",
+ displayName = "org.netbeans.modules.junit.ui.Bundle#Templates/UnitTests/JUnit5TestClass.java",
+ iconBase = "org/netbeans/modules/junit/ui/resources/junit5-logo.png",
description = "/org/netbeans/modules/junit/ui/resources/EmptyJUnitTest.html", category = "invisible")
})
@SuppressWarnings("serial")
diff --git a/java/junit.ui/src/org/netbeans/modules/junit/ui/wizards/TestSuiteWizardIterator.java b/java/junit.ui/src/org/netbeans/modules/junit/ui/wizards/TestSuiteWizardIterator.java
index bf359df..0ea0875 100644
--- a/java/junit.ui/src/org/netbeans/modules/junit/ui/wizards/TestSuiteWizardIterator.java
+++ b/java/junit.ui/src/org/netbeans/modules/junit/ui/wizards/TestSuiteWizardIterator.java
@@ -67,6 +67,11 @@ import org.openide.util.NbBundle;
content = "/org/netbeans/modules/junit/ui/resources/JUnit4Suite.java.template",
displayName = "org.netbeans.modules.junit.ui.Bundle#Templates/UnitTests/JUnit4Suite.java",
iconBase = "org/netbeans/modules/junit/ui/resources/JUnitLogo.png",
+ description = "/org/netbeans/modules/junit/ui/resources/TestSuite.html", category = "invisible"),
+ @TemplateRegistration(folder = "UnitTests", position = 1000, scriptEngine = "freemarker",
+ content = "/org/netbeans/modules/junit/ui/resources/JUnit5Suite.java.template",
+ displayName = "org.netbeans.modules.junit.ui.Bundle#Templates/UnitTests/JUnit5Suite.java",
+ iconBase = "org/netbeans/modules/junit/ui/resources/junit5-logo.png",
description = "/org/netbeans/modules/junit/ui/resources/TestSuite.html", category = "invisible")
})
public class TestSuiteWizardIterator implements TemplateWizard.InstantiatingIterator<WizardDescriptor> {
diff --git a/java/junit/manifest.mf b/java/junit/manifest.mf
index a939b45..61275a5 100644
--- a/java/junit/manifest.mf
+++ b/java/junit/manifest.mf
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.junit/2
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/junit/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/junit/resources/layer.xml
-OpenIDE-Module-Specification-Version: 2.75
+OpenIDE-Module-Specification-Version: 2.76
OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker
AutoUpdate-Show-In-Client: false
diff --git a/java/junit/nbproject/project.xml b/java/junit/nbproject/project.xml
index 54acbb1..5fe3b41 100644
--- a/java/junit/nbproject/project.xml
+++ b/java/junit/nbproject/project.xml
@@ -155,7 +155,7 @@
<dependency>
<code-name-base>org.netbeans.modules.junitlib</code-name-base>
<run-dependency>
- <specification-version>1.2</specification-version>
+ <specification-version>1.8</specification-version>
</run-dependency>
</dependency>
<dependency>
@@ -349,6 +349,10 @@
<compile-dependency/>
</test-dependency>
<test-dependency>
+ <code-name-base>org.netbeans.libs.junit5</code-name-base>
+ <compile-dependency/>
+ </test-dependency>
+ <test-dependency>
<code-name-base>org.netbeans.modules.nbjunit</code-name-base>
<recursive/>
<compile-dependency/>
diff --git a/java/junit/src/org/netbeans/modules/junit/AbstractTestGenerator.java b/java/junit/src/org/netbeans/modules/junit/AbstractTestGenerator.java
index c4ebac7..a4ef1ba 100644
--- a/java/junit/src/org/netbeans/modules/junit/AbstractTestGenerator.java
+++ b/java/junit/src/org/netbeans/modules/junit/AbstractTestGenerator.java
@@ -1466,7 +1466,7 @@ abstract class AbstractTestGenerator implements CancellableTask<WorkingCopy>{
MethodInvocationTree comparison = maker.MethodInvocation(
Collections.<ExpressionTree>emptyList(), //type args.
- (retTypeKind == TypeKind.ARRAY && junitVersion == JUnitVersion.JUNIT4) ? maker.Identifier("assertArrayEquals") : maker.Identifier("assertEquals"), //NOI18N
+ (retTypeKind == TypeKind.ARRAY && (junitVersion == JUnitVersion.JUNIT4 || junitVersion == JUnitVersion.JUNIT5)) ? maker.Identifier("assertArrayEquals") : maker.Identifier("assertEquals"), //NOI18N
comparisonArgs);
StatementTree comparisonStmt = maker.ExpressionStatement(
comparison);
diff --git a/java/junit/src/org/netbeans/modules/junit/Bundle.properties b/java/junit/src/org/netbeans/modules/junit/Bundle.properties
index 1fc0db9..9710aeb 100644
--- a/java/junit/src/org/netbeans/modules/junit/Bundle.properties
+++ b/java/junit/src/org/netbeans/modules/junit/Bundle.properties
@@ -315,6 +315,17 @@ PROP_junit4_testClassTemplate=Templates/UnitTests/JUnit4TestClass.java
#NOI18N - this value is in .properties just to allow branding
PROP_junit4_testSuiteTemplate=Templates/UnitTests/JUnit4Suite.java
+# Test class template for JUnit 5.x tests
+#NOI18N - this value is in .properties just to allow branding
+PROP_junit5_testClassTemplate=Templates/UnitTests/JUnit5TestClass.java
+#NOI18N - this value is in .properties just to allow branding
+PROP_junit5_testSuiteTemplate=Templates/UnitTests/JUnit5Suite.java
+
+MSG_using_junit5_for_test_suites=JUnit 5 doesn't support Test Suites natively. \
+ To use the generated Test Suite you'll need to use the JUnit\
+ Vintage engine. These dependencies will need \
+ to be included manually.
+
# Test case classname prefix/suffix
#NOI18N - this value is in .properties just to allow branding
PROP_test_classname_prefix=
diff --git a/java/junit/src/org/netbeans/modules/junit/ClassMap.java b/java/junit/src/org/netbeans/modules/junit/ClassMap.java
index 98830c6..1e4536a 100644
--- a/java/junit/src/org/netbeans/modules/junit/ClassMap.java
+++ b/java/junit/src/org/netbeans/modules/junit/ClassMap.java
@@ -53,7 +53,8 @@ final class ClassMap {
private static final int BEFORE_CLASS_POS_INDEX = 7;
private static final int AFTER_CLASS_POS_INDEX = 8;
- private static final String JUNIT4_PKG_PREFIX = "org.junit."; //NOI18N
+ private static final String JUNIT4_PKG_PREFIX = "org.junit."; //NOI18N
+ private static final String JUNIT5_PKG_PREFIX = "org.junit.jupiter.api."; //NOI18N
private static final int[] EMPTY_INT_ARRAY = new int[0];
@@ -156,7 +157,25 @@ final class ClassMap {
for (AnnotationMirror annMirror : methodElement.getAnnotationMirrors()) {
Element annElem = annMirror.getAnnotationType().asElement();
String fullName = ((TypeElement) annElem).getQualifiedName().toString();
- if (fullName.startsWith(JUNIT4_PKG_PREFIX)) {
+ if (fullName.startsWith(JUNIT5_PKG_PREFIX)) {
+ String shortName = fullName.substring(JUNIT5_PKG_PREFIX.length());
+ int posIndex;
+ if (shortName.equals("BeforeEach")) { //NOI18N
+ posIndex = BEFORE_POS_INDEX;
+ } else if (shortName.equals("AfterEach")) { //NOI18N
+ posIndex = AFTER_POS_INDEX;
+ } else if (shortName.equals("BeforeAll")) { //NOI18N
+ posIndex = BEFORE_CLASS_POS_INDEX;
+ } else if (shortName.equals("AfterAll")) { //NOI18N
+ posIndex = AFTER_CLASS_POS_INDEX;
+ } else {
+ continue; //next annotation
+ }
+
+ if (map.positions[posIndex] == -1) {
+ map.positions[posIndex] = index;
+ }
+ } else if (fullName.startsWith(JUNIT4_PKG_PREFIX)) {
String shortName = fullName.substring(JUNIT4_PKG_PREFIX.length());
int posIndex;
if (shortName.equals("Before")) { //NOI18N
diff --git a/java/junit/src/org/netbeans/modules/junit/DefaultPlugin.java b/java/junit/src/org/netbeans/modules/junit/DefaultPlugin.java
index a957827..686c33b 100644
--- a/java/junit/src/org/netbeans/modules/junit/DefaultPlugin.java
+++ b/java/junit/src/org/netbeans/modules/junit/DefaultPlugin.java
@@ -123,6 +123,9 @@ public final class DefaultPlugin extends JUnitPlugin {
/** full name of a file specific for the JUnit 4.x library */
private static final String JUNIT4_SPECIFIC
= "org/junit/Test.class"; //NOI18N
+ /** full name of a file specific for the JUnit 5.x library */
+ private static final String JUNIT5_SPECIFIC
+ = "org/junit/platform/commons/annotation/Testable.class"; //NOI18N
/** */
private static JUnitVersion junitVer;
@@ -163,7 +166,9 @@ public final class DefaultPlugin extends JUnitPlugin {
Project project = FileOwnerQuery.getOwner(projectURI);
final ClassPath classPath = getTestClassPath(project);
if (classPath != null) {
- if (classPath.findResource(JUNIT4_SPECIFIC) != null) {
+ if (classPath.findResource(JUNIT5_SPECIFIC) != null) {
+ version = JUnitVersion.JUNIT5.toString();
+ } else if (classPath.findResource(JUNIT4_SPECIFIC) != null) {
version = JUnitVersion.JUNIT4.toString();
} else if (classPath.findResource(JUNIT3_SPECIFIC) != null) {
version = JUnitVersion.JUNIT3.toString();
@@ -858,6 +863,10 @@ public final class DefaultPlugin extends JUnitPlugin {
? "PROP_junit4_testSuiteTemplate" //NOI18N
: null;
break;
+ case JUNIT5:
+ templateId = "PROP_junit5_testClassTemplate"; //NOI18N
+ suiteTemplateId = null;
+ break;
default:
assert false;
templateId = null;
@@ -1110,6 +1119,18 @@ public final class DefaultPlugin extends JUnitPlugin {
return true;
}
return false;
+ case JUNIT5:
+ {
+ sourceLevel = JUnitTestUtil.getSourceLevel(selectedFiles[0]);
+ if (sourceLevel == null) { //could not get source level
+ return true;
+ }
+
+ if (sourceLevel.compareTo("1.8") >= 0) { //NOI18N
+ return true;
+ }
+ return false;
+ }
default:
assert false;
return false;
@@ -1148,6 +1169,18 @@ public final class DefaultPlugin extends JUnitPlugin {
return true;
}
return false;
+ case JUNIT5:
+ {
+ sourceLevel = JUnitTestUtil.getSourceLevel(selectedFiles[0]);
+ if ((sourceLevel != null)
+ && (sourceLevel.compareTo("1.8")) >= 0) { //NOI18N
+ if (storeSettings) {
+ return storeProjectSettingsJUnitVer(project);
+ }
+ return true;
+ }
+ return false;
+ }
default:
assert false;
return false;
@@ -1156,6 +1189,7 @@ public final class DefaultPlugin extends JUnitPlugin {
String msgKey;
boolean offerJUnit4;
+ boolean defaultToJUnit5 = false;
boolean showSourceLevelReqs;
String sourceLevel = JUnitTestUtil.getSourceLevel(selectedFiles[0]);
if (sourceLevel == null) {
@@ -1164,14 +1198,21 @@ public final class DefaultPlugin extends JUnitPlugin {
showSourceLevelReqs = true;
} else {
msgKey = "MSG_select_junit_version"; //NOI18N
+ defaultToJUnit5 = (sourceLevel.compareTo("1.8") >= 0); //NOI18N
offerJUnit4 = (sourceLevel.compareTo("1.5") >= 0); //NOI18N
showSourceLevelReqs = !offerJUnit4;
}
loadJUnitToUseFromPropertiesFile(project);
if(junitVer == null) {
- // probably new project after 8.1, since determining junitVer failed
- // sofar, so as last resort default to 4.x
- junitVer = JUnitVersion.JUNIT4;
+
+ if (defaultToJUnit5) {
+ // Java 8 and above should default to JUnit 5
+ junitVer = JUnitVersion.JUNIT5;
+ } else {
+ // probably new project after 8.1, since determining junitVer failed
+ // sofar, so as last resort default to 4.x
+ junitVer = JUnitVersion.JUNIT4;
+ }
}
if ((junitVer != null) && storeSettings) {
return storeProjectSettingsJUnitVer(project);
@@ -1205,7 +1246,7 @@ public final class DefaultPlugin extends JUnitPlugin {
return answer == selectOption;
}
-
+
/**
*/
private boolean informUserOnlyJUnit3Applicable(String sourceLevel) {
@@ -1259,7 +1300,7 @@ public final class DefaultPlugin extends JUnitPlugin {
try {
Properties props = getProjectProperties(projectDir);
String property = props.getProperty(PROP_JUNIT_SELECTED_VERSION);
- junitVer = property == null ? null : (property.equals("3") ? JUnitVersion.JUNIT3 : JUnitVersion.JUNIT4);
+ junitVer = property == null ? null : (property.equals("3") ? JUnitVersion.JUNIT3 : property.equals("4") ? JUnitVersion.JUNIT4 : JUnitVersion.JUNIT5);
} catch (IOException ex) {
Exceptions.printStackTrace(ex);
}
@@ -1267,80 +1308,80 @@ public final class DefaultPlugin extends JUnitPlugin {
});
}
- /**
- */
- private JUnitVersion askUserWhichJUnitToUse(String msgKey,
- boolean offerJUnit4,
- boolean showSourceLevelCondition) {
- // assert EventQueue.isDispatchThread(); #170707
-
- JRadioButton rbtnJUnit3 = new JRadioButton();
- Mnemonics.setLocalizedText(rbtnJUnit3, bundle.getString("LBL_JUnit3_generator"));
- rbtnJUnit3.getAccessibleContext().setAccessibleDescription(bundle.getString("AD_JUnit3_generator"));
-
- JRadioButton rbtnJUnit4 = new JRadioButton();
- Mnemonics.setLocalizedText(
- rbtnJUnit4,
- showSourceLevelCondition
- ? bundle.getString("LBL_JUnit4_generator_reqs") //NOI18N
- : bundle.getString("LBL_JUnit4_generator")); //NOI18N
- rbtnJUnit4.getAccessibleContext().setAccessibleDescription(bundle.getString("AD_JUnit4_generator"));
-
- ButtonGroup group = new ButtonGroup();
- group.add(rbtnJUnit3);
- group.add(rbtnJUnit4);
-
- if (offerJUnit4) {
- rbtnJUnit4.setSelected(true);
- } else {
- rbtnJUnit3.setSelected(true);
- rbtnJUnit4.setEnabled(false);
- }
-
- JComponent msg
- = createMessageComponent(msgKey);
-
- JPanel choicePanel = new JPanel(new GridLayout(0, 1, 0, 3));
- choicePanel.add(rbtnJUnit3);
- choicePanel.add(rbtnJUnit4);
-
- JPanel panel = new JPanel(new BorderLayout(0, 12));
- panel.add(msg, BorderLayout.NORTH);
- panel.add(choicePanel, BorderLayout.CENTER);
-
- JButton button = new JButton();
- Mnemonics.setLocalizedText(button, bundle.getString("LBL_Select"));
- button.getAccessibleContext().setAccessibleName("AN_Select");
- button.getAccessibleContext().setAccessibleDescription("AD_Select");
-
-// Object selectOption = bundle.getString("LBL_Select"); //NOI18N
- Object answer = DialogDisplayer.getDefault().notify(
- new DialogDescriptor(
- wrapDialogContent(panel),
- bundle.getString("LBL_title_select_generator"),//NOI18N
- true,
- new Object[] {button, CANCEL_OPTION},
- button,
- DialogDescriptor.DEFAULT_ALIGN,
- new HelpCtx(
- "org.netbeans.modules.junit.select_junit_version"),//NOI18N
- (ActionListener) null));
-
- if (answer == button) {
- JUnitVersion ver;
- if (rbtnJUnit3.isSelected()) {
- ver = JUnitVersion.JUNIT3;
- } else if (rbtnJUnit4.isSelected()) {
- ver = JUnitVersion.JUNIT4;
- } else {
- assert false;
- ver = null;
- }
- return ver;
- } else {
- return null;
- }
- }
+// /**
+// */
+// private JUnitVersion askUserWhichJUnitToUse(String msgKey,
+// boolean offerJUnit4,
+// boolean showSourceLevelCondition) {
+// // assert EventQueue.isDispatchThread(); #170707
+//
+// JRadioButton rbtnJUnit3 = new JRadioButton();
+// Mnemonics.setLocalizedText(rbtnJUnit3, bundle.getString("LBL_JUnit3_generator"));
+// rbtnJUnit3.getAccessibleContext().setAccessibleDescription(bundle.getString("AD_JUnit3_generator"));
+//
+// JRadioButton rbtnJUnit4 = new JRadioButton();
+// Mnemonics.setLocalizedText(
+// rbtnJUnit4,
+// showSourceLevelCondition
+// ? bundle.getString("LBL_JUnit4_generator_reqs") //NOI18N
+// : bundle.getString("LBL_JUnit4_generator")); //NOI18N
+// rbtnJUnit4.getAccessibleContext().setAccessibleDescription(bundle.getString("AD_JUnit4_generator"));
+//
+// ButtonGroup group = new ButtonGroup();
+// group.add(rbtnJUnit3);
+// group.add(rbtnJUnit4);
+//
+// if (offerJUnit4) {
+// rbtnJUnit4.setSelected(true);
+// } else {
+// rbtnJUnit3.setSelected(true);
+// rbtnJUnit4.setEnabled(false);
+// }
+//
+// JComponent msg
+// = createMessageComponent(msgKey);
+//
+// JPanel choicePanel = new JPanel(new GridLayout(0, 1, 0, 3));
+// choicePanel.add(rbtnJUnit3);
+// choicePanel.add(rbtnJUnit4);
+//
+// JPanel panel = new JPanel(new BorderLayout(0, 12));
+// panel.add(msg, BorderLayout.NORTH);
+// panel.add(choicePanel, BorderLayout.CENTER);
+//
+// JButton button = new JButton();
+// Mnemonics.setLocalizedText(button, bundle.getString("LBL_Select"));
+// button.getAccessibleContext().setAccessibleName("AN_Select");
+// button.getAccessibleContext().setAccessibleDescription("AD_Select");
+//
+//// Object selectOption = bundle.getString("LBL_Select"); //NOI18N
+// Object answer = DialogDisplayer.getDefault().notify(
+// new DialogDescriptor(
+// wrapDialogContent(panel),
+// bundle.getString("LBL_title_select_generator"),//NOI18N
+// true,
+// new Object[] {button, CANCEL_OPTION},
+// button,
+// DialogDescriptor.DEFAULT_ALIGN,
+// new HelpCtx(
+// "org.netbeans.modules.junit.select_junit_version"),//NOI18N
+// (ActionListener) null));
+//
+// if (answer == button) {
+// JUnitVersion ver;
+// if (rbtnJUnit3.isSelected()) {
+// ver = JUnitVersion.JUNIT3;
+// } else if (rbtnJUnit4.isSelected()) {
+// ver = JUnitVersion.JUNIT4;
+// } else {
+// assert false;
+// ver = null;
+// }
+// return ver;
+// } else {
+// return null;
+// }
+// }
/**
*/
@@ -1400,6 +1441,7 @@ public final class DefaultPlugin extends JUnitPlugin {
final boolean hasJUnit3;
final boolean hasJUnit4;
+ final boolean hasJUnit5;
final ClassPath classPath = getTestClassPath(project); //may throw ISE
loadJUnitToUseFromPropertiesFile(project);
@@ -1407,14 +1449,16 @@ public final class DefaultPlugin extends JUnitPlugin {
if (classPath != null) {
hasJUnit3 = (classPath.findResource(JUNIT3_SPECIFIC) != null);
hasJUnit4 = (classPath.findResource(JUNIT4_SPECIFIC) != null);
+ hasJUnit5 = (classPath.findResource(JUNIT5_SPECIFIC) != null);
} else {
hasJUnit3 = false;
hasJUnit4 = false;
+ hasJUnit5 = false;
}
- if (hasJUnit3 != hasJUnit4) {
+ if (hasJUnit3 || hasJUnit4 || hasJUnit5) {
junitVer = hasJUnit3 ? JUnitVersion.JUNIT3
- : JUnitVersion.JUNIT4;
+ : hasJUnit4 ? JUnitVersion.JUNIT4 : JUnitVersion.JUNIT5;
if (LOG_JUNIT_VER.isLoggable(FINEST)) {
LOG_JUNIT_VER.finest(" - detected version " + junitVer);//NOI18N
}
@@ -1491,17 +1535,20 @@ public final class DefaultPlugin extends JUnitPlugin {
final boolean hasJUnit3;
final boolean hasJUnit4;
+ final boolean hasJUnit5;
final ClassPath classPath = getTestClassPath(project);
if (classPath != null) {
hasJUnit3 = (classPath.findResource(JUNIT3_SPECIFIC) != null);
hasJUnit4 = (classPath.findResource(JUNIT4_SPECIFIC) != null);
+ hasJUnit5 = (classPath.findResource(JUNIT5_SPECIFIC) != null);
} else {
hasJUnit3 = false;
hasJUnit4 = false;
+ hasJUnit5 = false;
}
final Pattern pattern = Pattern.compile(
- "^junit(?:_|\\W)+([34])(?:\\b|_).*"); //NOI18N
+ "^junit(?:_|\\W)+([345])(?:\\b|_).*"); //NOI18N
JUnitLibraryComparator libraryComparator = null;
@@ -1533,6 +1580,8 @@ public final class DefaultPlugin extends JUnitPlugin {
verNumToAdd = "3"; //NOI18N
} else if ((junitVer == JUnitVersion.JUNIT4) && !hasJUnit4) {
verNumToAdd = "4"; //NOI18N
+ } else if ((junitVer == JUnitVersion.JUNIT5) && !hasJUnit5) {
+ verNumToAdd = "5"; //NOI18N
} else {
verNumToAdd = null;
}
@@ -1591,11 +1640,16 @@ public final class DefaultPlugin extends JUnitPlugin {
final Library[] libsToAdd, libsToRemove;
if (libraryToAdd != null) {
- // junit-3.8.2 binaries were removed from standard build. User can
- // open legacy project with or create new testcases using junit 3.x
- // style. junit-4.x and hamcrest binaries are added as test
- // dependencies for the project in those cases as well.
- libsToAdd = new Library[] {libraryToAdd, libraryHamcrest};
+ if (junitVer == JUnitVersion.JUNIT5){
+ // junit 5 doesn't require hamcrest
+ libsToAdd = new Library[] {libraryToAdd};
+ } else {
+ // junit-3.8.2 binaries were removed from standard build. User can
+ // open legacy project with or create new testcases using junit 3.x
+ // style. junit-4.x and hamcrest binaries are added as test
+ // dependencies for the project in those cases as well.
+ libsToAdd = new Library[] {libraryToAdd, libraryHamcrest};
+ }
} else{
libsToAdd = null;
}
@@ -2080,6 +2134,10 @@ public final class DefaultPlugin extends JUnitPlugin {
case JUNIT4:
templateId = "PROP_junit4_testSuiteTemplate"; //NOI18N
break;
+ case JUNIT5:
+ // JUnit5 doesnt support Suites except via their Vintage engine
+ templateId = "PROP_junit5_testSuiteTemplate"; //NOI18N
+ break;
default:
assert false;
templateId = null;
@@ -2179,6 +2237,9 @@ public final class DefaultPlugin extends JUnitPlugin {
case JUNIT4:
supported = true;
break;
+ case JUNIT5:
+ supported = true;
+ break;
default:
supported = false;
break;
diff --git a/java/junit/src/org/netbeans/modules/junit/JUnit5TestGenerator.java b/java/junit/src/org/netbeans/modules/junit/JUnit5TestGenerator.java
new file mode 100644
index 0000000..6262dac
--- /dev/null
+++ b/java/junit/src/org/netbeans/modules/junit/JUnit5TestGenerator.java
@@ -0,0 +1,410 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.netbeans.modules.junit;
+
+import com.sun.source.tree.BlockTree;
+import com.sun.source.tree.ClassTree;
+import com.sun.source.tree.ExpressionTree;
+import com.sun.source.tree.MethodTree;
+import com.sun.source.tree.ModifiersTree;
+import com.sun.source.tree.StatementTree;
+import com.sun.source.tree.Tree;
+import com.sun.source.tree.TypeParameterTree;
+import com.sun.source.tree.VariableTree;
+import com.sun.source.util.TreePath;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import javax.lang.model.element.AnnotationValue;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.Name;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.TypeKind;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.Types;
+import org.netbeans.api.java.source.ElementHandle;
+import org.netbeans.api.java.source.TreeMaker;
+import org.netbeans.api.java.source.WorkingCopy;
+import static javax.lang.model.element.Modifier.PUBLIC;
+import static javax.lang.model.element.Modifier.STATIC;
+
+/**
+ *
+ * @author Marian Petras
+ */
+final class JUnit5TestGenerator extends AbstractTestGenerator {
+
+ /** */
+ static final String ANN_BEFORE_CLASS = "org.junit.jupiter.api.BeforeAll"; //NOI18N
+ /** */
+ static final String ANN_AFTER_CLASS = "org.junit.jupiter.api.AfterAll"; //NOI18N
+ /** */
+ static final String ANN_BEFORE = "org.junit.jupiter.api.BeforeEach"; //NOI18N
+ /** */
+ static final String ANN_AFTER = "org.junit.jupiter.api.AfterEach"; //NOI18N
+ /** */
+ static final String ANN_TEST = "org.junit.jupiter.api.Test"; //NOI18N
+ /** */
+ private static final String BEFORE_CLASS_METHOD_NAME = "setUpClass";//NOI18N
+ /** */
+ private static final String AFTER_CLASS_METHOD_NAME = "tearDownClass";//NOI18N
+ /** */
+ private static final String BEFORE_METHOD_NAME = "setUp"; //NOI18N
+ /** */
+ private static final String AFTER_METHOD_NAME = "tearDown"; //NOI18N
+
+ /**
+ */
+ JUnit5TestGenerator(TestGeneratorSetup setup) {
+ super(setup, JUnitVersion.JUNIT5);
+ }
+
+ /**
+ */
+ JUnit5TestGenerator(TestGeneratorSetup setup,
+ List<ElementHandle<TypeElement>> srcTopClassHandles,
+ List<String>suiteMembers,
+ boolean isNewTestClass) {
+ super(setup, srcTopClassHandles, suiteMembers, isNewTestClass, JUnitVersion.JUNIT5);
+ }
+
+
+ /**
+ */
+ @Override
+ protected ClassTree composeNewTestClass(WorkingCopy workingCopy,
+ String name,
+ List<? extends Tree> members) {
+ final TreeMaker maker = workingCopy.getTreeMaker();
+ ModifiersTree modifiers = maker.Modifiers(
+ Collections.<Modifier>singleton(PUBLIC));
+ return maker.Class(
+ modifiers, //modifiers
+ name, //name
+ Collections.<TypeParameterTree>emptyList(),//type params
+ null, //extends
+ Collections.<ExpressionTree>emptyList(), //implements
+ members); //members
+ }
+
+ /**
+ */
+ @Override
+ protected List<? extends Tree> generateInitMembers(WorkingCopy workingCopy) {
+ if (!setup.isGenerateBefore() && !setup.isGenerateAfter()
+ && !setup.isGenerateBeforeClass() && !setup.isGenerateAfterClass()) {
+ return Collections.<Tree>emptyList();
+ }
+
+ List<MethodTree> result = new ArrayList<MethodTree>(4);
+ if (setup.isGenerateBeforeClass()) {
+ result.add(
+ generateInitMethod(BEFORE_CLASS_METHOD_NAME, ANN_BEFORE_CLASS, true, workingCopy));
+ }
+ if (setup.isGenerateAfterClass()) {
+ result.add(
+ generateInitMethod(AFTER_CLASS_METHOD_NAME, ANN_AFTER_CLASS, true, workingCopy));
+ }
+ if (setup.isGenerateBefore()) {
+ result.add(
+ generateInitMethod(BEFORE_METHOD_NAME, ANN_BEFORE, false, workingCopy));
+ }
+ if (setup.isGenerateAfter()) {
+ result.add(
+ generateInitMethod(AFTER_METHOD_NAME, ANN_AFTER, false, workingCopy));
+ }
+ return result;
+ }
+
+ /**
+ */
+ @Override
+ protected ClassTree generateMissingInitMembers(ClassTree tstClass,
+ TreePath tstClassTreePath,
+ WorkingCopy workingCopy) {
+ if (!setup.isGenerateBefore() && !setup.isGenerateAfter()
+ && !setup.isGenerateBeforeClass() && !setup.isGenerateAfterClass()) {
+ return tstClass;
+ }
+
+ ClassMap classMap = ClassMap.forClass(tstClass, tstClassTreePath,
+ workingCopy.getTrees());
+
+ if ((!setup.isGenerateBefore() || classMap.containsBefore())
+ && (!setup.isGenerateAfter() || classMap.containsAfter())
+ && (!setup.isGenerateBeforeClass() || classMap.containsBeforeClass())
+ && (!setup.isGenerateAfterClass() || classMap.containsAfterClass())) {
+ return tstClass;
+ }
+
+ final TreeMaker maker = workingCopy.getTreeMaker();
+
+ List<? extends Tree> tstMembersOrig = tstClass.getMembers();
+ List<Tree> tstMembers = new ArrayList<Tree>(tstMembersOrig.size() + 4);
+ tstMembers.addAll(tstMembersOrig);
+
+ generateMissingInitMembers(tstMembers, classMap, workingCopy);
+
+ ClassTree newClass = maker.Class(
+ tstClass.getModifiers(),
+ tstClass.getSimpleName(),
+ tstClass.getTypeParameters(),
+ tstClass.getExtendsClause(),
+ (List<? extends ExpressionTree>) tstClass.getImplementsClause(),
+ tstMembers);
+ return newClass;
+ }
+
+ /**
+ */
+ @Override
+ protected boolean generateMissingInitMembers(List<Tree> tstMembers,
+ ClassMap clsMap,
+ WorkingCopy workingCopy) {
+ boolean modified = false;
+
+ if (setup.isGenerateBeforeClass() && !clsMap.containsBeforeClass()) {
+ int targetIndex;
+ if (clsMap.containsAfterClass()) {
+ targetIndex = clsMap.getAfterClassIndex();
+ } else {
+ int beforeIndex = clsMap.getBeforeIndex();
+ int afterIndex = clsMap.getAfterIndex();
+ if ((beforeIndex != -1) && (afterIndex != -1)) {
+ targetIndex = Math.min(beforeIndex, afterIndex);
+ } else {
+ targetIndex = Math.max(beforeIndex, afterIndex);
+ }
+ }
+ addInitMethod(BEFORE_CLASS_METHOD_NAME,
+ ANN_BEFORE_CLASS,
+ true,
+ targetIndex,
+ tstMembers,
+ clsMap,
+ workingCopy);
+ modified = true;
+ }
+ if (setup.isGenerateAfterClass() && !clsMap.containsAfterClass()) {
+ int targetIndex;
+ if (clsMap.containsBeforeClass()) {
+ targetIndex = clsMap.getBeforeClassIndex() + 1;
+ } else {
+ int beforeIndex = clsMap.getBeforeIndex();
+ int afterIndex = clsMap.getAfterIndex();
+ if ((beforeIndex != -1) && (afterIndex != -1)) {
+ targetIndex = Math.min(beforeIndex, afterIndex);
+ } else {
+ targetIndex = Math.max(beforeIndex, afterIndex);
+ }
+ }
+ addInitMethod(AFTER_CLASS_METHOD_NAME,
+ ANN_AFTER_CLASS,
+ true,
+ targetIndex,
+ tstMembers,
+ clsMap,
+ workingCopy);
+ modified = true;
+ }
+ if (setup.isGenerateBefore() && !clsMap.containsBefore()) {
+ int targetIndex;
+ if (clsMap.containsAfter()) {
+ targetIndex = clsMap.getAfterIndex();
+ } else {
+ int beforeClassIndex = clsMap.getBeforeClassIndex();
+ int afterClassIndex = clsMap.getAfterClassIndex();
+
+ targetIndex = Math.max(beforeClassIndex, afterClassIndex);
+ if (targetIndex != -1) {
+ targetIndex++;
+ }
+ }
+ addInitMethod(BEFORE_METHOD_NAME,
+ ANN_BEFORE,
+ false,
+ targetIndex,
+ tstMembers,
+ clsMap,
+ workingCopy);
+ modified = true;
+ }
+ if (setup.isGenerateAfter() && !clsMap.containsAfter()) {
+ int targetIndex;
+ if (clsMap.containsBefore()) {
+ targetIndex = clsMap.getBeforeIndex() + 1;
+ } else {
+ int beforeClassIndex = clsMap.getBeforeClassIndex();
+ int afterClassIndex = clsMap.getAfterClassIndex();
+ targetIndex = Math.max(beforeClassIndex, afterClassIndex);
+ if (targetIndex != -1) {
+ targetIndex++;
+ }
+ }
+ addInitMethod(AFTER_METHOD_NAME,
+ ANN_AFTER,
+ false,
+ targetIndex,
+ tstMembers,
+ clsMap,
+ workingCopy);
+ modified = true;
+ }
+
+ return modified;
+ }
+
+ /**
+ */
+ private void addInitMethod(String methodName,
+ String annotationClassName,
+ boolean isStatic,
+ int targetIndex,
+ List<Tree> clsMembers,
+ ClassMap clsMap,
+ WorkingCopy workingCopy) {
+ MethodTree initMethod = generateInitMethod(methodName,
+ annotationClassName,
+ isStatic,
+ workingCopy);
+
+ if (targetIndex == -1) {
+ targetIndex = getPlaceForFirstInitMethod(clsMap);
+ }
+
+ if (targetIndex != -1) {
+ clsMembers.add(targetIndex, initMethod);
+ } else {
+ clsMembers.add(initMethod);
+ }
+ clsMap.addNoArgMethod(methodName, annotationClassName, targetIndex);
+ }
+
+ /**
+ * Generates a set-up or a tear-down method.
+ * The generated method will have no arguments, void return type
+ * and a declaration that it may throw {@code java.lang.Exception}.
+ * The method will have a declared protected member access.
+ * The method contains call of the corresponding super method, i.e.
+ * {@code super.setUp()} or {@code super.tearDown()}.
+ *
+ * @param methodName name of the method to be created
+ * @return created method
+ * @see http://junit.sourceforge.net/javadoc/junit/framework/TestCase.html
+ * methods {@code setUp()} and {@code tearDown()}
+ */
+ private MethodTree generateInitMethod(String methodName,
+ String annotationClassName,
+ boolean isStatic,
+ WorkingCopy workingCopy) {
+ Set<Modifier> methodModifiers
+ = isStatic ? createModifierSet(PUBLIC, STATIC)
+ : Collections.<Modifier>singleton(PUBLIC);
+ ModifiersTree modifiers = createModifiersTree(annotationClassName,
+ methodModifiers,
+ workingCopy);
+ TreeMaker maker = workingCopy.getTreeMaker();
+ BlockTree methodBody = maker.Block(
+ Collections.<StatementTree>emptyList(),
+ false);
+ MethodTree method = maker.Method(
+ modifiers, // modifiers
+ methodName, // name
+ maker.PrimitiveType(TypeKind.VOID), // return type
+ Collections.<TypeParameterTree>emptyList(), // type params
+ Collections.<VariableTree>emptyList(), // parameters
+ Collections.<ExpressionTree>singletonList(
+ maker.Identifier("Exception")), // throws...//NOI18N
+ methodBody,
+ null); // default value
+ return method;
+ }
+
+ /**
+ */
+ @Override
+ protected void generateMissingPostInitMethods(TreePath tstClassTreePath,
+ List<Tree> tstMembers,
+ ClassMap clsMap,
+ WorkingCopy workingCopy) {
+ /* no post-init methods */
+ }
+
+ /**
+ */
+ @Override
+ protected MethodTree composeNewTestMethod(String testMethodName,
+ BlockTree testMethodBody,
+ List<ExpressionTree> throwsList,
+ WorkingCopy workingCopy) {
+ TreeMaker maker = workingCopy.getTreeMaker();
+ return maker.Method(
+ createModifiersTree(ANN_TEST,
+ createModifierSet(PUBLIC),
+ workingCopy),
+ testMethodName,
+ maker.PrimitiveType(TypeKind.VOID),
+ Collections.<TypeParameterTree>emptyList(),
+ Collections.<VariableTree>emptyList(),
+ throwsList,
+ testMethodBody,
+ null); //default value - used by annotations
+ }
+
+ /**
+ */
+ @Override
+ protected ClassTree finishSuiteClass(ClassTree tstClass,
+ TreePath tstClassTreePath,
+ List<Tree> tstMembers,
+ List<String> suiteMembers,
+ boolean membersChanged,
+ ClassMap classMap,
+ WorkingCopy workingCopy) {
+ return tstClass;
+ }
+
+
+ /**
+ * Returns fully qualified class name of a class given to an annotation
+ * as (the only) argument.
+ *
+ * @param annValue annotation value
+ * @return fully qualified name of a class represented by the given
+ * annotation value, or {@code null} if the annotation value
+ * does not represent a class
+ */
+ private Name getAnnotationValueClassName(AnnotationValue annValue,
+ Types types) {
+ Object value = annValue.getValue();
+ if (value instanceof TypeMirror) {
+ TypeMirror typeMirror = (TypeMirror) value;
+ Element typeElement = types.asElement(typeMirror);
+ if (typeElement.getKind() == ElementKind.CLASS) {
+ return ((TypeElement) typeElement).getQualifiedName();
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/java/junit/src/org/netbeans/modules/junit/JUnitVersion.java b/java/junit/src/org/netbeans/modules/junit/JUnitVersion.java
index c4b2054..ce5fca3 100644
--- a/java/junit/src/org/netbeans/modules/junit/JUnitVersion.java
+++ b/java/junit/src/org/netbeans/modules/junit/JUnitVersion.java
@@ -23,5 +23,6 @@ package org.netbeans.modules.junit;
*/
public enum JUnitVersion {
JUNIT3,
- JUNIT4
+ JUNIT4,
+ JUNIT5
}
diff --git a/java/junit/src/org/netbeans/modules/junit/TestCreator.java b/java/junit/src/org/netbeans/modules/junit/TestCreator.java
index f7e01ac..a7efeb2 100644
--- a/java/junit/src/org/netbeans/modules/junit/TestCreator.java
+++ b/java/junit/src/org/netbeans/modules/junit/TestCreator.java
@@ -31,6 +31,7 @@ import java.util.concurrent.Future;
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.Modifier;
import javax.lang.model.element.TypeElement;
+import javax.swing.JComponent;
import org.netbeans.api.java.source.CompilationController;
import org.netbeans.api.java.source.CompilationInfo;
import org.netbeans.api.java.source.ElementHandle;
@@ -39,8 +40,12 @@ import org.netbeans.api.java.source.ModificationResult;
import org.netbeans.api.java.source.Task;
//import org.netbeans.modules.junit.plugin.JUnitPlugin.CreateTestParam;
import org.netbeans.modules.gsf.testrunner.plugin.CommonPlugin.CreateTestParam;
+import org.netbeans.modules.java.testrunner.GuiUtils;
+import org.openide.NotifyDescriptor;
import org.openide.filesystems.FileObject;
import org.openide.util.Exceptions;
+import org.openide.util.Mutex;
+import org.openide.util.NbBundle;
/**
*
@@ -90,6 +95,9 @@ public final class TestCreator implements TestabilityJudge {
case JUNIT4:
testGenerator = new JUnit4TestGenerator(setup);
break;
+ case JUNIT5:
+ testGenerator = new JUnit5TestGenerator(setup);
+ break;
default:
throw new IllegalStateException("junit version not set");//NOI18N
}
@@ -120,6 +128,13 @@ public final class TestCreator implements TestabilityJudge {
null,
isNewTestClass);
break;
+ case JUNIT5:
+ testGenerator = new JUnit5TestGenerator(
+ setup,
+ Collections.singletonList(topClassToTest),
+ null,
+ isNewTestClass);
+ break;
default:
throw new IllegalStateException("junit version not set");//NOI18N
}
@@ -148,6 +163,16 @@ public final class TestCreator implements TestabilityJudge {
suiteMembers,
isNewTestClass);
break;
+ case JUNIT5:
+ testGenerator = new JUnit5TestGenerator(
+ setup,
+ null,
+ suiteMembers,
+ isNewTestClass);
+ String message = NbBundle.getMessage(getClass(), "MSG_using_junit5_for_test_suites");
+ JUnitTestUtil.notifyUser(message, NotifyDescriptor.INFORMATION_MESSAGE);
+ break;
+
default:
throw new IllegalStateException("junit version not set");//NOI18N
}
@@ -180,5 +205,5 @@ public final class TestCreator implements TestabilityJudge {
public boolean isMethodTestable(ExecutableElement method) {
return setup.isMethodTestable(method);
}
-
+
}
diff --git a/java/junit/src/org/netbeans/modules/junit/api/JUnitSettings.java b/java/junit/src/org/netbeans/modules/junit/api/JUnitSettings.java
index a891dfb..3127e2d 100644
--- a/java/junit/src/org/netbeans/modules/junit/api/JUnitSettings.java
+++ b/java/junit/src/org/netbeans/modules/junit/api/JUnitSettings.java
@@ -39,6 +39,8 @@ public class JUnitSettings extends CommonSettings {
/** */
static final String JUNIT4_GENERATOR = JUnitVersion.JUNIT4.name().toLowerCase();
/** */
+ static final String JUNIT5_GENERATOR = JUnitVersion.JUNIT5.name().toLowerCase();
+ /** */
static final String JUNIT_GENERATOR_ASK_USER = "ask"; //NOI18N
/** */
static final String DEFAULT_GENERATOR = JUNIT_GENERATOR_ASK_USER;
diff --git a/java/junit/test/qa-functional/data/JunitTestProject/nbproject/private/private.xml b/java/junit/test/qa-functional/data/JunitTestProject/nbproject/private/private.xml
new file mode 100644
index 0000000..4750962
--- /dev/null
+++ b/java/junit/test/qa-functional/data/JunitTestProject/nbproject/private/private.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
+ <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
+</project-private>
diff --git a/java/maven/manifest.mf b/java/maven/manifest.mf
index 34035b4..55d4719 100644
--- a/java/maven/manifest.mf
+++ b/java/maven/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.maven/2
-OpenIDE-Module-Specification-Version: 2.130
+OpenIDE-Module-Specification-Version: 2.131
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/maven/layer.xml
AutoUpdate-Show-In-Client: false
diff --git a/java/maven/src/org/netbeans/modules/maven/ActionProviderImpl.java b/java/maven/src/org/netbeans/modules/maven/ActionProviderImpl.java
index db65ad2..b80faa6 100644
--- a/java/maven/src/org/netbeans/modules/maven/ActionProviderImpl.java
+++ b/java/maven/src/org/netbeans/modules/maven/ActionProviderImpl.java
@@ -171,6 +171,11 @@ public class ActionProviderImpl implements ActionProvider {
String v = PluginPropertyUtils.getPluginVersion(proj.getLookup().lookup(NbMavenProject.class).getMavenProject(), Constants.GROUP_APACHE_PLUGINS, Constants.PLUGIN_SUREFIRE);
return v != null && new ComparableVersion(v).compareTo(new ComparableVersion("2.8")) >= 0;
}
+
+ private boolean usingSurefire2_22() {
+ String v = PluginPropertyUtils.getPluginVersion(proj.getLookup().lookup(NbMavenProject.class).getMavenProject(), Constants.GROUP_APACHE_PLUGINS, Constants.PLUGIN_SUREFIRE);
+ return v != null && new ComparableVersion(v).compareTo(new ComparableVersion("2.22.0")) >= 0;
+ }
private boolean usingJUnit4() { // SUREFIRE-724
for (Artifact a : proj.getLookup().lookup(NbMavenProject.class).getMavenProject().getArtifacts()) {
@@ -183,6 +188,12 @@ public class ActionProviderImpl implements ActionProvider {
}
return false;
}
+
+ private boolean usingJUnit5() {
+ return proj.getLookup().lookup(NbMavenProject.class).getMavenProject().getArtifacts()
+ .stream()
+ .anyMatch((a) -> ("org.junit.jupiter".equals(a.getGroupId()) && "junit-jupiter-engine".equals(a.getArtifactId())));
+ }
private boolean usingTestNG() {
for (Artifact a : proj.getLookup().lookup(NbMavenProject.class).getMavenProject().getArtifacts()) {
@@ -194,7 +205,7 @@ public class ActionProviderImpl implements ActionProvider {
}
boolean runSingleMethodEnabled() {
- return usingSurefire28() && (usingJUnit4() || usingTestNG());
+ return (usingSurefire28() && (usingJUnit4() || usingTestNG())) || (usingSurefire2_22() && usingJUnit5());
}
//TODO these effectively need updating once in a while
diff --git a/java/maven/test/unit/src/org/netbeans/modules/maven/ActionProviderImplTest.java b/java/maven/test/unit/src/org/netbeans/modules/maven/ActionProviderImplTest.java
index 87e39e0..f41ea26 100644
--- a/java/maven/test/unit/src/org/netbeans/modules/maven/ActionProviderImplTest.java
+++ b/java/maven/test/unit/src/org/netbeans/modules/maven/ActionProviderImplTest.java
@@ -102,6 +102,17 @@ public class ActionProviderImplTest extends NbTestCase {
assertSupportsRunSingleMethod(ProjectManager.getDefault().findProject(FileUtil.toFileObject(getWorkDir())), true);
}
+ public void testRunSingleMethodDisabledForJUnit5() throws Exception {
+ TestFileUtils.writeFile(new File(getWorkDir(), "pom.xml"), "<project><modelVersion>4.0.0</modelVersion>"
+ + "<groupId>test</groupId><artifactId>prj</artifactId>"
+ + "<version>1.0</version>"
+ + "<build><plugins><plugin><groupId>org.apache.maven.plugins</groupId><artifactId>maven-surefire-plugin</artifactId><version>2.22.0</version></plugin></plugins></build>"
+ + "<dependencies><dependency><groupId>org.junit.jupiter</groupId><artifactId>junit-jupiter-api</artifactId><version>5.3.1</version><scope>test</scope></dependency><dependency><groupId>org.junit.jupiter</groupId><artifactId>junit-jupiter-params</artifactId><version>5.3.1</version><scope>test</scope></dependency><dependency><groupId>org.junit.jupiter</groupId><artifactId>junit-jupiter-engine</artifactId><version>5.3.1</version><scope>test</scope></dependency></dependencies>"
+ + "<properties><netbeans.compile.on.save>none</netbeans.compile.on.save></properties>"
+ + "</project>");
+ assertSupportsRunSingleMethod(ProjectManager.getDefault().findProject(FileUtil.toFileObject(getWorkDir())), true);
+ }
+
private static void assertSupportsRunSingleMethod(Project p, boolean supports) {
ActionProviderImpl ap = p.getLookup().lookup(ActionProviderImpl.class);
assertNotNull(ap);
diff --git a/nbbuild/cluster.properties b/nbbuild/cluster.properties
index 9251b7d..016b013 100644
--- a/nbbuild/cluster.properties
+++ b/nbbuild/cluster.properties
@@ -226,6 +226,7 @@ nb.cluster.platform=\
libs.jna.platform,\
libs.jsr223,\
libs.junit4,\
+ libs.junit5,\
libs.osgi,\
libs.testng,\
masterfs,\
diff --git a/nbbuild/licenses/EPL-v20 b/nbbuild/licenses/EPL-v20
new file mode 100644
index 0000000..632fe4a
--- /dev/null
+++ b/nbbuild/licenses/EPL-v20
@@ -0,0 +1,86 @@
+Eclipse Public License - v 2.0
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. Definitions
+“Contribution” means:
+
+a) in the case of the initial Contributor, the initial content Distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+i) changes to the Program, and
+ii) additions to the Program; where such changes and/or additions to the Program originate from and are Distributed by that particular Contributor. A Contribution “originates” from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include changes or additions to the Program that are not Modified Works.
+“Contributor” means any person or entity that Distributes the Program.
+
+“Licensed Patents” mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+“Program” means the Contributions Distributed in accordance with this Agreement.
+
+“Recipient” means anyone who receives the Program under this Agreement or any Secondary License (as applicable), including Contributors.
+
+“Derivative Works” shall mean any work, whether in Source Code or other form, that is based on (or derived from) the Program and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship.
+
+“Modified Works” shall mean any work in Source Code or other form that results from an addition to, deletion from, or modification of the contents of the Program, including, for purposes of clarity any new file in Source Code form that contains any contents of the Program. Modified Works shall not include works that contain only declarations, interfaces, types, classes, structures, or files of the Program solely in each case in order to link to, bind by name, or subclass the Program or M [...]
+
+“Distribute” means the acts of a) distributing or b) making available in any manner that enables the transfer of a copy.
+
+“Source Code” means the form of a Program preferred for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+“Secondary License” means either the GNU General Public License, Version 2.0, or any later versions of that license, including any exceptions or additional permissions as identified by the initial Contributor.
+
+2. Grant of Rights
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, Distribute and sublicense the Contribution of such Contributor, if any, and such Derivative Works.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in Source Code or other form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution cause [...]
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted here [...]
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+e) Notwithstanding the terms of any Secondary License, no Contributor makes additional grants to any Recipient (other than those set forth in this Agreement) as a result of such Recipient's receipt of the Program under the terms of a Secondary License (if permitted under the terms of Section 3).
+
+3. Requirements
+3.1 If a Contributor Distributes the Program in any form, then:
+
+a) the Program must also be made available as Source Code, in accordance with section 3.2, and the Contributor must accompany the Program with a statement that the Source Code for the Program is available under this Agreement, and informs Recipients how to obtain it in a reasonable manner on or through a medium customarily used for software exchange; and
+
+b) the Contributor may Distribute the Program under a license different than this Agreement, provided that such license:
+
+i) effectively disclaims on behalf of all other Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+ii) effectively excludes on behalf of all other Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+iii) does not attempt to limit or alter the recipients' rights in the Source Code under section 3.2; and
+iv) requires any subsequent distribution of the Program by any party to be under a license that satisfies the requirements of this section 3.
+3.2 When the Program is Distributed as Source Code:
+
+a) it must be made available under this Agreement, or if the Program (i) is combined with other material in a separate file or files made available under a Secondary License, and (ii) the initial Contributor attached to the Source Code the notice described in Exhibit A of this Agreement, then the Program may be made available under the terms of such Secondary Licenses, and
+b) a copy of this Agreement must be included with each copy of the Program.
+3.3 Contributors may not remove or alter any copyright, patent, trademark, attribution notices, disclaimers of warranty, or limitations of liability (“notices”) contained within the Program from any copy of the Program which they Distribute, provided that Contributors may add their own appropriate notices.
+
+4. Commercial Distribution
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor (“Commercial Con [...]
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims [...]
+
+5. No Warranty
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks assoc [...]
+
+6. Disclaimer of Liability
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EX [...]
+
+7. General
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Reci [...]
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the respons [...]
+
+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. Nothing in this Agreement is intended to be enforceable by any entity that is not a Contributor or Recipient. No third-party beneficiary rights are created under this Agreement.
+
+Exhibit A - Form of Secondary Licenses Notice
+“This Source Code may also be made available under the following Secondary Licenses when the conditions for such availability set forth in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), version(s), and exceptions or additional permissions here}.”
+
+Simply including a copy of this Agreement, including this Exhibit A is not sufficient to license the Source Code under Secondary Licenses.
+
+If it is not possible or desirable to put the notice in a particular file, then You may include the notice in a location (such as a LICENSE file in a relevant directory) where a recipient would be likely to look for such a notice.
+
+You may add additional accurate notices of copyright ownership.
diff --git a/nbbuild/licenses/names.properties b/nbbuild/licenses/names.properties
index e51c648..bffd70f 100644
--- a/nbbuild/licenses/names.properties
+++ b/nbbuild/licenses/names.properties
@@ -42,6 +42,7 @@ CC0-v10=Creative Commons CC0 1.0 Universal
EPL-v10=Eclipse Public License v1 (https://www.eclipse.org/legal/epl-v10.html)
EPL-v10-eclipselink=Eclipse Public License v1, eclipselink variant
EPL-v10-h2=Eclipse Public License v1, h2 variant
+EPL-v20=Eclipse Public License v2.0
INRIA=BSD license with INRIA headers
CDDL-GPL-2-CP=Dual license consisting of the CDDL v1.1 and GPL v2 with Classpath exception
Apache-2.0+BSD-INRIA=Apache Version 2.0 and BSD license with INRIA copyright
diff --git a/platform/junitlib/external/binaries-list b/platform/junitlib/external/binaries-list
index 9932bc7..cf13162 100644
--- a/platform/junitlib/external/binaries-list
+++ b/platform/junitlib/external/binaries-list
@@ -16,3 +16,9 @@
# under the License.
A6C32B40BF3D76ECA54E3C601E5D1470C86FCDFA junit:junit:4.12:sources
941A8BE4506C65F0A9001C08812FB7DA1E505E21 junit:junit:4.12:javadoc
+B03F607C0822A283C972E37EAEACB00DC3A3C2E7 org.junit.jupiter:junit-jupiter-api:5.3.1:sources
+0E681A5388FC994AC6723CD47D39A56434B83033 org.junit.jupiter:junit-jupiter-api:5.3.1:javadoc
+BC4EB2EF307286FCD45551D4DA397518C2E15394 org.junit.jupiter:junit-jupiter-params:5.3.1:sources
+BEEF0CAAD29594979FE211DC52FAE71D8C1FAB4F org.junit.jupiter:junit-jupiter-params:5.3.1:javadoc
+C769957170B2240854D6DA6C6706DCC2A281542F org.junit.jupiter:junit-jupiter-engine:5.3.1:sources
+C76435286A702682BEAC767CE5148D8EE59DF8B7 org.junit.jupiter:junit-jupiter-engine:5.3.1:javadoc
\ No newline at end of file
diff --git a/platform/junitlib/external/junit-jupiter-api-5.3.1-license.txt b/platform/junitlib/external/junit-jupiter-api-5.3.1-license.txt
new file mode 100644
index 0000000..9fe959d
--- /dev/null
+++ b/platform/junitlib/external/junit-jupiter-api-5.3.1-license.txt
@@ -0,0 +1,94 @@
+Name: JUnit Jupiter API
+Version: 5.3.1
+License: EPL-v20
+Description: JUnit Jupiter API
+Origin: JUnit
+Files: junit-jupiter-api-5.3.1-sources.jar junit-jupiter-api-5.3.1-javadoc.jar
+
+
+Eclipse Public License - v 2.0
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. Definitions
+“Contribution” means:
+
+a) in the case of the initial Contributor, the initial content Distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+i) changes to the Program, and
+ii) additions to the Program; where such changes and/or additions to the Program originate from and are Distributed by that particular Contributor. A Contribution “originates” from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include changes or additions to the Program that are not Modified Works.
+“Contributor” means any person or entity that Distributes the Program.
+
+“Licensed Patents” mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+“Program” means the Contributions Distributed in accordance with this Agreement.
+
+“Recipient” means anyone who receives the Program under this Agreement or any Secondary License (as applicable), including Contributors.
+
+“Derivative Works” shall mean any work, whether in Source Code or other form, that is based on (or derived from) the Program and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship.
+
+“Modified Works” shall mean any work in Source Code or other form that results from an addition to, deletion from, or modification of the contents of the Program, including, for purposes of clarity any new file in Source Code form that contains any contents of the Program. Modified Works shall not include works that contain only declarations, interfaces, types, classes, structures, or files of the Program solely in each case in order to link to, bind by name, or subclass the Program or M [...]
+
+“Distribute” means the acts of a) distributing or b) making available in any manner that enables the transfer of a copy.
+
+“Source Code” means the form of a Program preferred for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+“Secondary License” means either the GNU General Public License, Version 2.0, or any later versions of that license, including any exceptions or additional permissions as identified by the initial Contributor.
+
+2. Grant of Rights
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, Distribute and sublicense the Contribution of such Contributor, if any, and such Derivative Works.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in Source Code or other form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution cause [...]
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted here [...]
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+e) Notwithstanding the terms of any Secondary License, no Contributor makes additional grants to any Recipient (other than those set forth in this Agreement) as a result of such Recipient's receipt of the Program under the terms of a Secondary License (if permitted under the terms of Section 3).
+
+3. Requirements
+3.1 If a Contributor Distributes the Program in any form, then:
+
+a) the Program must also be made available as Source Code, in accordance with section 3.2, and the Contributor must accompany the Program with a statement that the Source Code for the Program is available under this Agreement, and informs Recipients how to obtain it in a reasonable manner on or through a medium customarily used for software exchange; and
+
+b) the Contributor may Distribute the Program under a license different than this Agreement, provided that such license:
+
+i) effectively disclaims on behalf of all other Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+ii) effectively excludes on behalf of all other Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+iii) does not attempt to limit or alter the recipients' rights in the Source Code under section 3.2; and
+iv) requires any subsequent distribution of the Program by any party to be under a license that satisfies the requirements of this section 3.
+3.2 When the Program is Distributed as Source Code:
+
+a) it must be made available under this Agreement, or if the Program (i) is combined with other material in a separate file or files made available under a Secondary License, and (ii) the initial Contributor attached to the Source Code the notice described in Exhibit A of this Agreement, then the Program may be made available under the terms of such Secondary Licenses, and
+b) a copy of this Agreement must be included with each copy of the Program.
+3.3 Contributors may not remove or alter any copyright, patent, trademark, attribution notices, disclaimers of warranty, or limitations of liability (“notices”) contained within the Program from any copy of the Program which they Distribute, provided that Contributors may add their own appropriate notices.
+
+4. Commercial Distribution
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor (“Commercial Con [...]
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims [...]
+
+5. No Warranty
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks assoc [...]
+
+6. Disclaimer of Liability
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EX [...]
+
+7. General
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Reci [...]
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the respons [...]
+
+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. Nothing in this Agreement is intended to be enforceable by any entity that is not a Contributor or Recipient. No third-party beneficiary rights are created under this Agreement.
+
+Exhibit A - Form of Secondary Licenses Notice
+“This Source Code may also be made available under the following Secondary Licenses when the conditions for such availability set forth in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), version(s), and exceptions or additional permissions here}.”
+
+Simply including a copy of this Agreement, including this Exhibit A is not sufficient to license the Source Code under Secondary Licenses.
+
+If it is not possible or desirable to put the notice in a particular file, then You may include the notice in a location (such as a LICENSE file in a relevant directory) where a recipient would be likely to look for such a notice.
+
+You may add additional accurate notices of copyright ownership.
diff --git a/platform/junitlib/external/junit-jupiter-engine-5.3.1-license.txt b/platform/junitlib/external/junit-jupiter-engine-5.3.1-license.txt
new file mode 100644
index 0000000..e3b0646
--- /dev/null
+++ b/platform/junitlib/external/junit-jupiter-engine-5.3.1-license.txt
@@ -0,0 +1,93 @@
+Name: JUnit Jupiter Engine
+Version: 5.3.1
+License: EPL-v20
+Description: JUnit Jupiter Engine
+Origin: JUnit
+Files: junit-jupiter-engine-5.3.1-sources.jar junit-jupiter-engine-5.3.1-javadoc.jar
+
+Eclipse Public License - v 2.0
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. Definitions
+“Contribution” means:
+
+a) in the case of the initial Contributor, the initial content Distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+i) changes to the Program, and
+ii) additions to the Program; where such changes and/or additions to the Program originate from and are Distributed by that particular Contributor. A Contribution “originates” from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include changes or additions to the Program that are not Modified Works.
+“Contributor” means any person or entity that Distributes the Program.
+
+“Licensed Patents” mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+“Program” means the Contributions Distributed in accordance with this Agreement.
+
+“Recipient” means anyone who receives the Program under this Agreement or any Secondary License (as applicable), including Contributors.
+
+“Derivative Works” shall mean any work, whether in Source Code or other form, that is based on (or derived from) the Program and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship.
+
+“Modified Works” shall mean any work in Source Code or other form that results from an addition to, deletion from, or modification of the contents of the Program, including, for purposes of clarity any new file in Source Code form that contains any contents of the Program. Modified Works shall not include works that contain only declarations, interfaces, types, classes, structures, or files of the Program solely in each case in order to link to, bind by name, or subclass the Program or M [...]
+
+“Distribute” means the acts of a) distributing or b) making available in any manner that enables the transfer of a copy.
+
+“Source Code” means the form of a Program preferred for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+“Secondary License” means either the GNU General Public License, Version 2.0, or any later versions of that license, including any exceptions or additional permissions as identified by the initial Contributor.
+
+2. Grant of Rights
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, Distribute and sublicense the Contribution of such Contributor, if any, and such Derivative Works.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in Source Code or other form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution cause [...]
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted here [...]
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+e) Notwithstanding the terms of any Secondary License, no Contributor makes additional grants to any Recipient (other than those set forth in this Agreement) as a result of such Recipient's receipt of the Program under the terms of a Secondary License (if permitted under the terms of Section 3).
+
+3. Requirements
+3.1 If a Contributor Distributes the Program in any form, then:
+
+a) the Program must also be made available as Source Code, in accordance with section 3.2, and the Contributor must accompany the Program with a statement that the Source Code for the Program is available under this Agreement, and informs Recipients how to obtain it in a reasonable manner on or through a medium customarily used for software exchange; and
+
+b) the Contributor may Distribute the Program under a license different than this Agreement, provided that such license:
+
+i) effectively disclaims on behalf of all other Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+ii) effectively excludes on behalf of all other Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+iii) does not attempt to limit or alter the recipients' rights in the Source Code under section 3.2; and
+iv) requires any subsequent distribution of the Program by any party to be under a license that satisfies the requirements of this section 3.
+3.2 When the Program is Distributed as Source Code:
+
+a) it must be made available under this Agreement, or if the Program (i) is combined with other material in a separate file or files made available under a Secondary License, and (ii) the initial Contributor attached to the Source Code the notice described in Exhibit A of this Agreement, then the Program may be made available under the terms of such Secondary Licenses, and
+b) a copy of this Agreement must be included with each copy of the Program.
+3.3 Contributors may not remove or alter any copyright, patent, trademark, attribution notices, disclaimers of warranty, or limitations of liability (“notices”) contained within the Program from any copy of the Program which they Distribute, provided that Contributors may add their own appropriate notices.
+
+4. Commercial Distribution
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor (“Commercial Con [...]
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims [...]
+
+5. No Warranty
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks assoc [...]
+
+6. Disclaimer of Liability
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EX [...]
+
+7. General
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Reci [...]
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the respons [...]
+
+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. Nothing in this Agreement is intended to be enforceable by any entity that is not a Contributor or Recipient. No third-party beneficiary rights are created under this Agreement.
+
+Exhibit A - Form of Secondary Licenses Notice
+“This Source Code may also be made available under the following Secondary Licenses when the conditions for such availability set forth in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), version(s), and exceptions or additional permissions here}.”
+
+Simply including a copy of this Agreement, including this Exhibit A is not sufficient to license the Source Code under Secondary Licenses.
+
+If it is not possible or desirable to put the notice in a particular file, then You may include the notice in a location (such as a LICENSE file in a relevant directory) where a recipient would be likely to look for such a notice.
+
+You may add additional accurate notices of copyright ownership.
diff --git a/platform/junitlib/external/junit-jupiter-params-5.3.1-license.txt b/platform/junitlib/external/junit-jupiter-params-5.3.1-license.txt
new file mode 100644
index 0000000..e357d09
--- /dev/null
+++ b/platform/junitlib/external/junit-jupiter-params-5.3.1-license.txt
@@ -0,0 +1,93 @@
+Name: JUnit Jupiter Params
+Version: 5.3.1
+License: EPL-v20
+Description: JUnit Jupiter Params
+Origin: JUnit
+Files: junit-jupiter-params-5.3.1-sources.jar junit-jupiter-params-5.3.1-javadoc.jar
+
+Eclipse Public License - v 2.0
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. Definitions
+“Contribution” means:
+
+a) in the case of the initial Contributor, the initial content Distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+i) changes to the Program, and
+ii) additions to the Program; where such changes and/or additions to the Program originate from and are Distributed by that particular Contributor. A Contribution “originates” from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include changes or additions to the Program that are not Modified Works.
+“Contributor” means any person or entity that Distributes the Program.
+
+“Licensed Patents” mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+“Program” means the Contributions Distributed in accordance with this Agreement.
+
+“Recipient” means anyone who receives the Program under this Agreement or any Secondary License (as applicable), including Contributors.
+
+“Derivative Works” shall mean any work, whether in Source Code or other form, that is based on (or derived from) the Program and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship.
+
+“Modified Works” shall mean any work in Source Code or other form that results from an addition to, deletion from, or modification of the contents of the Program, including, for purposes of clarity any new file in Source Code form that contains any contents of the Program. Modified Works shall not include works that contain only declarations, interfaces, types, classes, structures, or files of the Program solely in each case in order to link to, bind by name, or subclass the Program or M [...]
+
+“Distribute” means the acts of a) distributing or b) making available in any manner that enables the transfer of a copy.
+
+“Source Code” means the form of a Program preferred for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+“Secondary License” means either the GNU General Public License, Version 2.0, or any later versions of that license, including any exceptions or additional permissions as identified by the initial Contributor.
+
+2. Grant of Rights
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, Distribute and sublicense the Contribution of such Contributor, if any, and such Derivative Works.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in Source Code or other form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution cause [...]
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted here [...]
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+e) Notwithstanding the terms of any Secondary License, no Contributor makes additional grants to any Recipient (other than those set forth in this Agreement) as a result of such Recipient's receipt of the Program under the terms of a Secondary License (if permitted under the terms of Section 3).
+
+3. Requirements
+3.1 If a Contributor Distributes the Program in any form, then:
+
+a) the Program must also be made available as Source Code, in accordance with section 3.2, and the Contributor must accompany the Program with a statement that the Source Code for the Program is available under this Agreement, and informs Recipients how to obtain it in a reasonable manner on or through a medium customarily used for software exchange; and
+
+b) the Contributor may Distribute the Program under a license different than this Agreement, provided that such license:
+
+i) effectively disclaims on behalf of all other Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+ii) effectively excludes on behalf of all other Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+iii) does not attempt to limit or alter the recipients' rights in the Source Code under section 3.2; and
+iv) requires any subsequent distribution of the Program by any party to be under a license that satisfies the requirements of this section 3.
+3.2 When the Program is Distributed as Source Code:
+
+a) it must be made available under this Agreement, or if the Program (i) is combined with other material in a separate file or files made available under a Secondary License, and (ii) the initial Contributor attached to the Source Code the notice described in Exhibit A of this Agreement, then the Program may be made available under the terms of such Secondary Licenses, and
+b) a copy of this Agreement must be included with each copy of the Program.
+3.3 Contributors may not remove or alter any copyright, patent, trademark, attribution notices, disclaimers of warranty, or limitations of liability (“notices”) contained within the Program from any copy of the Program which they Distribute, provided that Contributors may add their own appropriate notices.
+
+4. Commercial Distribution
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor (“Commercial Con [...]
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims [...]
+
+5. No Warranty
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks assoc [...]
+
+6. Disclaimer of Liability
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EX [...]
+
+7. General
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Reci [...]
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the respons [...]
+
+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. Nothing in this Agreement is intended to be enforceable by any entity that is not a Contributor or Recipient. No third-party beneficiary rights are created under this Agreement.
+
+Exhibit A - Form of Secondary Licenses Notice
+“This Source Code may also be made available under the following Secondary Licenses when the conditions for such availability set forth in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), version(s), and exceptions or additional permissions here}.”
+
+Simply including a copy of this Agreement, including this Exhibit A is not sufficient to license the Source Code under Secondary Licenses.
+
+If it is not possible or desirable to put the notice in a particular file, then You may include the notice in a location (such as a LICENSE file in a relevant directory) where a recipient would be likely to look for such a notice.
+
+You may add additional accurate notices of copyright ownership.
diff --git a/platform/junitlib/manifest.mf b/platform/junitlib/manifest.mf
index 2932528..ffb76eb 100644
--- a/platform/junitlib/manifest.mf
+++ b/platform/junitlib/manifest.mf
@@ -3,5 +3,5 @@ AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.modules.junitlib
OpenIDE-Module-Layer: org/netbeans/modules/junitlib/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/junitlib/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.7
+OpenIDE-Module-Specification-Version: 1.8
diff --git a/platform/junitlib/nbproject/project.properties b/platform/junitlib/nbproject/project.properties
index 5a257e3..7186b1e 100644
--- a/platform/junitlib/nbproject/project.properties
+++ b/platform/junitlib/nbproject/project.properties
@@ -19,8 +19,20 @@ javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
release.external/junit-4.12-sources.jar=docs/junit-4.12-sources.jar
release.external/junit-4.12-javadoc.jar=docs/junit-4.12-javadoc.jar
+release.external/junit-jupiter-api-5.3.1-sources.jar=docs/junit-jupiter-api-5.3.1-sources.jar
+release.external/junit-jupiter-api-5.3.1-javadoc.jar=docs/junit-jupiter-api-5.3.1-javadoc.jar
+release.external/junit-jupiter-params-5.3.1-sources.jar=docs/junit-jupiter-params-5.3.1-sources.jar
+release.external/junit-jupiter-params-5.3.1-javadoc.jar=docs/junit-jupiter-params-5.3.1-javadoc.jar
+release.external/junit-jupiter-engine-5.3.1-sources.jar=docs/junit-jupiter-engine-5.3.1-sources.jar
+release.external/junit-jupiter-engine-5.3.1-javadoc.jar=docs/junit-jupiter-engine-5.3.1-javadoc.jar
nbm.target.cluster=java
nbm.is.global=false
jnlp.indirect.jars=\
docs/junit-4.12-sources.jar,\
- docs/junit-4.12-javadoc.jar
+ docs/junit-4.12-javadoc.jar,\
+ docs/junit-jupiter-api-5.3.1-sources.jar,\
+ docs/junit-jupiter-api-5.3.1-javadoc.jar,\
+ docs/junit-jupiter-params-5.3.1-sources.jar,\
+ docs/junit-jupiter-params-5.3.1-javadoc.jar,\
+ docs/junit-jupiter-engine-5.3.1-sources.jar,\
+ docs/junit-jupiter-engine-5.3.1-javadoc.jar
diff --git a/platform/junitlib/src/org/netbeans/modules/junitlib/Bundle.properties b/platform/junitlib/src/org/netbeans/modules/junitlib/Bundle.properties
index 7f04e94..1046d6e 100644
--- a/platform/junitlib/src/org/netbeans/modules/junitlib/Bundle.properties
+++ b/platform/junitlib/src/org/netbeans/modules/junitlib/Bundle.properties
@@ -18,6 +18,7 @@ OpenIDE-Module-Name=JUnit
OpenIDE-Module-Display-Category=Java SE
OpenIDE-Module-Short-Description=Bundles the JUnit testing library.
OpenIDE-Module-Long-Description=\
- Includes the JUnit unit testing library and corresponding library definition. 4.x version is only included.
+ Includes the JUnit unit testing library and corresponding library definition. Versions 4.x/5.x are included.
junit_4=JUnit 4.12
+junit_5=JUnit 5.3.1
hamcrest=Hamcrest 1.3
diff --git a/platform/junitlib/src/org/netbeans/modules/junitlib/junit_5.xml b/platform/junitlib/src/org/netbeans/modules/junitlib/junit_5.xml
new file mode 100644
index 0000000..b8045d1
--- /dev/null
+++ b/platform/junitlib/src/org/netbeans/modules/junitlib/junit_5.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<library version="3.0" xmlns="http://www.netbeans.org/ns/library-declaration/3">
+ <name>junit_5</name>
+ <type>j2se</type>
+ <localizing-bundle>org.netbeans.modules.junitlib.Bundle</localizing-bundle>
+ <volume>
+ <type>classpath</type>
+ <resource>jar:nbinst://org.netbeans.libs.junit5/modules/ext/junit-jupiter-api-5.3.1.jar!/</resource>
+ <resource>jar:nbinst://org.netbeans.libs.junit5/modules/ext/junit-jupiter-params-5.3.1.jar!/</resource>
+ <resource>jar:nbinst://org.netbeans.libs.junit5/modules/ext/junit-jupiter-engine-5.3.1.jar!/</resource>
+ </volume>
+ <volume>
+ <type>javadoc</type>
+ <resource>jar:nbinst://org.netbeans.modules.junitlib/docs/junit-jupiter-api-5.3.1-javadoc.jar!/</resource>
+ <resource>jar:nbinst://org.netbeans.modules.junitlib/docs/junit-jupiter-params-5.3.1-javadoc.jar!/</resource>
+ <resource>jar:nbinst://org.netbeans.modules.junitlib/docs/junit-jupiter-engine-5.3.1-javadoc.jar!/</resource>
+ </volume>
+ <volume>
+ <type>src</type>
+ <resource>jar:nbinst://org.netbeans.modules.junitlib/docs/junit-jupiter-api-5.3.1-sources.jar!/</resource>
+ <resource>jar:nbinst://org.netbeans.modules.junitlib/docs/junit-jupiter-params-5.3.1-sources.jar!/</resource>
+ <resource>jar:nbinst://org.netbeans.modules.junitlib/docs/junit-jupiter-engine-5.3.1-sources.jar!/</resource>
+ </volume>
+ <properties>
+ <property>
+ <name>maven-dependencies</name>
+ <value>
+ org.junit.jupiter:junit-jupiter-api:5.3.1:jar
+ org.junit.jupiter:junit-jupiter-params:5.3.1:jar
+ org.junit.jupiter:junit-jupiter-engine:5.3.1:jar
+ </value>
+ </property>
+ </properties>
+</library>
diff --git a/platform/junitlib/src/org/netbeans/modules/junitlib/layer.xml b/platform/junitlib/src/org/netbeans/modules/junitlib/layer.xml
index 8a4bdbc..a1992b2 100644
--- a/platform/junitlib/src/org/netbeans/modules/junitlib/layer.xml
+++ b/platform/junitlib/src/org/netbeans/modules/junitlib/layer.xml
@@ -29,6 +29,9 @@
<file name="hamcrest.xml" url="hamcrest.xml">
<attr name="displayName" bundlevalue="org.netbeans.modules.junitlib.Bundle#hamcrest"/>
</file>
+ <file name="junit_5.xml" url="junit_5.xml">
+ <attr name="displayName" bundlevalue="org.netbeans.modules.junitlib.Bundle#junit_5"/>
+ </file>
</folder>
</folder>
</filesystem>
diff --git a/java/junit.ui/licenseinfo.xml b/platform/libs.junit5/build.xml
similarity index 76%
copy from java/junit.ui/licenseinfo.xml
copy to platform/libs.junit5/build.xml
index 88a6da5..60ffce4 100644
--- a/java/junit.ui/licenseinfo.xml
+++ b/platform/libs.junit5/build.xml
@@ -19,10 +19,8 @@
under the License.
-->
-<licenseinfo>
- <fileset>
- <file>src/org/netbeans/modules/junit/ui/resources/JUnitLogo.png</file>
- <license ref="Apache-2.0-ASF" />
- <comment type="COMMENT_UNSUPPORTED" />
- </fileset>
-</licenseinfo>
+<project name="platform/libs.junit5" default="build" basedir=".">
+ <property name="license.file" location="../../nbbuild/licenses/CPL-1.0"/>
+ <target name="-create-license.file"/>
+ <import file="../../nbbuild/templates/projectized.xml"/>
+</project>
diff --git a/platform/junitlib/external/binaries-list b/platform/libs.junit5/external/binaries-list
similarity index 75%
copy from platform/junitlib/external/binaries-list
copy to platform/libs.junit5/external/binaries-list
index 9932bc7..b4d545d 100644
--- a/platform/junitlib/external/binaries-list
+++ b/platform/libs.junit5/external/binaries-list
@@ -14,5 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-A6C32B40BF3D76ECA54E3C601E5D1470C86FCDFA junit:junit:4.12:sources
-941A8BE4506C65F0A9001C08812FB7DA1E505E21 junit:junit:4.12:javadoc
+A7E97EAC2784395CB991403F9641B042AD972941 org.junit.jupiter:junit-jupiter-api:5.3.1
+9DFAC3FBD6768974FC0C142304A3E90BA713B2A8 org.junit.jupiter:junit-jupiter-params:5.3.1
+E2676B1786C57A80EB98F5BEBD51A3D05E228C40 org.junit.jupiter:junit-jupiter-engine:5.3.1
diff --git a/platform/libs.junit5/external/junit-jupiter-api-5.3.1-license.txt b/platform/libs.junit5/external/junit-jupiter-api-5.3.1-license.txt
new file mode 100644
index 0000000..436f2c5
--- /dev/null
+++ b/platform/libs.junit5/external/junit-jupiter-api-5.3.1-license.txt
@@ -0,0 +1,93 @@
+Name: JUnit Jupiter API
+Version: 5.3.1
+License: EPL-v20
+Description: JUnit Jupiter API
+Origin: JUnit
+URL: http://search.maven.org/#artifactdetails|org.junit.jupiter|junit-jupiter-api|5.3.1|jar
+
+Eclipse Public License - v 2.0
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. Definitions
+“Contribution” means:
+
+a) in the case of the initial Contributor, the initial content Distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+i) changes to the Program, and
+ii) additions to the Program; where such changes and/or additions to the Program originate from and are Distributed by that particular Contributor. A Contribution “originates” from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include changes or additions to the Program that are not Modified Works.
+“Contributor” means any person or entity that Distributes the Program.
+
+“Licensed Patents” mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+“Program” means the Contributions Distributed in accordance with this Agreement.
+
+“Recipient” means anyone who receives the Program under this Agreement or any Secondary License (as applicable), including Contributors.
+
+“Derivative Works” shall mean any work, whether in Source Code or other form, that is based on (or derived from) the Program and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship.
+
+“Modified Works” shall mean any work in Source Code or other form that results from an addition to, deletion from, or modification of the contents of the Program, including, for purposes of clarity any new file in Source Code form that contains any contents of the Program. Modified Works shall not include works that contain only declarations, interfaces, types, classes, structures, or files of the Program solely in each case in order to link to, bind by name, or subclass the Program or M [...]
+
+“Distribute” means the acts of a) distributing or b) making available in any manner that enables the transfer of a copy.
+
+“Source Code” means the form of a Program preferred for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+“Secondary License” means either the GNU General Public License, Version 2.0, or any later versions of that license, including any exceptions or additional permissions as identified by the initial Contributor.
+
+2. Grant of Rights
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, Distribute and sublicense the Contribution of such Contributor, if any, and such Derivative Works.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in Source Code or other form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution cause [...]
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted here [...]
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+e) Notwithstanding the terms of any Secondary License, no Contributor makes additional grants to any Recipient (other than those set forth in this Agreement) as a result of such Recipient's receipt of the Program under the terms of a Secondary License (if permitted under the terms of Section 3).
+
+3. Requirements
+3.1 If a Contributor Distributes the Program in any form, then:
+
+a) the Program must also be made available as Source Code, in accordance with section 3.2, and the Contributor must accompany the Program with a statement that the Source Code for the Program is available under this Agreement, and informs Recipients how to obtain it in a reasonable manner on or through a medium customarily used for software exchange; and
+
+b) the Contributor may Distribute the Program under a license different than this Agreement, provided that such license:
+
+i) effectively disclaims on behalf of all other Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+ii) effectively excludes on behalf of all other Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+iii) does not attempt to limit or alter the recipients' rights in the Source Code under section 3.2; and
+iv) requires any subsequent distribution of the Program by any party to be under a license that satisfies the requirements of this section 3.
+3.2 When the Program is Distributed as Source Code:
+
+a) it must be made available under this Agreement, or if the Program (i) is combined with other material in a separate file or files made available under a Secondary License, and (ii) the initial Contributor attached to the Source Code the notice described in Exhibit A of this Agreement, then the Program may be made available under the terms of such Secondary Licenses, and
+b) a copy of this Agreement must be included with each copy of the Program.
+3.3 Contributors may not remove or alter any copyright, patent, trademark, attribution notices, disclaimers of warranty, or limitations of liability (“notices”) contained within the Program from any copy of the Program which they Distribute, provided that Contributors may add their own appropriate notices.
+
+4. Commercial Distribution
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor (“Commercial Con [...]
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims [...]
+
+5. No Warranty
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks assoc [...]
+
+6. Disclaimer of Liability
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EX [...]
+
+7. General
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Reci [...]
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the respons [...]
+
+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. Nothing in this Agreement is intended to be enforceable by any entity that is not a Contributor or Recipient. No third-party beneficiary rights are created under this Agreement.
+
+Exhibit A - Form of Secondary Licenses Notice
+“This Source Code may also be made available under the following Secondary Licenses when the conditions for such availability set forth in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), version(s), and exceptions or additional permissions here}.”
+
+Simply including a copy of this Agreement, including this Exhibit A is not sufficient to license the Source Code under Secondary Licenses.
+
+If it is not possible or desirable to put the notice in a particular file, then You may include the notice in a location (such as a LICENSE file in a relevant directory) where a recipient would be likely to look for such a notice.
+
+You may add additional accurate notices of copyright ownership.
diff --git a/platform/libs.junit5/external/junit-jupiter-engine-5.3.1-license.txt b/platform/libs.junit5/external/junit-jupiter-engine-5.3.1-license.txt
new file mode 100644
index 0000000..cf7d91a
--- /dev/null
+++ b/platform/libs.junit5/external/junit-jupiter-engine-5.3.1-license.txt
@@ -0,0 +1,93 @@
+Name: JUnit Jupiter Engine
+Version: 5.3.1
+License: EPL-v20
+Description: JUnit Jupiter Engine
+Origin: JUnit
+URL: http://search.maven.org/#artifactdetails|org.junit.jupiter|junit-jupiter-engine|5.3.1|jar
+
+Eclipse Public License - v 2.0
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. Definitions
+“Contribution” means:
+
+a) in the case of the initial Contributor, the initial content Distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+i) changes to the Program, and
+ii) additions to the Program; where such changes and/or additions to the Program originate from and are Distributed by that particular Contributor. A Contribution “originates” from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include changes or additions to the Program that are not Modified Works.
+“Contributor” means any person or entity that Distributes the Program.
+
+“Licensed Patents” mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+“Program” means the Contributions Distributed in accordance with this Agreement.
+
+“Recipient” means anyone who receives the Program under this Agreement or any Secondary License (as applicable), including Contributors.
+
+“Derivative Works” shall mean any work, whether in Source Code or other form, that is based on (or derived from) the Program and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship.
+
+“Modified Works” shall mean any work in Source Code or other form that results from an addition to, deletion from, or modification of the contents of the Program, including, for purposes of clarity any new file in Source Code form that contains any contents of the Program. Modified Works shall not include works that contain only declarations, interfaces, types, classes, structures, or files of the Program solely in each case in order to link to, bind by name, or subclass the Program or M [...]
+
+“Distribute” means the acts of a) distributing or b) making available in any manner that enables the transfer of a copy.
+
+“Source Code” means the form of a Program preferred for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+“Secondary License” means either the GNU General Public License, Version 2.0, or any later versions of that license, including any exceptions or additional permissions as identified by the initial Contributor.
+
+2. Grant of Rights
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, Distribute and sublicense the Contribution of such Contributor, if any, and such Derivative Works.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in Source Code or other form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution cause [...]
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted here [...]
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+e) Notwithstanding the terms of any Secondary License, no Contributor makes additional grants to any Recipient (other than those set forth in this Agreement) as a result of such Recipient's receipt of the Program under the terms of a Secondary License (if permitted under the terms of Section 3).
+
+3. Requirements
+3.1 If a Contributor Distributes the Program in any form, then:
+
+a) the Program must also be made available as Source Code, in accordance with section 3.2, and the Contributor must accompany the Program with a statement that the Source Code for the Program is available under this Agreement, and informs Recipients how to obtain it in a reasonable manner on or through a medium customarily used for software exchange; and
+
+b) the Contributor may Distribute the Program under a license different than this Agreement, provided that such license:
+
+i) effectively disclaims on behalf of all other Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+ii) effectively excludes on behalf of all other Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+iii) does not attempt to limit or alter the recipients' rights in the Source Code under section 3.2; and
+iv) requires any subsequent distribution of the Program by any party to be under a license that satisfies the requirements of this section 3.
+3.2 When the Program is Distributed as Source Code:
+
+a) it must be made available under this Agreement, or if the Program (i) is combined with other material in a separate file or files made available under a Secondary License, and (ii) the initial Contributor attached to the Source Code the notice described in Exhibit A of this Agreement, then the Program may be made available under the terms of such Secondary Licenses, and
+b) a copy of this Agreement must be included with each copy of the Program.
+3.3 Contributors may not remove or alter any copyright, patent, trademark, attribution notices, disclaimers of warranty, or limitations of liability (“notices”) contained within the Program from any copy of the Program which they Distribute, provided that Contributors may add their own appropriate notices.
+
+4. Commercial Distribution
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor (“Commercial Con [...]
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims [...]
+
+5. No Warranty
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks assoc [...]
+
+6. Disclaimer of Liability
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EX [...]
+
+7. General
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Reci [...]
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the respons [...]
+
+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. Nothing in this Agreement is intended to be enforceable by any entity that is not a Contributor or Recipient. No third-party beneficiary rights are created under this Agreement.
+
+Exhibit A - Form of Secondary Licenses Notice
+“This Source Code may also be made available under the following Secondary Licenses when the conditions for such availability set forth in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), version(s), and exceptions or additional permissions here}.”
+
+Simply including a copy of this Agreement, including this Exhibit A is not sufficient to license the Source Code under Secondary Licenses.
+
+If it is not possible or desirable to put the notice in a particular file, then You may include the notice in a location (such as a LICENSE file in a relevant directory) where a recipient would be likely to look for such a notice.
+
+You may add additional accurate notices of copyright ownership.
diff --git a/platform/libs.junit5/external/junit-jupiter-params-5.3.1-license.txt b/platform/libs.junit5/external/junit-jupiter-params-5.3.1-license.txt
new file mode 100644
index 0000000..6f0ef39
--- /dev/null
+++ b/platform/libs.junit5/external/junit-jupiter-params-5.3.1-license.txt
@@ -0,0 +1,93 @@
+Name: JUnit Jupiter Params
+Version: 5.3.1
+License: EPL-v20
+Description: JUnit Jupiter Params
+Origin: JUnit
+URL: http://search.maven.org/#artifactdetails|org.junit.jupiter|junit-jupiter-params|5.3.1|jar
+
+Eclipse Public License - v 2.0
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. Definitions
+“Contribution” means:
+
+a) in the case of the initial Contributor, the initial content Distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+i) changes to the Program, and
+ii) additions to the Program; where such changes and/or additions to the Program originate from and are Distributed by that particular Contributor. A Contribution “originates” from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include changes or additions to the Program that are not Modified Works.
+“Contributor” means any person or entity that Distributes the Program.
+
+“Licensed Patents” mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+“Program” means the Contributions Distributed in accordance with this Agreement.
+
+“Recipient” means anyone who receives the Program under this Agreement or any Secondary License (as applicable), including Contributors.
+
+“Derivative Works” shall mean any work, whether in Source Code or other form, that is based on (or derived from) the Program and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship.
+
+“Modified Works” shall mean any work in Source Code or other form that results from an addition to, deletion from, or modification of the contents of the Program, including, for purposes of clarity any new file in Source Code form that contains any contents of the Program. Modified Works shall not include works that contain only declarations, interfaces, types, classes, structures, or files of the Program solely in each case in order to link to, bind by name, or subclass the Program or M [...]
+
+“Distribute” means the acts of a) distributing or b) making available in any manner that enables the transfer of a copy.
+
+“Source Code” means the form of a Program preferred for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+“Secondary License” means either the GNU General Public License, Version 2.0, or any later versions of that license, including any exceptions or additional permissions as identified by the initial Contributor.
+
+2. Grant of Rights
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, Distribute and sublicense the Contribution of such Contributor, if any, and such Derivative Works.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in Source Code or other form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution cause [...]
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted here [...]
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+e) Notwithstanding the terms of any Secondary License, no Contributor makes additional grants to any Recipient (other than those set forth in this Agreement) as a result of such Recipient's receipt of the Program under the terms of a Secondary License (if permitted under the terms of Section 3).
+
+3. Requirements
+3.1 If a Contributor Distributes the Program in any form, then:
+
+a) the Program must also be made available as Source Code, in accordance with section 3.2, and the Contributor must accompany the Program with a statement that the Source Code for the Program is available under this Agreement, and informs Recipients how to obtain it in a reasonable manner on or through a medium customarily used for software exchange; and
+
+b) the Contributor may Distribute the Program under a license different than this Agreement, provided that such license:
+
+i) effectively disclaims on behalf of all other Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+ii) effectively excludes on behalf of all other Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+iii) does not attempt to limit or alter the recipients' rights in the Source Code under section 3.2; and
+iv) requires any subsequent distribution of the Program by any party to be under a license that satisfies the requirements of this section 3.
+3.2 When the Program is Distributed as Source Code:
+
+a) it must be made available under this Agreement, or if the Program (i) is combined with other material in a separate file or files made available under a Secondary License, and (ii) the initial Contributor attached to the Source Code the notice described in Exhibit A of this Agreement, then the Program may be made available under the terms of such Secondary Licenses, and
+b) a copy of this Agreement must be included with each copy of the Program.
+3.3 Contributors may not remove or alter any copyright, patent, trademark, attribution notices, disclaimers of warranty, or limitations of liability (“notices”) contained within the Program from any copy of the Program which they Distribute, provided that Contributors may add their own appropriate notices.
+
+4. Commercial Distribution
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor (“Commercial Con [...]
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims [...]
+
+5. No Warranty
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks assoc [...]
+
+6. Disclaimer of Liability
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EX [...]
+
+7. General
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Reci [...]
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the respons [...]
+
+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. Nothing in this Agreement is intended to be enforceable by any entity that is not a Contributor or Recipient. No third-party beneficiary rights are created under this Agreement.
+
+Exhibit A - Form of Secondary Licenses Notice
+“This Source Code may also be made available under the following Secondary Licenses when the conditions for such availability set forth in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), version(s), and exceptions or additional permissions here}.”
+
+Simply including a copy of this Agreement, including this Exhibit A is not sufficient to license the Source Code under Secondary Licenses.
+
+If it is not possible or desirable to put the notice in a particular file, then You may include the notice in a location (such as a LICENSE file in a relevant directory) where a recipient would be likely to look for such a notice.
+
+You may add additional accurate notices of copyright ownership.
diff --git a/platform/libs.junit5/manifest.mf b/platform/libs.junit5/manifest.mf
new file mode 100644
index 0000000..6c8a814
--- /dev/null
+++ b/platform/libs.junit5/manifest.mf
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+OpenIDE-Module: org.netbeans.libs.junit5
+OpenIDE-Module-Specification-Version: 1.00
+OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/junit5/Bundle.properties
+
diff --git a/platform/junitlib/nbproject/project.properties b/platform/libs.junit5/nbproject/project.properties
similarity index 69%
copy from platform/junitlib/nbproject/project.properties
copy to platform/libs.junit5/nbproject/project.properties
index 5a257e3..6a8086b 100644
--- a/platform/junitlib/nbproject/project.properties
+++ b/platform/libs.junit5/nbproject/project.properties
@@ -14,13 +14,11 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+
is.autoload=true
-javac.source=1.6
-javac.compilerargs=-Xlint -Xlint:-serial
-release.external/junit-4.12-sources.jar=docs/junit-4.12-sources.jar
-release.external/junit-4.12-javadoc.jar=docs/junit-4.12-javadoc.jar
-nbm.target.cluster=java
-nbm.is.global=false
-jnlp.indirect.jars=\
- docs/junit-4.12-sources.jar,\
- docs/junit-4.12-javadoc.jar
+release.external/junit-jupiter-api-5.3.1.jar=modules/ext/junit-jupiter-api-5.3.1.jar
+release.external/junit-jupiter-params-5.3.1.jar=modules/ext/junit-jupiter-params-5.3.1.jar
+release.external/junit-jupiter-engine-5.3.1.jar=modules/ext/junit-jupiter-engine-5.3.1.jar
+nbm.target.cluster=platform
+sigtest.skip.check=true
+sigtest.fail.on.error=false
diff --git a/platform/libs.junit5/nbproject/project.xml b/platform/libs.junit5/nbproject/project.xml
new file mode 100644
index 0000000..4d88d12
--- /dev/null
+++ b/platform/libs.junit5/nbproject/project.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project xmlns="http://www.netbeans.org/ns/project/1">
+ <type>org.netbeans.modules.apisupport.project</type>
+ <configuration>
+ <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
+ <code-name-base>org.netbeans.libs.junit5</code-name-base>
+ <module-dependencies/>
+ <public-packages>
+ <package>org.junit.jupiter.api</package>
+ <package>org.junit.jupiter.api.condition</package>
+ <package>org.junit.jupiter.api.extension</package>
+ <package>org.junit.jupiter.api.function</package>
+ <package>org.junit.jupiter.params</package>
+ <package>org.junit.jupiter.params.converter</package>
+ <package>org.junit.jupiter.params.provider</package>
+ <package>org.junit.jupiter.params.support</package>
+ <package>org.junit.jupiter.engine</package>
+ <package>org.junit.jupiter.engine.descriptor</package>
+ <package>org.junit.jupiter.engine.discovery</package>
+ <package>org.junit.jupiter.engine.discovery.predictes</package>
+ <package>org.junit.jupiter.engine.execution</package>
+ <package>org.junit.jupiter.engine.extension</package>
+ <package>org.junit.jupiter.engine.script</package>
+ </public-packages>
+ <class-path-extension>
+ <runtime-relative-path>ext/junit-jupiter-api-5.3.1.jar</runtime-relative-path>
+ <binary-origin>external/junit-jupiter-api-5.3.1.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/junit-jupiter-params-5.3.1.jar</runtime-relative-path>
+ <binary-origin>external/junit-jupiter-params-5.3.1.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/junit-jupiter-engine-5.3.1.jar</runtime-relative-path>
+ <binary-origin>external/junit-jupiter-engine-5.3.1.jar</binary-origin>
+ </class-path-extension>
+ </data>
+ </configuration>
+</project>
\ No newline at end of file
diff --git a/platform/junitlib/external/binaries-list b/platform/libs.junit5/src/org/netbeans/libs/junit5/Bundle.properties
similarity index 77%
copy from platform/junitlib/external/binaries-list
copy to platform/libs.junit5/src/org/netbeans/libs/junit5/Bundle.properties
index 9932bc7..56706db 100644
--- a/platform/junitlib/external/binaries-list
+++ b/platform/libs.junit5/src/org/netbeans/libs/junit5/Bundle.properties
@@ -14,5 +14,9 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-A6C32B40BF3D76ECA54E3C601E5D1470C86FCDFA junit:junit:4.12:sources
-941A8BE4506C65F0A9001C08812FB7DA1E505E21 junit:junit:4.12:javadoc
+
+OpenIDE-Module-Name=JUnit 5
+OpenIDE-Module-Display-Category=Libraries
+OpenIDE-Module-Short-Description=Bundles the JUnit 5.x testing library.
+OpenIDE-Module-Long-Description=\
+ Includes the JUnit 5.x unit testing library.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists