5049012: PrintToFile option is not disabled for flavors that do not support destination

Reviewed-by: prr, jdv
This commit is contained in:
Prasanta Sadhukhan 2016-07-11 10:45:54 +05:30
parent feb1698c01
commit c41a009a62
2 changed files with 165 additions and 5 deletions

View File

@ -74,7 +74,7 @@ import sun.print.SunPageSelection;
import java.awt.event.KeyEvent;
import java.net.URISyntaxException;
import java.lang.reflect.Field;
import java.net.MalformedURLException;
/**
* A class which implements a cross-platform print dialog.
@ -932,12 +932,18 @@ public class ServiceDialog extends JDialog implements ActionListener {
allowedToPrintToFile() : false;
// setup Destination (print-to-file) widgets
if (psCurrent.isAttributeCategorySupported(dstCategory)) {
dstSupported = true;
}
Destination dst = (Destination)asCurrent.get(dstCategory);
if (dst != null) {
dstSelected = true;
try {
dst.getURI().toURL();
if (psCurrent.isAttributeValueSupported(dst, docFlavor,
asCurrent)) {
dstSupported = true;
dstSelected = true;
}
} catch (MalformedURLException ex) {
dstSupported = true;
}
}
cbPrintToFile.setEnabled(dstSupported && dstAllowed);
cbPrintToFile.setSelected(dstSelected && dstAllowed

View File

@ -0,0 +1,154 @@
/*
* Copyright (c) 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
* 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 5049012
* @summary Verify if PrintToFile option is disabled for flavors that do not
* support Destination
* @requires (os.family == "linux")
* @run main/manual ServiceDialogValidateTest
*/
import java.awt.BorderLayout;
import java.awt.FlowLayout;
import java.io.File;
import javax.print.DocFlavor;
import javax.print.PrintService;
import javax.print.PrintServiceLookup;
import javax.print.ServiceUI;
import javax.print.attribute.HashPrintRequestAttributeSet;
import javax.print.attribute.standard.Destination;
import javax.swing.JButton;
import javax.swing.JDialog;
import javax.swing.JPanel;
import javax.swing.JTextArea;
import javax.swing.SwingUtilities;
public class ServiceDialogValidateTest {
private static Thread mainThread;
private static boolean testPassed;
private static boolean testGeneratedInterrupt;
private static void printTest() {
PrintService defService = null, service[] = null;
HashPrintRequestAttributeSet prSet = new HashPrintRequestAttributeSet();
DocFlavor flavor = DocFlavor.INPUT_STREAM.JPEG;
service = PrintServiceLookup.lookupPrintServices(flavor, null);
defService = PrintServiceLookup.lookupDefaultPrintService();
if ((service == null) || (service.length == 0)) {
throw new RuntimeException("No Printer services found");
}
File f = new File("output.ps");
Destination d = new Destination(f.toURI());
prSet.add(d);
if (defService != null) {
System.out.println("isAttrCategory Supported? " +
defService.isAttributeCategorySupported(Destination.class));
System.out.println("isAttrValue Supported? " +
defService.isAttributeValueSupported(d, flavor, null));
}
defService = ServiceUI.printDialog(null, 100, 100, service, defService,
flavor, prSet);
}
/**
* Starts the application.
*/
public static void main(java.lang.String[] args) throws Exception {
SwingUtilities.invokeAndWait(() -> {
doTest(ServiceDialogValidateTest::printTest);
});
mainThread = Thread.currentThread();
try {
Thread.sleep(60000);
} catch (InterruptedException e) {
if (!testPassed && testGeneratedInterrupt) {
throw new RuntimeException("PrintToFile option is not disabled "
+ "for flavors that do not support destination");
}
}
if (!testGeneratedInterrupt) {
throw new RuntimeException("user has not executed the test");
}
}
public static synchronized void pass() {
testPassed = true;
testGeneratedInterrupt = true;
mainThread.interrupt();
}
public static synchronized void fail() {
testPassed = false;
testGeneratedInterrupt = true;
mainThread.interrupt();
}
private static void doTest(Runnable action) {
String description
= " Visual inspection of print dialog is required.\n"
+ " A print dialog will be shown.\n "
+ " Please verify Print-To-File option is disabled.\n"
+ " Press Cancel to close the print dialog.\n"
+ " If Print-To-File option is disabled, press PASS else press FAIL";
final JDialog dialog = new JDialog();
dialog.setTitle("printSelectionTest");
JTextArea textArea = new JTextArea(description);
textArea.setEditable(false);
final JButton testButton = new JButton("Start Test");
final JButton passButton = new JButton("PASS");
passButton.setEnabled(false);
passButton.addActionListener((e) -> {
dialog.dispose();
pass();
});
final JButton failButton = new JButton("FAIL");
failButton.setEnabled(false);
failButton.addActionListener((e) -> {
dialog.dispose();
fail();
});
testButton.addActionListener((e) -> {
testButton.setEnabled(false);
action.run();
passButton.setEnabled(true);
failButton.setEnabled(true);
});
JPanel mainPanel = new JPanel(new BorderLayout());
mainPanel.add(textArea, BorderLayout.CENTER);
JPanel buttonPanel = new JPanel(new FlowLayout());
buttonPanel.add(testButton);
buttonPanel.add(passButton);
buttonPanel.add(failButton);
mainPanel.add(buttonPanel, BorderLayout.SOUTH);
dialog.add(mainPanel);
dialog.pack();
dialog.setVisible(true);
}
}