From b8fb1ce83cfdfbd4459b16470262f1da49e2b76b Mon Sep 17 00:00:00 2001
From: Alexander Udalov <alexander.udalov@jetbrains.com>
Date: Wed, 6 Jan 2021 21:49:32 +0100
Subject: [PATCH] Fix Java 9 module tests for many JDKs

Module 'oracle.desktop' is not guaranteed to be present in JDK. Also,
its usage in these tests doesn't check anything new that isn't already
checked by usages of jdk.net and jdk.httpserver.
---
 .../javaModules/jdkModulesFromNamed/main/module-info.java   | 1 -
 .../testData/javaModules/jdkModulesFromNamed/main/test.kt   | 6 +-----
 .../testData/javaModules/jdkModulesFromUnnamed/main/test.kt | 6 +-----
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/compiler/testData/javaModules/jdkModulesFromNamed/main/module-info.java b/compiler/testData/javaModules/jdkModulesFromNamed/main/module-info.java
index 87a88c8de60..34214936efd 100644
--- a/compiler/testData/javaModules/jdkModulesFromNamed/main/module-info.java
+++ b/compiler/testData/javaModules/jdkModulesFromNamed/main/module-info.java
@@ -1,7 +1,6 @@
 module main {
     requires java.naming;
     requires jdk.net;
-    requires oracle.desktop;
 
     requires kotlin.stdlib;
 }
diff --git a/compiler/testData/javaModules/jdkModulesFromNamed/main/test.kt b/compiler/testData/javaModules/jdkModulesFromNamed/main/test.kt
index 38a46ba0042..9015e5b65c7 100644
--- a/compiler/testData/javaModules/jdkModulesFromNamed/main/test.kt
+++ b/compiler/testData/javaModules/jdkModulesFromNamed/main/test.kt
@@ -1,4 +1,4 @@
-fun main(args: Array<String>) {
+fun main() {
     // Module java.naming
     val b: javax.naming.Binding? = null
     println(b)
@@ -10,8 +10,4 @@ fun main(args: Array<String>) {
     // Module jdk.httpserver (this module doesn't depend on it)
     val s: com.sun.net.httpserver.HttpServer? = null
     println(s)
-
-    // Module oracle.desktop
-    val a: com.oracle.awt.AWTUtils? = null
-    println(a)
 }
diff --git a/compiler/testData/javaModules/jdkModulesFromUnnamed/main/test.kt b/compiler/testData/javaModules/jdkModulesFromUnnamed/main/test.kt
index b9626822910..63075be02a4 100644
--- a/compiler/testData/javaModules/jdkModulesFromUnnamed/main/test.kt
+++ b/compiler/testData/javaModules/jdkModulesFromUnnamed/main/test.kt
@@ -1,4 +1,4 @@
-fun main(args: Array<String>) {
+fun main() {
     // Module java.naming
     val b: javax.naming.Binding? = null
     println(b)
@@ -10,8 +10,4 @@ fun main(args: Array<String>) {
     // Module jdk.httpserver
     val s: com.sun.net.httpserver.HttpServer? = null
     println(s)
-
-    // Module oracle.desktop
-    val a: com.oracle.awt.AWTUtils? = null
-    println(a)
 }