From 9c3ff6828a0b971b4553c275ca14b57f46eea40d Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Mon, 24 Aug 2020 23:41:04 +0300
Subject: [PATCH] Export kotlin.test packages with annotations and underlying
 frameworks

- Add exports for jvm package names used in kotlin.test annotations;

- Export transitively underlying test framework modules
Otherwise "This class does not have a constructor" happens when using
an aliased annotation, e.g. kotlin.test.Test aliased to org.junit.test

KT-41320
---
 libraries/commonConfiguration.gradle                         | 3 ++-
 libraries/kotlin.test/junit/src/java9/java/module-info.java  | 3 ++-
 libraries/kotlin.test/junit5/src/java9/java/module-info.java | 3 ++-
 libraries/kotlin.test/testng/src/java9/java/module-info.java | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/libraries/commonConfiguration.gradle b/libraries/commonConfiguration.gradle
index 1153def06ad..e9601a737d7 100644
--- a/libraries/commonConfiguration.gradle
+++ b/libraries/commonConfiguration.gradle
@@ -53,7 +53,8 @@ ext.compileJava9Sources = { Project project, String moduleName, Collection<FileC
 
             options.compilerArgs = [
                     '--module-path', modulePath.asPath,
-                    '--patch-module', "$moduleName=${moduleFiles.asPath}"
+                    '--patch-module', "$moduleName=${moduleFiles.asPath}",
+                    '-Xlint:-requires-transitive-automatic' // suppress automatic module transitive dependencies in kotlin.test
             ]
 
             classpath = files()
diff --git a/libraries/kotlin.test/junit/src/java9/java/module-info.java b/libraries/kotlin.test/junit/src/java9/java/module-info.java
index a64fccfd19c..0a608c3e8f5 100644
--- a/libraries/kotlin.test/junit/src/java9/java/module-info.java
+++ b/libraries/kotlin.test/junit/src/java9/java/module-info.java
@@ -2,9 +2,10 @@ module kotlin.test.junit {
     requires transitive kotlin.stdlib;
     requires transitive kotlin.test;
 
-    requires junit;
+    requires transitive junit;
 
     exports kotlin.test.junit;
+    exports kotlin.test.junit.annotations;
 
     provides kotlin.test.AsserterContributor with kotlin.test.junit.JUnitContributor;
 }
diff --git a/libraries/kotlin.test/junit5/src/java9/java/module-info.java b/libraries/kotlin.test/junit5/src/java9/java/module-info.java
index 92b5b9f3b18..287c7ba4a12 100644
--- a/libraries/kotlin.test/junit5/src/java9/java/module-info.java
+++ b/libraries/kotlin.test/junit5/src/java9/java/module-info.java
@@ -3,9 +3,10 @@ module kotlin.test.junit5 {
     requires transitive kotlin.stdlib;
     requires transitive kotlin.test;
 
-    requires org.junit.jupiter.api;
+    requires transitive org.junit.jupiter.api;
 
     exports kotlin.test.junit5;
+    exports kotlin.test.junit5.annotations;
 
     provides kotlin.test.AsserterContributor with kotlin.test.junit5.JUnit5Contributor;
 }
diff --git a/libraries/kotlin.test/testng/src/java9/java/module-info.java b/libraries/kotlin.test/testng/src/java9/java/module-info.java
index 682d0c24523..deba1420fef 100644
--- a/libraries/kotlin.test/testng/src/java9/java/module-info.java
+++ b/libraries/kotlin.test/testng/src/java9/java/module-info.java
@@ -2,10 +2,11 @@ module kotlin.test.testng {
     requires transitive kotlin.stdlib;
     requires transitive kotlin.test;
 
-    requires org.testng; // automatic module name in testng manifest since 7.0.0
+    requires transitive org.testng; // automatic module name in testng manifest since 7.0.0
     // won't work with earlier versions, where just 'testng' name was inferred from the artifact name
 
     exports kotlin.test.testng;
+    exports kotlin.test.testng.annotations;
 
     provides kotlin.test.AsserterContributor with kotlin.test.testng.TestNGContributor;
 }