-
Notifications
You must be signed in to change notification settings - Fork 729
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Separate tests that rely on SecurityManager (Jsr292) #14580
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 60 additions & 0 deletions
60
test/functional/Jsr292/src/com/ibm/j9/jsr292/MethodTypeTests_SM.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2022, 2022 IBM Corp. and others | ||
| * | ||
| * This program and the accompanying materials are made available under | ||
| * the terms of the Eclipse Public License 2.0 which accompanies this | ||
| * distribution and is available at https://www.eclipse.org/legal/epl-2.0/ | ||
| * or the Apache License, Version 2.0 which accompanies this distribution and | ||
| * is available at https://www.apache.org/licenses/LICENSE-2.0. | ||
| * | ||
| * 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: GNU | ||
| * General Public License, version 2 with the GNU Classpath | ||
| * Exception [1] and GNU General Public License, version 2 with the | ||
| * OpenJDK Assembly Exception [2]. | ||
| * | ||
| * [1] https://www.gnu.org/software/classpath/license.html | ||
| * [2] http://openjdk.java.net/legal/assembly-exception.html | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception | ||
| *******************************************************************************/ | ||
| package com.ibm.j9.jsr292; | ||
|
|
||
| import org.testng.annotations.Test; | ||
| import org.testng.AssertJUnit; | ||
| import java.io.*; | ||
| import java.lang.invoke.MethodType; | ||
|
|
||
| /** | ||
| * @author mesbah | ||
| * This class contains tests for the MethodType API. | ||
| */ | ||
| public class MethodTypeTests_SM { | ||
|
|
||
| /** | ||
| * Ensure that MethodTypes serialization works. Runs with the SecurityManager enabled. | ||
| */ | ||
| @Test(groups = { "level.extended" }) | ||
| public void test_SerializeGenericMethodType() throws IOException, ClassNotFoundException { | ||
| Class<?> returnType = String.class; | ||
| Class<?> paramType = Class.class; | ||
| MethodType mt = MethodType.methodType(returnType, paramType); | ||
| ByteArrayOutputStream baos = new ByteArrayOutputStream(); | ||
| ObjectOutputStream oos = new ObjectOutputStream(baos); | ||
| oos.writeObject(mt); | ||
| oos.close(); | ||
| ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(baos.toByteArray())); | ||
| System.setSecurityManager(new SecurityManager()); | ||
| try { | ||
| MethodType newMT = (MethodType) ois.readObject(); | ||
|
|
||
| // Validate MethodType constructed from serialized data | ||
| AssertJUnit.assertEquals(returnType, newMT.returnType()); | ||
| AssertJUnit.assertEquals(paramType, newMT.parameterType(0)); | ||
| } finally { | ||
| ois.close(); | ||
| System.setSecurityManager(null); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <!-- | ||
| Copyright (c) 2022, 2022 IBM Corp. and others | ||
|
|
||
| This program and the accompanying materials are made available under | ||
| the terms of the Eclipse Public License 2.0 which accompanies this | ||
| distribution and is available at https://www.eclipse.org/legal/epl-2.0/ | ||
| or the Apache License, Version 2.0 which accompanies this distribution and | ||
| is available at https://www.apache.org/licenses/LICENSE-2.0. | ||
|
|
||
| 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: GNU | ||
| General Public License, version 2 with the GNU Classpath | ||
| Exception [1] and GNU General Public License, version 2 with the | ||
| OpenJDK Assembly Exception [2]. | ||
|
|
||
| [1] https://www.gnu.org/software/classpath/license.html | ||
| [2] http://openjdk.java.net/legal/assembly-exception.html | ||
|
|
||
| SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception | ||
| --> | ||
|
|
||
| <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"> | ||
| <suite name="jsr292 SecurityManager suite" parallel="none" verbose="2"> | ||
| <test name="jsr292Test_SM"> | ||
| <classes> | ||
| <class name="com.ibm.j9.jsr292.MethodTypeTests_SM"/> | ||
| </classes> | ||
| </test> | ||
| </suite> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead of add
-testnames jsr292Test_SMin different test targets , could we just have onejsr292Test_SMtarget? And add<version>8</version>and<variation>-Xjit:count=0</variation>in thisjsr292Test_SMtarget? Did I miss anything?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems like
jsr292Test_jdk8andjsr292Test_jdk8_specialare the same (with variation changes) butjsr292Test_JitCount0_jdk8has an extra testnamejsr292Test_optionaland platform requirement^arch.arm. The first two could probably be merged but why are they separate to begin with? If I merge the new SM tests then the non SM tests should be merged as well.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am not sure the details, but I think these tests were added in the early days. And the test framework (TKG) might have limited ability back then, which resulted in separated targets.
I was thinking to keep this PR simple and only deal with SM tests. And we can have a separate PR for cleaning up non SM tests later. But it is up to you. I am ok either way.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The github diff was messy when I tried to merge everything so I merged just the SM tests instead