4884570: StreamPrintService.isAttributeValueSupported does not work properly for SheetCollate

Reviewed-by: serb

src/java.desktop/share/classes/sun/print/PSStreamPrintService.java

@@ -427,7 +427,17 @@ public class PSStreamPrintService extends StreamPrintService
             if (attr == OrientationRequested.REVERSE_PORTRAIT ||
                 (flavor != null) &&
                 !(flavor.equals(DocFlavor.SERVICE_FORMATTED.PAGEABLE) ||
-                flavor.equals(DocFlavor.SERVICE_FORMATTED.PRINTABLE))) {
+                  flavor.equals(DocFlavor.SERVICE_FORMATTED.PRINTABLE) ||
+                  flavor.equals(DocFlavor.INPUT_STREAM.GIF) ||
+                  flavor.equals(DocFlavor.INPUT_STREAM.JPEG) ||
+                  flavor.equals(DocFlavor.INPUT_STREAM.PNG) ||
+                  flavor.equals(DocFlavor.BYTE_ARRAY.GIF) ||
+                  flavor.equals(DocFlavor.BYTE_ARRAY.JPEG) ||
+                  flavor.equals(DocFlavor.BYTE_ARRAY.PNG) ||
+                  flavor.equals(DocFlavor.URL.GIF) ||
+                  flavor.equals(DocFlavor.URL.JPEG) ||
+                  flavor.equals(DocFlavor.URL.PNG)))
+            {
                 return false;
             }
         } else if (attr.getCategory() == PageRanges.class) {
@@ -440,7 +450,7 @@ public class PSStreamPrintService extends StreamPrintService
             if (flavor != null &&
                 !(flavor.equals(DocFlavor.SERVICE_FORMATTED.PAGEABLE) ||
                 flavor.equals(DocFlavor.SERVICE_FORMATTED.PRINTABLE))) {
-                return false;
+                return attr == SheetCollate.UNCOLLATED;
             }
         } else if (attr.getCategory() == Sides.class) {
             if (flavor != null &&

test/jdk/javax/print/attribute/StreamServiceAttributeTest.java

@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2022, 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
+ * 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.
+ */
+
+/*
+ * @test
+ * @bug 4884570
+ * @summary Attribute support reporting should be consistent
+*/
+
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStream;
+
+import javax.print.DocFlavor;
+import javax.print.StreamPrintService;
+import javax.print.StreamPrintServiceFactory;
+import javax.print.attribute.Attribute;
+import javax.print.attribute.standard.Chromaticity;
+import javax.print.attribute.standard.Media;
+import javax.print.attribute.standard.OrientationRequested;
+import javax.print.attribute.standard.SheetCollate;
+import javax.print.attribute.standard.Sides;
+
+public class StreamServiceAttributeTest {
+
+    private static boolean allSupported = true;
+    private static Class[] attrClasses = {
+         Chromaticity.class,
+         Media.class,
+         OrientationRequested.class,
+         SheetCollate.class,
+         Sides.class,
+    };
+
+    public static void main(String args[]) {
+
+        StreamPrintServiceFactory[] fact =
+          StreamPrintServiceFactory.lookupStreamPrintServiceFactories(
+                null, null);
+
+        if (fact.length == 0) {
+            return;
+        }
+        OutputStream out = new ByteArrayOutputStream();
+        StreamPrintService sps = fact[0].getPrintService(out);
+        for (Class<? extends Attribute> ac : attrClasses) {
+            test(sps, ac);
+        }
+
+        if (!allSupported) {
+            throw new RuntimeException("Inconsistent support reported");
+        }
+    }
+
+    private static void test(StreamPrintService sps,
+                             Class<? extends Attribute> ac) {
+        if (!sps.isAttributeCategorySupported(ac)) {
+            return;
+        }
+        DocFlavor[] dfs = sps.getSupportedDocFlavors();
+        for (DocFlavor f : dfs) {
+            Attribute[] attrs = (Attribute[])
+               sps.getSupportedAttributeValues(ac, f, null);
+            if (attrs == null) {
+               continue;
+            }
+            for (Attribute a : attrs) {
+                if (!sps.isAttributeValueSupported(a, f, null)) {
+                    allSupported = false;
+                    System.out.println("Unsupported : " + f + " " + a);
+                }
+            }
+        }
+    }
+}