2323
2424/**
2525 * @test
26- * @bug 8193125 8196623
26+ * @bug 8193125 8196623 8335989
2727 * @summary test modifiers with java.base
2828 * @library /tools/lib
2929 * @enablePreview
4949
5050import com .sun .tools .javac .jvm .Target ;
5151import com .sun .tools .javac .platform .JDKPlatformProvider ;
52+ import java .util .function .Supplier ;
5253
5354import toolbox .JavacTask ;
5455import toolbox .Task ;
5556import toolbox .ToolBox ;
5657
5758public class JavaBaseTest {
5859
60+ private static final String CURRENT_VERSION = System .getProperty ("java.specification.version" );
61+
5962 public static void main (String ... args ) throws Exception {
6063 JavaBaseTest t = new JavaBaseTest ();
6164 t .run ();
@@ -75,13 +78,11 @@ enum Mode { SOURCE, CLASS };
7578
7679 void run () throws Exception {
7780 Set <String > targets = new LinkedHashSet <>();
78- StreamSupport .stream (new JDKPlatformProvider ().getSupportedPlatformNames ()
79- .spliterator (),
80- false )
81- .filter (p -> Integer .parseInt (p ) >= 9 )
82- .forEach (targets ::add );
83- //run without --release:
81+ targets .add ("9" );
82+ targets .add ("10" );
83+ targets .add ("21" );
8484 targets .add ("current" );
85+ targets .add ("current-preview" );
8586 for (List <String > mods : modifiers ) {
8687 for (String target : targets ) {
8788 for (Mode mode : Mode .values ()) {
@@ -119,15 +120,43 @@ void testSource(Path base, List<String> mods, String target) throws Exception {
119120 tb .writeJavaFiles (src ,
120121 "module m { requires " + String .join (" " , mods ) + " java.base; }" );
121122 Path modules = Files .createDirectories (base .resolve ("modules" ));
122- boolean expectOK = target . equals ( "9" ) ;
123+ boolean expectOK ;
123124
124125 JavacTask jct = new JavacTask (tb )
125126 .outdir (modules );
126127
127- if (target .equals ("current" ))
128- jct .options ("-XDrawDiagnostics" );
129- else
130- jct .options ("-XDrawDiagnostics" , "--release" , target );
128+ List <String > options = new ArrayList <>();
129+
130+ switch (target ) {
131+ case "current" :
132+ options .add ("--release" );
133+ options .add (CURRENT_VERSION );
134+ expectOK = false ;
135+ break ;
136+ case "current-preview" :
137+ options .add ("--enable-preview" );
138+ options .add ("--release" );
139+ options .add (CURRENT_VERSION );
140+ expectOK = true ;
141+ break ;
142+ case "9" :
143+ options .add ("--release" );
144+ options .add (target );
145+ expectOK = true ;
146+ break ;
147+ default :
148+ options .add ("--release" );
149+ options .add (target );
150+ expectOK = false ;
151+ break ;
152+ }
153+
154+ if (mods .contains ("static" ) && !"9" .equals (target )) {
155+ expectOK = false ;
156+ }
157+
158+ options .add ("-XDrawDiagnostics" );
159+ jct .options (options );
131160
132161 String log = jct .files (tb .findJavaFiles (src ))
133162 .run (expectOK ? Task .Expect .SUCCESS : Task .Expect .FAIL )
@@ -138,9 +167,9 @@ void testSource(Path base, List<String> mods, String target) throws Exception {
138167 boolean foundErrorMessage = false ;
139168 for (String mod : mods ) {
140169 String key = mod .equals ("static" )
141- ? "compiler.err.mod.not.allowed.here"
142- : "compiler.err.modifier .not.allowed.here " ;
143- String message = "module-info.java:1:12: " + key + ": " + mod ;
170+ ? "compiler.err.mod.not.allowed.here: " + mod
171+ : "compiler.err.feature .not.supported.in.source.plural: (compiler.misc.feature.java.base.transitive) " ;
172+ String message = "module-info.java:1:12: " + key ;
144173 if (log .contains (message )) {
145174 foundErrorMessage = true ;
146175 }
@@ -152,18 +181,57 @@ void testSource(Path base, List<String> mods, String target) throws Exception {
152181 }
153182
154183 void testClass (Path base , List <String > mods , String target ) throws Exception {
155- createClass (base , mods , target );
184+ boolean expectOK ;
185+ List <String > options = new ArrayList <>();
186+
187+ switch (target ) {
188+ case "current" :
189+ options .add ("--release" );
190+ options .add (CURRENT_VERSION );
191+ expectOK = false ;
192+ break ;
193+ case "current-preview" :
194+ options .add ("--enable-preview" );
195+ options .add ("--release" );
196+ options .add (CURRENT_VERSION );
197+ expectOK = true ;
198+ break ;
199+ case "9" :
200+ options .add ("--release" );
201+ options .add (target );
202+ expectOK = true ;
203+ break ;
204+ default :
205+ options .add ("--release" );
206+ options .add (target );
207+ expectOK = false ;
208+ break ;
209+ }
210+
211+ if (mods .contains ("static" ) && !"9" .equals (target )) {
212+ expectOK = false ;
213+ }
214+
215+ createClass (base , mods , options );
216+
217+ List <String > testOptions = new ArrayList <>();
218+
219+ testOptions .add ("-XDrawDiagnostics" );
220+ testOptions .add ("--module-path" ); testOptions .add (base .resolve ("test-modules" ).toString ());
221+
222+ if (options .contains ("--enable-preview" )) {
223+ testOptions .add ("--enable-preview" );
224+ testOptions .add ("--source" ); testOptions .add (CURRENT_VERSION );
225+ }
156226
157227 Path src = base .resolve ("src" );
158228 tb .writeJavaFiles (src ,
159229 "module mx { requires m; }" );
160230 Path modules = Files .createDirectories (base .resolve ("modules" ));
161231
162- boolean expectOK = target .equals ("9" );
163232 String log = new JavacTask (tb )
164233 .outdir (modules )
165- .options ("-XDrawDiagnostics" ,
166- "--module-path" , base .resolve ("test-modules" ).toString ())
234+ .options (testOptions )
167235 .files (tb .findJavaFiles (src ))
168236 .run (expectOK ? Task .Expect .SUCCESS : Task .Expect .FAIL )
169237 .writeAll ()
@@ -188,7 +256,7 @@ void testClass(Path base, List<String> mods, String target) throws Exception {
188256 }
189257 }
190258
191- void createClass (Path base , List <String > mods , String target ) throws Exception {
259+ void createClass (Path base , List <String > mods , List < String > options ) throws Exception {
192260 Path src1 = base .resolve ("interim-src" );
193261 tb .writeJavaFiles (src1 ,
194262 "module m { requires java.base; }" );
@@ -197,9 +265,7 @@ void createClass(Path base, List<String> mods, String target) throws Exception {
197265 JavacTask jct = new JavacTask (tb )
198266 .outdir (modules1 );
199267
200- if (!target .equals ("current" )) {
201- jct .options ("--release" , target );
202- }
268+ jct .options (options );
203269
204270 jct .files (tb .findJavaFiles (src1 ))
205271 .run (Task .Expect .SUCCESS );
@@ -226,6 +292,8 @@ void createClass(Path base, List<String> mods, String target) throws Exception {
226292 requires .set (i , e2 );
227293 }
228294
295+ boolean preview = options .contains ("--enable-preview" );
296+
229297 ModuleAttribute modAttr2 = ModuleAttribute .of (
230298 modAttr1 .moduleName (),
231299 modAttr1 .moduleFlagsMask (),
@@ -237,8 +305,14 @@ void createClass(Path base, List<String> mods, String target) throws Exception {
237305 modAttr1 .provides ());
238306 Path modInfo = base .resolve ("test-modules" ).resolve ("module-info.class" );
239307 Files .createDirectories (modInfo .getParent ());
240- byte [] newBytes = ClassFile .of ().transformClass (cm1 , ClassTransform .dropping (ce -> ce instanceof ModuleAttribute ).
241- andThen (ClassTransform .endHandler (classBuilder -> classBuilder .with (modAttr2 ))));
308+ ClassTransform replace = (builder , element ) -> {
309+ switch (element ) {
310+ case ClassFileVersion cfv when preview -> builder .withVersion (cfv .majorVersion (), 0xFFFF );
311+ case ModuleAttribute _ -> builder .with (modAttr2 );
312+ default -> builder .with (element );
313+ }
314+ };
315+ byte [] newBytes = ClassFile .of ().transformClass (cm1 , replace );
242316 try (OutputStream out = Files .newOutputStream (modInfo )) {
243317 out .write (newBytes );
244318 }
1 commit comments
openjdk-notifier[bot] commentedon Nov 14, 2024
Review
Issues