Skip to content

Commit

Permalink
8331746: Create a test to verify that the cmm id is not ignored
Browse files Browse the repository at this point in the history
Reviewed-by: prr, dmarkov, aivanov
  • Loading branch information
mrserb committed May 17, 2024
1 parent de57d4b commit 7c750fd
Showing 1 changed file with 69 additions and 0 deletions.
69 changes: 69 additions & 0 deletions test/jdk/java/awt/color/ICC_Profile/CustomCMMID.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
/*
* Copyright Amazon.com Inc. 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/

import java.awt.color.ColorSpace;
import java.awt.color.ICC_Profile;
import java.util.Arrays;

/**
* @test
* @bug 8321489
* @summary tests that the cmm id is not ignored
*/
public final class CustomCMMID {

private static final byte[] JAVA_ID = {
(byte) 'j', (byte) 'a', (byte) 'v', (byte) 'a',
};

private static final int[] CS = {
ColorSpace.CS_CIEXYZ, ColorSpace.CS_GRAY, ColorSpace.CS_LINEAR_RGB,
ColorSpace.CS_PYCC, ColorSpace.CS_sRGB
};

public static void main(String[] args) {
for (int cs : CS) {
ICC_Profile p = createProfile(cs);
validate(p);
}
}

private static ICC_Profile createProfile(int type) {
byte[] data = ICC_Profile.getInstance(type).getData();
System.arraycopy(JAVA_ID, 0, data, ICC_Profile.icHdrCmmId,
JAVA_ID.length);
return ICC_Profile.getInstance(data);
}

private static void validate(ICC_Profile p) {
byte[] header = p.getData(ICC_Profile.icSigHead);
byte[] id = new byte[JAVA_ID.length];
System.arraycopy(header, ICC_Profile.icHdrCmmId, id, 0, JAVA_ID.length);

if (!java.util.Arrays.equals(id, JAVA_ID)) {
System.err.println("Expected: " + Arrays.toString(JAVA_ID));
System.err.println("Actual: " + Arrays.toString(id));
throw new RuntimeException("Wrong cmm id");
}
}
}

11 comments on commit 7c750fd

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mrserb
Copy link
Member Author

@mrserb mrserb commented on 7c750fd May 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk21u-dev

@mrserb
Copy link
Member Author

@mrserb mrserb commented on 7c750fd May 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk17u-dev

@mrserb
Copy link
Member Author

@mrserb mrserb commented on 7c750fd May 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk11u-dev

@mrserb
Copy link
Member Author

@mrserb mrserb commented on 7c750fd May 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk8u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 7c750fd May 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mrserb the backport was successfully created on the branch backport-mrserb-7c750fd9 in my personal fork of openjdk/jdk21u-dev. To create a pull request with this backport targeting openjdk/jdk21u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 7c750fd9 from the openjdk/jdk repository.

The commit being backported was authored by Sergey Bylokhov on 17 May 2024 and was reviewed by Phil Race, Dmitry Markov and Alexey Ivanov.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk21u-dev:

$ git fetch https://github.com/openjdk-bots/jdk21u-dev.git backport-mrserb-7c750fd9:backport-mrserb-7c750fd9
$ git checkout backport-mrserb-7c750fd9
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk21u-dev.git backport-mrserb-7c750fd9

@openjdk
Copy link

@openjdk openjdk bot commented on 7c750fd May 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mrserb the backport was successfully created on the branch backport-mrserb-7c750fd9 in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 7c750fd9 from the openjdk/jdk repository.

The commit being backported was authored by Sergey Bylokhov on 17 May 2024 and was reviewed by Phil Race, Dmitry Markov and Alexey Ivanov.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev.git backport-mrserb-7c750fd9:backport-mrserb-7c750fd9
$ git checkout backport-mrserb-7c750fd9
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev.git backport-mrserb-7c750fd9

@openjdk
Copy link

@openjdk openjdk bot commented on 7c750fd May 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mrserb Could not automatically backport 7c750fd9 to openjdk/jdk8u-dev due to conflicts in the following files:

  • jdk/test/java/awt/color/ICC_Profile/CustomCMMID.java

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk8u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk8u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-mrserb-7c750fd9

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git 7c750fd95b83d0a93b0cce681dcfbbae1f220fdd

# Backport the commit
$ git cherry-pick --no-commit 7c750fd95b83d0a93b0cce681dcfbbae1f220fdd
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 7c750fd95b83d0a93b0cce681dcfbbae1f220fdd'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk8u-dev with the title Backport 7c750fd95b83d0a93b0cce681dcfbbae1f220fdd.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 7c750fd9 from the openjdk/jdk repository.

The commit being backported was authored by Sergey Bylokhov on 17 May 2024 and was reviewed by Phil Race, Dmitry Markov and Alexey Ivanov.

Thanks!

@openjdk
Copy link

@openjdk openjdk bot commented on 7c750fd May 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mrserb the backport was successfully created on the branch backport-mrserb-7c750fd9 in my personal fork of openjdk/jdk11u-dev. To create a pull request with this backport targeting openjdk/jdk11u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 7c750fd9 from the openjdk/jdk repository.

The commit being backported was authored by Sergey Bylokhov on 17 May 2024 and was reviewed by Phil Race, Dmitry Markov and Alexey Ivanov.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk11u-dev:

$ git fetch https://github.com/openjdk-bots/jdk11u-dev.git backport-mrserb-7c750fd9:backport-mrserb-7c750fd9
$ git checkout backport-mrserb-7c750fd9
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk11u-dev.git backport-mrserb-7c750fd9

@mrserb
Copy link
Member Author

@mrserb mrserb commented on 7c750fd May 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk22u

@openjdk
Copy link

@openjdk openjdk bot commented on 7c750fd May 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mrserb the backport was successfully created on the branch backport-mrserb-7c750fd9 in my personal fork of openjdk/jdk22u. To create a pull request with this backport targeting openjdk/jdk22u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 7c750fd9 from the openjdk/jdk repository.

The commit being backported was authored by Sergey Bylokhov on 17 May 2024 and was reviewed by Phil Race, Dmitry Markov and Alexey Ivanov.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk22u:

$ git fetch https://github.com/openjdk-bots/jdk22u.git backport-mrserb-7c750fd9:backport-mrserb-7c750fd9
$ git checkout backport-mrserb-7c750fd9
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk22u.git backport-mrserb-7c750fd9

⚠️ @mrserb You are not yet a collaborator in my fork openjdk-bots/jdk22u. An invite will be sent out and you need to accept it before you can proceed.

Please sign in to comment.