undefect. CWE-407 — 63 sites patched across 27 ecosystems
Authors: russell@unturf.com · brackishbert@gmail.com · foxhop.net · TimeHexOn.com Patches, unit tests, benchmarks, whitepaper, and outreach briefs. Public domain — no copyright claimed. Use freely.
This commit is contained in:
commit
0a580b313d
70422 changed files with 17213626 additions and 0 deletions
126
test/jdk/java/awt/xembed/server/JavaClient.java
Normal file
126
test/jdk/java/awt/xembed/server/JavaClient.java
Normal file
|
|
@ -0,0 +1,126 @@
|
|||
/*
|
||||
* Copyright (c) 2004, 2008, 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.
|
||||
*/
|
||||
|
||||
import java.awt.*;
|
||||
import sun.awt.*;
|
||||
import java.awt.event.*;
|
||||
import java.lang.reflect.*;
|
||||
import java.awt.dnd.*;
|
||||
import java.awt.datatransfer.*;
|
||||
|
||||
public class JavaClient {
|
||||
ClientContainer cont;
|
||||
public static void main(String[] args) {
|
||||
if (System.getProperty("os.name").toLowerCase().startsWith("win")) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Enable testing extensions in XEmbed server
|
||||
System.setProperty("sun.awt.xembed.testing", "true");
|
||||
|
||||
boolean xtoolkit = "sun.awt.X11.XToolkit".equals(Toolkit.getDefaultToolkit().getClass().getName());
|
||||
final EmbeddedFrame ef = createEmbeddedFrame(xtoolkit, Long.parseLong(args[0]));
|
||||
ef.setBackground(new Color(100, 100, 200));
|
||||
ef.setLayout(new BorderLayout());
|
||||
ef.add(new ClientContainer(ef), BorderLayout.CENTER);
|
||||
ef.pack();
|
||||
ef.registerListeners();
|
||||
ef.setVisible(true);
|
||||
}
|
||||
private static EmbeddedFrame createEmbeddedFrame(boolean xtoolkit, long window) {
|
||||
try {
|
||||
Class cl = (xtoolkit?Class.forName("sun.awt.X11.XEmbeddedFrame"):Class.forName("sun.awt.motif.MEmbeddedFrame"));
|
||||
Constructor cons = cl.getConstructor(new Class[]{Long.TYPE, Boolean.TYPE});
|
||||
return (EmbeddedFrame)cons.newInstance(new Object[] {window, true});
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
throw new RuntimeException("Can't create embedded frame");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class ClientContainer extends Container {
|
||||
Window parent;
|
||||
int width, height;
|
||||
public ClientContainer(Window w) {
|
||||
parent = w;
|
||||
width = 500;
|
||||
height = 50;
|
||||
final TextField tf = new TextField(30);
|
||||
|
||||
DragSource ds = new DragSource();
|
||||
final DragSourceListener dsl = new DragSourceAdapter() {
|
||||
public void dragDropEnd(DragSourceDropEvent dsde) {
|
||||
}
|
||||
};
|
||||
final DragGestureListener dgl = new DragGestureListener() {
|
||||
public void dragGestureRecognized(DragGestureEvent dge) {
|
||||
dge.startDrag(null, new StringSelection(tf.getText()), dsl);
|
||||
}
|
||||
};
|
||||
ds.createDefaultDragGestureRecognizer(tf, DnDConstants.ACTION_COPY, dgl);
|
||||
|
||||
final DropTargetListener dtl = new DropTargetAdapter() {
|
||||
public void drop(DropTargetDropEvent dtde) {
|
||||
dtde.acceptDrop(DnDConstants.ACTION_COPY);
|
||||
try {
|
||||
tf.setText(tf.getText() + (String)dtde.getTransferable().getTransferData(DataFlavor.stringFlavor));
|
||||
} catch (Exception e) {
|
||||
}
|
||||
}
|
||||
};
|
||||
final DropTarget dt = new DropTarget(tf, dtl);
|
||||
|
||||
setLayout(new FlowLayout());
|
||||
add(tf);
|
||||
Button close = new Button("Close");
|
||||
close.addActionListener(new ActionListener() {
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
parent.dispose();
|
||||
}
|
||||
});
|
||||
Button inc = new Button("Increase size");
|
||||
inc.addActionListener(new ActionListener() {
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
changeSize(10);
|
||||
}
|
||||
});
|
||||
Button dec = new Button("Decrease size");
|
||||
dec.addActionListener(new ActionListener() {
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
changeSize(-10);
|
||||
}
|
||||
});
|
||||
add(close);
|
||||
add(inc);
|
||||
add(dec);
|
||||
}
|
||||
void changeSize(int step) {
|
||||
width += step;
|
||||
height += step;
|
||||
parent.pack();
|
||||
}
|
||||
public Dimension getPreferredSize() {
|
||||
return new Dimension(width, height);
|
||||
}
|
||||
}
|
||||
183
test/jdk/java/awt/xembed/server/RunTestXEmbed.java
Normal file
183
test/jdk/java/awt/xembed/server/RunTestXEmbed.java
Normal file
|
|
@ -0,0 +1,183 @@
|
|||
/*
|
||||
* Copyright (c) 2004, 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
|
||||
* @key headful
|
||||
* @bug 4931668 7146533
|
||||
* @summary Tests XEmbed server/client functionality
|
||||
* @author Denis Mikhalkin: area=awt.xembed
|
||||
* @requires (!(os.family=="mac") & !(os.family=="windows"))
|
||||
* @library /test/lib
|
||||
* @modules java.desktop/sun.awt
|
||||
* @build jdk.test.lib.Platform
|
||||
* @compile JavaClient.java TesterClient.java TestXEmbedServer.java
|
||||
* @run main/timeout=6000 RunTestXEmbed
|
||||
*/
|
||||
|
||||
import java.awt.Rectangle;
|
||||
import java.lang.reflect.Method;
|
||||
import java.util.logging.*;
|
||||
import java.util.*;
|
||||
import java.io.*;
|
||||
import jdk.test.lib.Platform;
|
||||
|
||||
public class RunTestXEmbed extends TestXEmbedServer {
|
||||
private static final Logger log = Logger.getLogger("test.xembed");
|
||||
private Method test;
|
||||
private boolean passed = false;
|
||||
public RunTestXEmbed(Method test) {
|
||||
super(false);
|
||||
this.test = test;
|
||||
}
|
||||
|
||||
public Process startClient(Rectangle bounds[], long window) {
|
||||
try {
|
||||
String java_home = System.getProperty("java.home");
|
||||
StringBuilder buf = new StringBuilder();
|
||||
for (int i = 0; i < bounds.length; i++) {
|
||||
buf.append(" " + bounds[i].x);
|
||||
buf.append(" " + bounds[i].y);
|
||||
buf.append(" " + bounds[i].width);
|
||||
buf.append(" " + bounds[i].height);
|
||||
}
|
||||
Map envs = System.getenv();
|
||||
String enva[] = new String[envs.size()];
|
||||
int ind = 0;
|
||||
Iterator iter = envs.entrySet().iterator();
|
||||
while (iter.hasNext()) {
|
||||
Map.Entry entry = (Map.Entry)iter.next();
|
||||
if (!"AWT_TOOLKIT".equals(entry.getKey())) {
|
||||
enva[ind++] = entry.getKey() + "=" + entry.getValue();
|
||||
} else {
|
||||
enva[ind++] = "AWT_TOOLKIT=sun.awt.X11.XToolkit";
|
||||
}
|
||||
}
|
||||
Process proc = Runtime.getRuntime().
|
||||
exec(java_home +
|
||||
"/bin/java --add-exports java.desktop/sun.awt.X11=ALL-UNNAMED -Dawt.toolkit=sun.awt.X11.XToolkit TesterClient "
|
||||
+ test.getName() + " " + window + buf,
|
||||
enva);
|
||||
System.err.println("Test for " + test.getName() + " has started.");
|
||||
log.fine("Test for " + test.getName() + " has started.");
|
||||
new InputReader(proc.getInputStream());
|
||||
new InputReader(proc.getErrorStream());
|
||||
try {
|
||||
passed = (proc.waitFor() == 0);
|
||||
} catch (InterruptedException ie) {
|
||||
}
|
||||
log.fine("Test for " + test.getName() + " has finished.");
|
||||
File logFile = new File("java3.txt");
|
||||
if (logFile.exists()) {
|
||||
logFile.renameTo(new File(test.getName() + ".txt"));
|
||||
}
|
||||
return proc;
|
||||
} catch (IOException ex1) {
|
||||
ex1.printStackTrace();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public static void main(String[] args) throws Throwable {
|
||||
if (Platform.isWindows() || Platform.isOSX()) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Enabled XEmbed
|
||||
System.setProperty("sun.awt.xembedserver", "true");
|
||||
|
||||
if (args.length == 1) {
|
||||
Class cl = Class.forName("sun.awt.X11.XEmbedServerTester");
|
||||
Method meth = cl.getMethod(args[0], new Class[0]);
|
||||
System.err.println("Performing single test " + args[0]);
|
||||
boolean res = performTest(meth);
|
||||
if (!res) {
|
||||
System.err.println("Test " + args[0] + " has failed");
|
||||
} else {
|
||||
System.err.println("Test " + args[0] + " has passed");
|
||||
}
|
||||
} else {
|
||||
Class cl = Class.forName("sun.awt.X11.XEmbedServerTester");
|
||||
Method[] meths = cl.getMethods();
|
||||
LinkedList failed = new LinkedList();
|
||||
for (int i = 0; i < meths.length; i++) {
|
||||
Method meth = meths[i];
|
||||
if (meth.getReturnType() == Void.TYPE && meth.getName().startsWith("test") && meth.getParameterTypes().length == 0) {
|
||||
System.err.println("Performing " + meth.getName());
|
||||
boolean res = performTest(meth);
|
||||
if (!res) {
|
||||
failed.add(meth);
|
||||
}
|
||||
}
|
||||
}
|
||||
log.info("Testing finished.");
|
||||
if (failed.size() != 0) {
|
||||
System.err.println("Some tests have failed:");
|
||||
Iterator iter = failed.iterator();
|
||||
while(iter.hasNext()) {
|
||||
Method meth = (Method)iter.next();
|
||||
System.err.println(meth.getName());
|
||||
}
|
||||
throw new RuntimeException("TestFAILED: some of the testcases are failed");
|
||||
} else {
|
||||
System.err.println("All PASSED");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static boolean performTest(Method meth) {
|
||||
RunTestXEmbed test = new RunTestXEmbed(meth);
|
||||
test.addClient();
|
||||
test.dispose();
|
||||
return test.isPassed();
|
||||
}
|
||||
|
||||
public boolean isPassed() {
|
||||
return passed;
|
||||
}
|
||||
}
|
||||
|
||||
class InputReader extends Thread {
|
||||
private InputStream stream;
|
||||
public InputReader(InputStream stream) {
|
||||
this.stream = stream;
|
||||
start();
|
||||
}
|
||||
public void run() {
|
||||
while (!interrupted()) {
|
||||
try {
|
||||
int inp = stream.read();
|
||||
if (inp != -1) {
|
||||
System.out.write(inp);
|
||||
} else {
|
||||
try {
|
||||
Thread.sleep(100);
|
||||
} catch (Exception iie) {
|
||||
}
|
||||
}
|
||||
} catch (IOException ie) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
234
test/jdk/java/awt/xembed/server/TestXEmbedServer.java
Normal file
234
test/jdk/java/awt/xembed/server/TestXEmbedServer.java
Normal file
|
|
@ -0,0 +1,234 @@
|
|||
/*
|
||||
* Copyright (c) 2004, 2010, 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.
|
||||
*/
|
||||
|
||||
import java.awt.*;
|
||||
import java.awt.event.*;
|
||||
import javax.swing.*;
|
||||
import java.io.*;
|
||||
import java.util.logging.*;
|
||||
import sun.awt.WindowIDProvider;
|
||||
import sun.awt.AWTAccessor;
|
||||
import sun.awt.AWTAccessor.ComponentAccessor;
|
||||
import java.awt.dnd.*;
|
||||
import java.awt.datatransfer.*;
|
||||
|
||||
public abstract class TestXEmbedServer {
|
||||
// vertical position of server AND client windows
|
||||
private static final int VERTICAL_POSITION = 200;
|
||||
|
||||
private static final Logger log = Logger.getLogger("test.xembed");
|
||||
Frame f;
|
||||
Canvas client;
|
||||
Button toFocus;
|
||||
Button b_modal;
|
||||
JButton b_close;
|
||||
JDialog modal_d;
|
||||
JFrame dummy;
|
||||
Container clientCont;
|
||||
boolean passed;
|
||||
|
||||
public boolean isPassed() {
|
||||
return passed;
|
||||
}
|
||||
|
||||
public TestXEmbedServer(boolean manual) {
|
||||
|
||||
// Enable testing extensions in XEmbed server
|
||||
System.setProperty("sun.awt.xembed.testing", "true");
|
||||
|
||||
f = new Frame("Main frame");
|
||||
f.addWindowListener(new WindowAdapter() {
|
||||
public void windowClosing(WindowEvent e) {
|
||||
synchronized(TestXEmbedServer.this) {
|
||||
TestXEmbedServer.this.notifyAll();
|
||||
}
|
||||
dummy.dispose();
|
||||
f.dispose();
|
||||
}
|
||||
});
|
||||
|
||||
f.setLayout(new BorderLayout());
|
||||
|
||||
Container bcont = new Container();
|
||||
|
||||
toFocus = new Button("Click to focus server");
|
||||
final TextField tf = new TextField(20);
|
||||
tf.setName("0");
|
||||
DragSource ds = new DragSource();
|
||||
final DragSourceListener dsl = new DragSourceAdapter() {
|
||||
public void dragDropEnd(DragSourceDropEvent dsde) {
|
||||
}
|
||||
};
|
||||
final DragGestureListener dgl = new DragGestureListener() {
|
||||
public void dragGestureRecognized(DragGestureEvent dge) {
|
||||
dge.startDrag(null, new StringSelection(tf.getText()), dsl);
|
||||
}
|
||||
};
|
||||
ds.createDefaultDragGestureRecognizer(tf, DnDConstants.ACTION_COPY, dgl);
|
||||
|
||||
final DropTargetListener dtl = new DropTargetAdapter() {
|
||||
public void drop(DropTargetDropEvent dtde) {
|
||||
dtde.acceptDrop(DnDConstants.ACTION_COPY);
|
||||
try {
|
||||
tf.setText(tf.getText() + (String)dtde.getTransferable().getTransferData(DataFlavor.stringFlavor));
|
||||
} catch (Exception e) {
|
||||
}
|
||||
}
|
||||
};
|
||||
final DropTarget dt = new DropTarget(tf, dtl);
|
||||
|
||||
Button b_add = new Button("Add client");
|
||||
b_add.addActionListener(new ActionListener() {
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
addClient();
|
||||
}
|
||||
});
|
||||
Button b_remove = new Button("Remove client");
|
||||
b_remove.addActionListener(new ActionListener() {
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
if (clientCont.getComponentCount() != 0) {
|
||||
clientCont.remove(clientCont.getComponentCount()-1);
|
||||
}
|
||||
}
|
||||
});
|
||||
b_close = new JButton("Close modal dialog");
|
||||
b_close.addActionListener(new ActionListener() {
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
modal_d.dispose();
|
||||
}
|
||||
});
|
||||
b_modal = new Button("Show modal dialog");
|
||||
b_modal.addActionListener(new ActionListener() {
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
modal_d = new JDialog(f, "Modal dialog", true);
|
||||
modal_d.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
|
||||
modal_d.setBounds(0, 100, 200, 50);
|
||||
modal_d.getContentPane().add(b_close);
|
||||
modal_d.validate();
|
||||
modal_d.show();
|
||||
}
|
||||
});
|
||||
|
||||
bcont.add(tf);
|
||||
bcont.add(toFocus);
|
||||
bcont.add(b_add);
|
||||
bcont.add(b_remove);
|
||||
bcont.add(b_modal);
|
||||
if (manual) {
|
||||
Button pass = new Button("Pass");
|
||||
pass.addActionListener(new ActionListener() {
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
passed = true;
|
||||
synchronized(TestXEmbedServer.this) {
|
||||
TestXEmbedServer.this.notifyAll();
|
||||
}
|
||||
}
|
||||
});
|
||||
bcont.add(pass);
|
||||
Button fail = new Button("Fail");
|
||||
fail.addActionListener(new ActionListener() {
|
||||
public void actionPerformed(ActionEvent e) {
|
||||
passed = false;
|
||||
synchronized(TestXEmbedServer.this) {
|
||||
TestXEmbedServer.this.notifyAll();
|
||||
}
|
||||
}
|
||||
});
|
||||
bcont.add(fail);
|
||||
}
|
||||
b_modal.setName("2");
|
||||
bcont.setLayout(new FlowLayout());
|
||||
f.add(bcont, BorderLayout.NORTH);
|
||||
|
||||
clientCont = Box.createVerticalBox();
|
||||
f.add(clientCont, BorderLayout.CENTER);
|
||||
|
||||
dummy = new JFrame("Dummy");
|
||||
dummy.getContentPane().add(new JButton("Button"));
|
||||
dummy.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
|
||||
dummy.setBounds(0, VERTICAL_POSITION, 100, 100);
|
||||
dummy.setVisible(true);
|
||||
|
||||
f.setBounds(300, VERTICAL_POSITION, 800, 300);
|
||||
f.setVisible(true);
|
||||
}
|
||||
|
||||
public abstract Process startClient(Rectangle bounds[], long window);
|
||||
|
||||
public void addClient() {
|
||||
client = new Canvas() {
|
||||
public void paint(Graphics g) {
|
||||
super.paint(g);
|
||||
}
|
||||
};
|
||||
client.setBackground(new Color(30, 220, 40));
|
||||
clientCont.add(client);
|
||||
clientCont.validate();
|
||||
final ComponentAccessor acc = AWTAccessor.getComponentAccessor();
|
||||
WindowIDProvider pid = (WindowIDProvider)acc.getPeer(client);
|
||||
log.fine("Added XEmbed server(Canvas) with X window ID " + pid.getWindow());
|
||||
Rectangle toFocusBounds = toFocus.getBounds();
|
||||
toFocusBounds.setLocation(toFocus.getLocationOnScreen());
|
||||
f.validate();
|
||||
|
||||
// KDE doesn't accept clicks on title as activation - click below title
|
||||
Rectangle fbounds = f.getBounds();
|
||||
fbounds.y += f.getInsets().top;
|
||||
fbounds.height -= f.getInsets().top;
|
||||
|
||||
Process proc = startClient(new Rectangle[] {fbounds, dummy.getBounds(), toFocusBounds,
|
||||
new Rectangle(b_modal.getLocationOnScreen(), b_modal.getSize()),
|
||||
new Rectangle(10, 130, 20, 20)}, pid.getWindow());
|
||||
new ClientWatcher(client, proc, clientCont).start();
|
||||
}
|
||||
|
||||
public void dispose() {
|
||||
f.dispose();
|
||||
f = null;
|
||||
dummy.dispose();
|
||||
dummy = null;
|
||||
if (modal_d != null) {
|
||||
modal_d.dispose();
|
||||
modal_d = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class ClientWatcher extends Thread {
|
||||
private Process clientProcess;
|
||||
private Canvas client;
|
||||
private Container parent;
|
||||
public ClientWatcher(Canvas client, Process proc, Container parent) {
|
||||
this.client = client;
|
||||
this.clientProcess = proc;
|
||||
this.parent = parent;
|
||||
}
|
||||
|
||||
public void run() {
|
||||
try {
|
||||
clientProcess.waitFor();
|
||||
} catch (InterruptedException ie) {
|
||||
}
|
||||
parent.remove(client);
|
||||
}
|
||||
}
|
||||
101
test/jdk/java/awt/xembed/server/TestXEmbedServerJava.java
Normal file
101
test/jdk/java/awt/xembed/server/TestXEmbedServerJava.java
Normal file
|
|
@ -0,0 +1,101 @@
|
|||
/*
|
||||
* Copyright (c) 2004, 2015, 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 4931668
|
||||
* @summary Tests XEmbed server/client functionality
|
||||
* @author denis mikhalkin: area=awt.xembed
|
||||
* @requires (!(os.family=="mac") & !(os.family=="windows"))
|
||||
* @modules java.desktop/sun.awt
|
||||
* @compile JavaClient.java TesterClient.java TestXEmbedServer.java
|
||||
* @run main/manual TestXEmbedServerJava
|
||||
*/
|
||||
|
||||
import java.awt.*;
|
||||
import java.awt.event.*;
|
||||
import javax.swing.*;
|
||||
import java.io.*;
|
||||
|
||||
public class TestXEmbedServerJava extends TestXEmbedServer {
|
||||
public static void main(String[] args) {
|
||||
|
||||
// Enabled XEmbed
|
||||
System.setProperty("sun.awt.xembedserver", "true");
|
||||
|
||||
String instruction =
|
||||
"This is a manual test for XEmbed server functionality. \n" +
|
||||
"You may start XEmbed client by pressing 'Add client' button.\n" +
|
||||
"Check that focus transfer with mouse works, that focus traversal with Tab/Shift-Tab works.\n" +
|
||||
"Check that XEmbed server client's growing and shrinking.\n" +
|
||||
"Check that Drag&Drop works in all combinations.\n" +
|
||||
"Check the keyboard input works in both text fields.\n";
|
||||
Frame f = new Frame("Instructions");
|
||||
f.setLayout(new BorderLayout());
|
||||
f.add(new TextArea(instruction), BorderLayout.CENTER);
|
||||
f.pack();
|
||||
f.setLocation(0, 400);
|
||||
f.setVisible(true);
|
||||
|
||||
TestXEmbedServerJava lock = new TestXEmbedServerJava();
|
||||
try {
|
||||
synchronized(lock) {
|
||||
lock.wait();
|
||||
}
|
||||
} catch (InterruptedException e) {
|
||||
}
|
||||
if (!lock.isPassed()) {
|
||||
throw new RuntimeException("Test failed");
|
||||
}
|
||||
}
|
||||
|
||||
public TestXEmbedServerJava() {
|
||||
super(true);
|
||||
}
|
||||
|
||||
public Process startClient(Rectangle[] bounds, long window) {
|
||||
try {
|
||||
String java_home = System.getProperty("java.home");
|
||||
boolean hasModules = true;
|
||||
try {
|
||||
Class.class.getMethod("getModule");
|
||||
}catch(Exception hasModulesEx) {
|
||||
hasModules = false;
|
||||
}
|
||||
if (hasModules) {
|
||||
System.out.println(java_home +
|
||||
"/bin/java --add-exports java.desktop/sun.awt.X11=ALL-UNNAMED "+
|
||||
"--add-exports java.desktop/sun.awt=ALL-UNNAMED JavaClient " + window);
|
||||
return Runtime.getRuntime().exec(java_home +
|
||||
"/bin/java --add-exports java.desktop/sun.awt.X11=ALL-UNNAMED "+
|
||||
"--add-exports java.desktop/sun.awt=ALL-UNNAMED JavaClient " + window);
|
||||
}else{
|
||||
System.out.println(java_home + "/bin/java JavaClient " + window);
|
||||
return Runtime.getRuntime().exec(java_home + "/bin/java JavaClient " + window);
|
||||
}
|
||||
} catch (IOException ex1) {
|
||||
ex1.printStackTrace();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
60
test/jdk/java/awt/xembed/server/TesterClient.java
Normal file
60
test/jdk/java/awt/xembed/server/TesterClient.java
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
/*
|
||||
* Copyright (c) 2004, 2008, 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.
|
||||
*/
|
||||
|
||||
import java.lang.reflect.*;
|
||||
import java.awt.Rectangle;
|
||||
import java.util.logging.*;
|
||||
|
||||
public class TesterClient {
|
||||
private static final Logger log = Logger.getLogger("test.xembed.TesterClient");
|
||||
private static Method test;
|
||||
private static boolean passed = false;
|
||||
public static void main(String[] args) throws Throwable {
|
||||
// First parameter is the name of the test, second is the window, the rest are rectangles
|
||||
Class cl = Class.forName("sun.awt.X11.XEmbedServerTester");
|
||||
|
||||
test = cl.getMethod(args[0], new Class[0]);
|
||||
long window = Long.parseLong(args[1]);
|
||||
Rectangle r[] = new Rectangle[(args.length-2)/4];
|
||||
for (int i = 0; i < r.length; i++) {
|
||||
r[i] = new Rectangle(Integer.parseInt(args[2+i*4]), Integer.parseInt(args[2+i*4+1]),
|
||||
Integer.parseInt(args[2+i*4+2]), Integer.parseInt(args[2+i*4+3]));
|
||||
}
|
||||
startClient(r, window);
|
||||
}
|
||||
|
||||
public static void startClient(Rectangle bounds[], long window) throws Throwable {
|
||||
Method m_getTester = Class.forName("sun.awt.X11.XEmbedServerTester").
|
||||
getMethod("getTester", new Class[] {bounds.getClass(), Long.TYPE});
|
||||
final Object tester = m_getTester.invoke(null, new Object[] {bounds, window});
|
||||
try {
|
||||
log.info("Starting test " + test.getName());
|
||||
test.invoke(tester, (Object[])null);
|
||||
log.info("Test " + test.getName() + " PASSED.");
|
||||
passed = true;
|
||||
} catch (Exception e) {
|
||||
log.log(Level.WARNING, "Test " + test.getName() + " FAILED.", e);
|
||||
}
|
||||
System.exit(passed?0:1);
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue