From fa87bee68802c38f4d04c78ac876c6f0dfe5e016 Mon Sep 17 00:00:00 2001
From: Sergei Kovalev <skovalev@openjdk.org>
Date: Tue, 29 Nov 2016 14:55:56 +0300
Subject: [PATCH] 8169866: TESTBUG: com/sun/security/ tests have undeclared
 modules dependencies

Reviewed-by: weijun
---
 jdk/test/com/sun/security/auth/TEST.properties         |  1 +
 .../jgss/InquireSecContextPermissionCheck.java         |  5 +++--
 jdk/test/com/sun/security/sasl/Cram.java               | 10 ++++++----
 jdk/test/com/sun/security/sasl/TEST.properties         |  1 +
 jdk/test/com/sun/security/sasl/digest/TEST.properties  |  1 +
 5 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 jdk/test/com/sun/security/auth/TEST.properties
 create mode 100644 jdk/test/com/sun/security/sasl/TEST.properties
 create mode 100644 jdk/test/com/sun/security/sasl/digest/TEST.properties

diff --git a/jdk/test/com/sun/security/auth/TEST.properties b/jdk/test/com/sun/security/auth/TEST.properties
new file mode 100644
index 00000000000..282ca00ddc7
--- /dev/null
+++ b/jdk/test/com/sun/security/auth/TEST.properties
@@ -0,0 +1 @@
+modules = jdk.security.auth
diff --git a/jdk/test/com/sun/security/jgss/InquireSecContextPermissionCheck.java b/jdk/test/com/sun/security/jgss/InquireSecContextPermissionCheck.java
index facbc31e866..079bc94c64c 100644
--- a/jdk/test/com/sun/security/jgss/InquireSecContextPermissionCheck.java
+++ b/jdk/test/com/sun/security/jgss/InquireSecContextPermissionCheck.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,9 +21,10 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 6710360
+ * @modules jdk.security.jgss
  * @summary export Kerberos session key to applications
  */
 
diff --git a/jdk/test/com/sun/security/sasl/Cram.java b/jdk/test/com/sun/security/sasl/Cram.java
index 6c9251c13c7..1c7fb70f125 100644
--- a/jdk/test/com/sun/security/sasl/Cram.java
+++ b/jdk/test/com/sun/security/sasl/Cram.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,15 +24,17 @@
 /*
  * @test
  * @bug 4634892
+ * @modules jdk.security.auth
  * @summary Ensure that authentication via CRAM-MD5 works.
  */
 
 /*
  * Can set logging to FINEST to view exchange.
  */
-import javax.security.sasl.*;
-import javax.security.auth.callback.*;
-import java.security.Security;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.sasl.Sasl;
+import javax.security.sasl.SaslClient;
+import javax.security.sasl.SaslServer;
 
 public class Cram {
     private static final String MECH = "CRAM-MD5";
diff --git a/jdk/test/com/sun/security/sasl/TEST.properties b/jdk/test/com/sun/security/sasl/TEST.properties
new file mode 100644
index 00000000000..5c3c53e460d
--- /dev/null
+++ b/jdk/test/com/sun/security/sasl/TEST.properties
@@ -0,0 +1 @@
+modules = java.security.sasl
diff --git a/jdk/test/com/sun/security/sasl/digest/TEST.properties b/jdk/test/com/sun/security/sasl/digest/TEST.properties
new file mode 100644
index 00000000000..282ca00ddc7
--- /dev/null
+++ b/jdk/test/com/sun/security/sasl/digest/TEST.properties
@@ -0,0 +1 @@
+modules = jdk.security.auth