# HG changeset patch # User ddhill # Date 1452715845 18000 # Wed Jan 13 15:10:45 2016 -0500 # Node ID a8c0d58ac6bbed5380cb7c3cdb5763df16c0f595 # Parent 45efd3d83bf1d88e46401cfda2dde82561272f39 8145203: Refactor systemTests for clear separation of tests Reviewed-by: kcr diff --git a/build.gradle b/build.gradle --- a/build.gradle +++ b/build.gradle @@ -1786,17 +1786,17 @@ // not pop up any windows or use audio). As such, they are only enabled // when FULL_TEST is specified, and each test runs in its own JVM project(":systemTests") { + + dependencies { + testCompile project(":graphics").sourceSets.test.output + testCompile project(":base").sourceSets.test.output + } + test { enabled = IS_FULL_TEST if (!IS_USE_ROBOT) { // Disable all robot-based visual tests - exclude("**/helloworld/*.*"); - exclude("**/javafx/embed/swing/*.*"); - exclude("**/javafx/scene/layout/*.*"); - exclude("**/test3d/*.*"); - exclude("**/scenegraph/*.*"); - exclude("**/painttest/*.*"); - exclude("**/renderlock/*.*"); + exclude("test/robot/**"); } if (!IS_AWT_TEST) { // Disable all AWT-based tests diff --git a/modules/graphics/src/test/java/com/sun/javafx/application/PlatformImplShim.java b/modules/graphics/src/test/java/com/sun/javafx/application/PlatformImplShim.java new file mode 100644 --- /dev/null +++ b/modules/graphics/src/test/java/com/sun/javafx/application/PlatformImplShim.java @@ -0,0 +1,36 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package com.sun.javafx.application; + +import java.util.concurrent.CountDownLatch; + +public class PlatformImplShim { + + public static CountDownLatch test_getPlatformExitLatch() { + return PlatformImpl.test_getPlatformExitLatch(); + } + +} diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/FramebufferShim.java b/tests/system/src/test/java/com/sun/glass/ui/monocle/FramebufferShim.java new file mode 100644 --- /dev/null +++ b/tests/system/src/test/java/com/sun/glass/ui/monocle/FramebufferShim.java @@ -0,0 +1,51 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package com.sun.glass.ui.monocle; + +import java.nio.Buffer; +import java.nio.ByteBuffer; + +public class FramebufferShim extends Framebuffer { + + + public FramebufferShim(ByteBuffer bb, int width, int height, int depth, boolean clear) { + super(bb, width, height, depth, clear); + } + + @Override + public void composePixels(Buffer src, + int pX, int pY, int pW, int pH, + float alpha) { + super.composePixels(src, pX, pY, pW, pH, alpha); + + } + + @Override + public void reset() { + super.reset(); + } + +} diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/IntSetShim.java b/tests/system/src/test/java/com/sun/glass/ui/monocle/IntSetShim.java new file mode 100644 --- /dev/null +++ b/tests/system/src/test/java/com/sun/glass/ui/monocle/IntSetShim.java @@ -0,0 +1,49 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package com.sun.glass.ui.monocle; + +public class IntSetShim extends IntSet { + + @Override + public void addInt(int value) { + super.addInt(value); + } + + @Override + public int size() { + return super.size(); + } + + @Override + public void removeInt(int value) { + super.removeInt(value); + } + + @Override + public int get(int index) { + return super.get(index); + } +} diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/LinuxInputDeviceRegistryShim.java b/tests/system/src/test/java/com/sun/glass/ui/monocle/LinuxInputDeviceRegistryShim.java new file mode 100644 --- /dev/null +++ b/tests/system/src/test/java/com/sun/glass/ui/monocle/LinuxInputDeviceRegistryShim.java @@ -0,0 +1,102 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ +package com.sun.glass.ui.monocle; + +import java.nio.channels.ReadableByteChannel; +import java.util.BitSet; +import java.util.HashMap; +import java.util.Map; + +public class LinuxInputDeviceRegistryShim { + + private static LinuxInputDeviceRegistry registry + = (LinuxInputDeviceRegistry) NativePlatformFactory.getNativePlatform().getInputDeviceRegistry(); + + public static class LinuxInputDeviceShim { + + LinuxInputDevice device; + + private LinuxInputDeviceShim(LinuxInputDevice d) { + device = d; + } + + public boolean isQuiet() { + return device.isQuiet(); + } + + } + + private static final int INDEX_VALUE = 0; + private static final int INDEX_MIN = 1; + private static final int INDEX_MAX = 2; + private static final int INDEX_FUZZ = 3; + private static final int INDEX_FLAT = 4; + private static final int INDEX_RESOLUTION = 5; + private static final int INDEX_COUNT = 6; + + static Map createAbsCapsMap(Map absCaps) { + Map map + = new HashMap(); + for (Integer axis : absCaps.keySet()) { + int[] a = absCaps.get(axis); + if (a != null) { + LinuxAbsoluteInputCapabilities absCap = new LinuxAbsoluteInputCapabilities( + a[INDEX_VALUE], + a[INDEX_MAX], + a[INDEX_MIN], + a[INDEX_FUZZ], + a[INDEX_FLAT], + a[INDEX_RESOLUTION]); + map.put(axis, absCap); + } + } + return map; + } + + public static LinuxInputDeviceShim addDevice( + Map capabilities, + Map absCaps, + ReadableByteChannel in, + Map udevManifest, + Map uevent, + String name) { + LinuxInputDevice device = new LinuxInputDevice(capabilities, + createAbsCapsMap(absCaps), + in, + udevManifest, + uevent); + + registry.addDevice( + device, + name); + + return new LinuxInputDeviceShim(device); + } + + public static void removeDevice(LinuxInputDeviceShim device) { + registry.removeDevice(device.device); + } + +} diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/LinuxInputShim.java b/tests/system/src/test/java/com/sun/glass/ui/monocle/LinuxInputShim.java new file mode 100644 --- /dev/null +++ b/tests/system/src/test/java/com/sun/glass/ui/monocle/LinuxInputShim.java @@ -0,0 +1,714 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ +package com.sun.glass.ui.monocle; + +import java.util.HashMap; +import java.util.Map; + +public class LinuxInputShim { + + public static final short INPUT_PROP_POINTER = LinuxInput.INPUT_PROP_POINTER; + public static final short INPUT_PROP_DIRECT = LinuxInput.INPUT_PROP_DIRECT; + public static final short INPUT_PROP_BUTTONPAD = LinuxInput.INPUT_PROP_BUTTONPAD; + public static final short INPUT_PROP_SEMI_MT = LinuxInput.INPUT_PROP_SEMI_MT; + public static final short INPUT_PROP_MAX = LinuxInput.INPUT_PROP_MAX; + public static final short INPUT_PROP_CNT = LinuxInput.INPUT_PROP_CNT; + public static final short EV_SYN = LinuxInput.EV_SYN; + public static final short EV_KEY = LinuxInput.EV_KEY; + public static final short EV_REL = LinuxInput.EV_REL; + public static final short EV_ABS = LinuxInput.EV_ABS; + public static final short EV_MSC = LinuxInput.EV_MSC; + public static final short EV_SW = LinuxInput.EV_SW; + public static final short EV_LED = LinuxInput.EV_LED; + public static final short EV_SND = LinuxInput.EV_SND; + public static final short EV_REP = LinuxInput.EV_REP; + public static final short EV_FF = LinuxInput.EV_FF; + public static final short EV_PWR = LinuxInput.EV_PWR; + public static final short EV_FF_STATUS = LinuxInput.EV_FF_STATUS; + public static final short EV_MAX = LinuxInput.EV_MAX; + public static final short EV_CNT = LinuxInput.EV_CNT; + public static final short SYN_REPORT = LinuxInput.SYN_REPORT; + public static final short SYN_CONFIG = LinuxInput.SYN_CONFIG; + public static final short SYN_MT_REPORT = LinuxInput.SYN_MT_REPORT; + public static final short SYN_DROPPED = LinuxInput.SYN_DROPPED; + public static final short KEY_RESERVED = LinuxInput.KEY_RESERVED; + public static final short KEY_ESC = LinuxInput.KEY_ESC; + public static final short KEY_1 = LinuxInput.KEY_1; + public static final short KEY_2 = LinuxInput.KEY_2; + public static final short KEY_3 = LinuxInput.KEY_3; + public static final short KEY_4 = LinuxInput.KEY_4; + public static final short KEY_5 = LinuxInput.KEY_5; + public static final short KEY_6 = LinuxInput.KEY_6; + public static final short KEY_7 = LinuxInput.KEY_7; + public static final short KEY_8 = LinuxInput.KEY_8; + public static final short KEY_9 = LinuxInput.KEY_9; + public static final short KEY_0 = LinuxInput.KEY_0; + public static final short KEY_MINUS = LinuxInput.KEY_MINUS; + public static final short KEY_EQUAL = LinuxInput.KEY_EQUAL; + public static final short KEY_BACKSPACE = LinuxInput.KEY_BACKSPACE; + public static final short KEY_TAB = LinuxInput.KEY_TAB; + public static final short KEY_Q = LinuxInput.KEY_Q; + public static final short KEY_W = LinuxInput.KEY_W; + public static final short KEY_E = LinuxInput.KEY_E; + public static final short KEY_R = LinuxInput.KEY_R; + public static final short KEY_T = LinuxInput.KEY_T; + public static final short KEY_Y = LinuxInput.KEY_Y; + public static final short KEY_U = LinuxInput.KEY_U; + public static final short KEY_I = LinuxInput.KEY_I; + public static final short KEY_O = LinuxInput.KEY_O; + public static final short KEY_P = LinuxInput.KEY_P; + public static final short KEY_LEFTBRACE = LinuxInput.KEY_LEFTBRACE; + public static final short KEY_RIGHTBRACE = LinuxInput.KEY_RIGHTBRACE; + public static final short KEY_ENTER = LinuxInput.KEY_ENTER; + public static final short KEY_LEFTCTRL = LinuxInput.KEY_LEFTCTRL; + public static final short KEY_A = LinuxInput.KEY_A; + public static final short KEY_S = LinuxInput.KEY_S; + public static final short KEY_D = LinuxInput.KEY_D; + public static final short KEY_F = LinuxInput.KEY_F; + public static final short KEY_G = LinuxInput.KEY_G; + public static final short KEY_H = LinuxInput.KEY_H; + public static final short KEY_J = LinuxInput.KEY_J; + public static final short KEY_K = LinuxInput.KEY_K; + public static final short KEY_L = LinuxInput.KEY_L; + public static final short KEY_SEMICOLON = LinuxInput.KEY_SEMICOLON; + public static final short KEY_APOSTROPHE = LinuxInput.KEY_APOSTROPHE; + public static final short KEY_GRAVE = LinuxInput.KEY_GRAVE; + public static final short KEY_LEFTSHIFT = LinuxInput.KEY_LEFTSHIFT; + public static final short KEY_BACKSLASH = LinuxInput.KEY_BACKSLASH; + public static final short KEY_Z = LinuxInput.KEY_Z; + public static final short KEY_X = LinuxInput.KEY_X; + public static final short KEY_C = LinuxInput.KEY_C; + public static final short KEY_V = LinuxInput.KEY_V; + public static final short KEY_B = LinuxInput.KEY_B; + public static final short KEY_N = LinuxInput.KEY_N; + public static final short KEY_M = LinuxInput.KEY_M; + public static final short KEY_COMMA = LinuxInput.KEY_COMMA; + public static final short KEY_DOT = LinuxInput.KEY_DOT; + public static final short KEY_SLASH = LinuxInput.KEY_SLASH; + public static final short KEY_RIGHTSHIFT = LinuxInput.KEY_RIGHTSHIFT; + public static final short KEY_KPASTERISK = LinuxInput.KEY_KPASTERISK; + public static final short KEY_LEFTALT = LinuxInput.KEY_LEFTALT; + public static final short KEY_SPACE = LinuxInput.KEY_SPACE; + public static final short KEY_CAPSLOCK = LinuxInput.KEY_CAPSLOCK; + public static final short KEY_F1 = LinuxInput.KEY_F1; + public static final short KEY_F2 = LinuxInput.KEY_F2; + public static final short KEY_F3 = LinuxInput.KEY_F3; + public static final short KEY_F4 = LinuxInput.KEY_F4; + public static final short KEY_F5 = LinuxInput.KEY_F5; + public static final short KEY_F6 = LinuxInput.KEY_F6; + public static final short KEY_F7 = LinuxInput.KEY_F7; + public static final short KEY_F8 = LinuxInput.KEY_F8; + public static final short KEY_F9 = LinuxInput.KEY_F9; + public static final short KEY_F10 = LinuxInput.KEY_F10; + public static final short KEY_NUMLOCK = LinuxInput.KEY_NUMLOCK; + public static final short KEY_SCROLLLOCK = LinuxInput.KEY_SCROLLLOCK; + public static final short KEY_KP7 = LinuxInput.KEY_KP7; + public static final short KEY_KP8 = LinuxInput.KEY_KP8; + public static final short KEY_KP9 = LinuxInput.KEY_KP9; + public static final short KEY_KPMINUS = LinuxInput.KEY_KPMINUS; + public static final short KEY_KP4 = LinuxInput.KEY_KP4; + public static final short KEY_KP5 = LinuxInput.KEY_KP5; + public static final short KEY_KP6 = LinuxInput.KEY_KP6; + public static final short KEY_KPPLUS = LinuxInput.KEY_KPPLUS; + public static final short KEY_KP1 = LinuxInput.KEY_KP1; + public static final short KEY_KP2 = LinuxInput.KEY_KP2; + public static final short KEY_KP3 = LinuxInput.KEY_KP3; + public static final short KEY_KP0 = LinuxInput.KEY_KP0; + public static final short KEY_KPDOT = LinuxInput.KEY_KPDOT; + public static final short KEY_ZENKAKUHANKAKU = LinuxInput.KEY_ZENKAKUHANKAKU; + public static final short KEY_102ND = LinuxInput.KEY_102ND; + public static final short KEY_F11 = LinuxInput.KEY_F11; + public static final short KEY_F12 = LinuxInput.KEY_F12; + public static final short KEY_RO = LinuxInput.KEY_RO; + public static final short KEY_KATAKANA = LinuxInput.KEY_KATAKANA; + public static final short KEY_HIRAGANA = LinuxInput.KEY_HIRAGANA; + public static final short KEY_HENKAN = LinuxInput.KEY_HENKAN; + public static final short KEY_KATAKANAHIRAGANA = LinuxInput.KEY_KATAKANAHIRAGANA; + public static final short KEY_MUHENKAN = LinuxInput.KEY_MUHENKAN; + public static final short KEY_KPJPCOMMA = LinuxInput.KEY_KPJPCOMMA; + public static final short KEY_KPENTER = LinuxInput.KEY_KPENTER; + public static final short KEY_RIGHTCTRL = LinuxInput.KEY_RIGHTCTRL; + public static final short KEY_KPSLASH = LinuxInput.KEY_KPSLASH; + public static final short KEY_SYSRQ = LinuxInput.KEY_SYSRQ; + public static final short KEY_RIGHTALT = LinuxInput.KEY_RIGHTALT; + public static final short KEY_LINEFEED = LinuxInput.KEY_LINEFEED; + public static final short KEY_HOME = LinuxInput.KEY_HOME; + public static final short KEY_UP = LinuxInput.KEY_UP; + public static final short KEY_PAGEUP = LinuxInput.KEY_PAGEUP; + public static final short KEY_LEFT = LinuxInput.KEY_LEFT; + public static final short KEY_RIGHT = LinuxInput.KEY_RIGHT; + public static final short KEY_END = LinuxInput.KEY_END; + public static final short KEY_DOWN = LinuxInput.KEY_DOWN; + public static final short KEY_PAGEDOWN = LinuxInput.KEY_PAGEDOWN; + public static final short KEY_INSERT = LinuxInput.KEY_INSERT; + public static final short KEY_DELETE = LinuxInput.KEY_DELETE; + public static final short KEY_MACRO = LinuxInput.KEY_MACRO; + public static final short KEY_MUTE = LinuxInput.KEY_MUTE; + public static final short KEY_VOLUMEDOWN = LinuxInput.KEY_VOLUMEDOWN; + public static final short KEY_VOLUMEUP = LinuxInput.KEY_VOLUMEUP; + public static final short KEY_POWER = LinuxInput.KEY_POWER; + public static final short KEY_KPEQUAL = LinuxInput.KEY_KPEQUAL; + public static final short KEY_KPPLUSMINUS = LinuxInput.KEY_KPPLUSMINUS; + public static final short KEY_PAUSE = LinuxInput.KEY_PAUSE; + public static final short KEY_SCALE = LinuxInput.KEY_SCALE; + public static final short KEY_KPCOMMA = LinuxInput.KEY_KPCOMMA; + public static final short KEY_HANGEUL = LinuxInput.KEY_HANGEUL; + public static final short KEY_HANGUEL = LinuxInput.KEY_HANGUEL; + public static final short KEY_HANJA = LinuxInput.KEY_HANJA; + public static final short KEY_YEN = LinuxInput.KEY_YEN; + public static final short KEY_LEFTMETA = LinuxInput.KEY_LEFTMETA; + public static final short KEY_RIGHTMETA = LinuxInput.KEY_RIGHTMETA; + public static final short KEY_COMPOSE = LinuxInput.KEY_COMPOSE; + public static final short KEY_STOP = LinuxInput.KEY_STOP; + public static final short KEY_AGAIN = LinuxInput.KEY_AGAIN; + public static final short KEY_PROPS = LinuxInput.KEY_PROPS; + public static final short KEY_UNDO = LinuxInput.KEY_UNDO; + public static final short KEY_FRONT = LinuxInput.KEY_FRONT; + public static final short KEY_COPY = LinuxInput.KEY_COPY; + public static final short KEY_OPEN = LinuxInput.KEY_OPEN; + public static final short KEY_PASTE = LinuxInput.KEY_PASTE; + public static final short KEY_FIND = LinuxInput.KEY_FIND; + public static final short KEY_CUT = LinuxInput.KEY_CUT; + public static final short KEY_HELP = LinuxInput.KEY_HELP; + public static final short KEY_MENU = LinuxInput.KEY_MENU; + public static final short KEY_CALC = LinuxInput.KEY_CALC; + public static final short KEY_SETUP = LinuxInput.KEY_SETUP; + public static final short KEY_SLEEP = LinuxInput.KEY_SLEEP; + public static final short KEY_WAKEUP = LinuxInput.KEY_WAKEUP; + public static final short KEY_FILE = LinuxInput.KEY_FILE; + public static final short KEY_SENDFILE = LinuxInput.KEY_SENDFILE; + public static final short KEY_DELETEFILE = LinuxInput.KEY_DELETEFILE; + public static final short KEY_XFER = LinuxInput.KEY_XFER; + public static final short KEY_PROG1 = LinuxInput.KEY_PROG1; + public static final short KEY_PROG2 = LinuxInput.KEY_PROG2; + public static final short KEY_WWW = LinuxInput.KEY_WWW; + public static final short KEY_MSDOS = LinuxInput.KEY_MSDOS; + public static final short KEY_COFFEE = LinuxInput.KEY_COFFEE; + public static final short KEY_SCREENLOCK = LinuxInput.KEY_SCREENLOCK; + public static final short KEY_DIRECTION = LinuxInput.KEY_DIRECTION; + public static final short KEY_CYCLEWINDOWS = LinuxInput.KEY_CYCLEWINDOWS; + public static final short KEY_MAIL = LinuxInput.KEY_MAIL; + public static final short KEY_BOOKMARKS = LinuxInput.KEY_BOOKMARKS; + public static final short KEY_COMPUTER = LinuxInput.KEY_COMPUTER; + public static final short KEY_BACK = LinuxInput.KEY_BACK; + public static final short KEY_FORWARD = LinuxInput.KEY_FORWARD; + public static final short KEY_CLOSECD = LinuxInput.KEY_CLOSECD; + public static final short KEY_EJECTCD = LinuxInput.KEY_EJECTCD; + public static final short KEY_EJECTCLOSECD = LinuxInput.KEY_EJECTCLOSECD; + public static final short KEY_NEXTSONG = LinuxInput.KEY_NEXTSONG; + public static final short KEY_PLAYPAUSE = LinuxInput.KEY_PLAYPAUSE; + public static final short KEY_PREVIOUSSONG = LinuxInput.KEY_PREVIOUSSONG; + public static final short KEY_STOPCD = LinuxInput.KEY_STOPCD; + public static final short KEY_RECORD = LinuxInput.KEY_RECORD; + public static final short KEY_REWIND = LinuxInput.KEY_REWIND; + public static final short KEY_PHONE = LinuxInput.KEY_PHONE; + public static final short KEY_ISO = LinuxInput.KEY_ISO; + public static final short KEY_CONFIG = LinuxInput.KEY_CONFIG; + public static final short KEY_HOMEPAGE = LinuxInput.KEY_HOMEPAGE; + public static final short KEY_REFRESH = LinuxInput.KEY_REFRESH; + public static final short KEY_EXIT = LinuxInput.KEY_EXIT; + public static final short KEY_MOVE = LinuxInput.KEY_MOVE; + public static final short KEY_EDIT = LinuxInput.KEY_EDIT; + public static final short KEY_SCROLLUP = LinuxInput.KEY_SCROLLUP; + public static final short KEY_SCROLLDOWN = LinuxInput.KEY_SCROLLDOWN; + public static final short KEY_KPLEFTPAREN = LinuxInput.KEY_KPLEFTPAREN; + public static final short KEY_KPRIGHTPAREN = LinuxInput.KEY_KPRIGHTPAREN; + public static final short KEY_NEW = LinuxInput.KEY_NEW; + public static final short KEY_REDO = LinuxInput.KEY_REDO; + public static final short KEY_F13 = LinuxInput.KEY_F13; + public static final short KEY_F14 = LinuxInput.KEY_F14; + public static final short KEY_F15 = LinuxInput.KEY_F15; + public static final short KEY_F16 = LinuxInput.KEY_F16; + public static final short KEY_F17 = LinuxInput.KEY_F17; + public static final short KEY_F18 = LinuxInput.KEY_F18; + public static final short KEY_F19 = LinuxInput.KEY_F19; + public static final short KEY_F20 = LinuxInput.KEY_F20; + public static final short KEY_F21 = LinuxInput.KEY_F21; + public static final short KEY_F22 = LinuxInput.KEY_F22; + public static final short KEY_F23 = LinuxInput.KEY_F23; + public static final short KEY_F24 = LinuxInput.KEY_F24; + public static final short KEY_PLAYCD = LinuxInput.KEY_PLAYCD; + public static final short KEY_PAUSECD = LinuxInput.KEY_PAUSECD; + public static final short KEY_PROG3 = LinuxInput.KEY_PROG3; + public static final short KEY_PROG4 = LinuxInput.KEY_PROG4; + public static final short KEY_DASHBOARD = LinuxInput.KEY_DASHBOARD; + public static final short KEY_SUSPEND = LinuxInput.KEY_SUSPEND; + public static final short KEY_CLOSE = LinuxInput.KEY_CLOSE; + public static final short KEY_PLAY = LinuxInput.KEY_PLAY; + public static final short KEY_FASTFORWARD = LinuxInput.KEY_FASTFORWARD; + public static final short KEY_BASSBOOST = LinuxInput.KEY_BASSBOOST; + public static final short KEY_PRINT = LinuxInput.KEY_PRINT; + public static final short KEY_HP = LinuxInput.KEY_HP; + public static final short KEY_CAMERA = LinuxInput.KEY_CAMERA; + public static final short KEY_SOUND = LinuxInput.KEY_SOUND; + public static final short KEY_QUESTION = LinuxInput.KEY_QUESTION; + public static final short KEY_EMAIL = LinuxInput.KEY_EMAIL; + public static final short KEY_CHAT = LinuxInput.KEY_CHAT; + public static final short KEY_SEARCH = LinuxInput.KEY_SEARCH; + public static final short KEY_CONNECT = LinuxInput.KEY_CONNECT; + public static final short KEY_FINANCE = LinuxInput.KEY_FINANCE; + public static final short KEY_SPORT = LinuxInput.KEY_SPORT; + public static final short KEY_SHOP = LinuxInput.KEY_SHOP; + public static final short KEY_ALTERASE = LinuxInput.KEY_ALTERASE; + public static final short KEY_CANCEL = LinuxInput.KEY_CANCEL; + public static final short KEY_BRIGHTNESSDOWN = LinuxInput.KEY_BRIGHTNESSDOWN; + public static final short KEY_BRIGHTNESSUP = LinuxInput.KEY_BRIGHTNESSUP; + public static final short KEY_MEDIA = LinuxInput.KEY_MEDIA; + public static final short KEY_SWITCHVIDEOMODE = LinuxInput.KEY_SWITCHVIDEOMODE; + public static final short KEY_KBDILLUMTOGGLE = LinuxInput.KEY_KBDILLUMTOGGLE; + public static final short KEY_KBDILLUMDOWN = LinuxInput.KEY_KBDILLUMDOWN; + public static final short KEY_KBDILLUMUP = LinuxInput.KEY_KBDILLUMUP; + public static final short KEY_SEND = LinuxInput.KEY_SEND; + public static final short KEY_REPLY = LinuxInput.KEY_REPLY; + public static final short KEY_FORWARDMAIL = LinuxInput.KEY_FORWARDMAIL; + public static final short KEY_SAVE = LinuxInput.KEY_SAVE; + public static final short KEY_DOCUMENTS = LinuxInput.KEY_DOCUMENTS; + public static final short KEY_BATTERY = LinuxInput.KEY_BATTERY; + public static final short KEY_BLUETOOTH = LinuxInput.KEY_BLUETOOTH; + public static final short KEY_WLAN = LinuxInput.KEY_WLAN; + public static final short KEY_UWB = LinuxInput.KEY_UWB; + public static final short KEY_UNKNOWN = LinuxInput.KEY_UNKNOWN; + public static final short KEY_VIDEO_NEXT = LinuxInput.KEY_VIDEO_NEXT; + public static final short KEY_VIDEO_PREV = LinuxInput.KEY_VIDEO_PREV; + public static final short KEY_BRIGHTNESS_CYCLE = LinuxInput.KEY_BRIGHTNESS_CYCLE; + public static final short KEY_BRIGHTNESS_ZERO = LinuxInput.KEY_BRIGHTNESS_ZERO; + public static final short KEY_DISPLAY_OFF = LinuxInput.KEY_DISPLAY_OFF; + public static final short KEY_WIMAX = LinuxInput.KEY_WIMAX; + public static final short KEY_RFKILL = LinuxInput.KEY_RFKILL; + public static final short KEY_MICMUTE = LinuxInput.KEY_MICMUTE; + public static final short BTN_MISC = LinuxInput.BTN_MISC; + public static final short BTN_0 = LinuxInput.BTN_0; + public static final short BTN_1 = LinuxInput.BTN_1; + public static final short BTN_2 = LinuxInput.BTN_2; + public static final short BTN_3 = LinuxInput.BTN_3; + public static final short BTN_4 = LinuxInput.BTN_4; + public static final short BTN_5 = LinuxInput.BTN_5; + public static final short BTN_6 = LinuxInput.BTN_6; + public static final short BTN_7 = LinuxInput.BTN_7; + public static final short BTN_8 = LinuxInput.BTN_8; + public static final short BTN_9 = LinuxInput.BTN_9; + public static final short BTN_MOUSE = LinuxInput.BTN_MOUSE; + public static final short BTN_LEFT = LinuxInput.BTN_LEFT; + public static final short BTN_RIGHT = LinuxInput.BTN_RIGHT; + public static final short BTN_MIDDLE = LinuxInput.BTN_MIDDLE; + public static final short BTN_SIDE = LinuxInput.BTN_SIDE; + public static final short BTN_EXTRA = LinuxInput.BTN_EXTRA; + public static final short BTN_FORWARD = LinuxInput.BTN_FORWARD; + public static final short BTN_BACK = LinuxInput.BTN_BACK; + public static final short BTN_TASK = LinuxInput.BTN_TASK; + public static final short BTN_JOYSTICK = LinuxInput.BTN_JOYSTICK; + public static final short BTN_TRIGGER = LinuxInput.BTN_TRIGGER; + public static final short BTN_THUMB = LinuxInput.BTN_THUMB; + public static final short BTN_THUMB2 = LinuxInput.BTN_THUMB2; + public static final short BTN_TOP = LinuxInput.BTN_TOP; + public static final short BTN_TOP2 = LinuxInput.BTN_TOP2; + public static final short BTN_PINKIE = LinuxInput.BTN_PINKIE; + public static final short BTN_BASE = LinuxInput.BTN_BASE; + public static final short BTN_BASE2 = LinuxInput.BTN_BASE2; + public static final short BTN_BASE3 = LinuxInput.BTN_BASE3; + public static final short BTN_BASE4 = LinuxInput.BTN_BASE4; + public static final short BTN_BASE5 = LinuxInput.BTN_BASE5; + public static final short BTN_BASE6 = LinuxInput.BTN_BASE6; + public static final short BTN_DEAD = LinuxInput.BTN_DEAD; + public static final short BTN_GAMEPAD = LinuxInput.BTN_GAMEPAD; + public static final short BTN_A = LinuxInput.BTN_A; + public static final short BTN_B = LinuxInput.BTN_B; + public static final short BTN_C = LinuxInput.BTN_C; + public static final short BTN_X = LinuxInput.BTN_X; + public static final short BTN_Y = LinuxInput.BTN_Y; + public static final short BTN_Z = LinuxInput.BTN_Z; + public static final short BTN_TL = LinuxInput.BTN_TL; + public static final short BTN_TR = LinuxInput.BTN_TR; + public static final short BTN_TL2 = LinuxInput.BTN_TL2; + public static final short BTN_TR2 = LinuxInput.BTN_TR2; + public static final short BTN_SELECT = LinuxInput.BTN_SELECT; + public static final short BTN_START = LinuxInput.BTN_START; + public static final short BTN_MODE = LinuxInput.BTN_MODE; + public static final short BTN_THUMBL = LinuxInput.BTN_THUMBL; + public static final short BTN_THUMBR = LinuxInput.BTN_THUMBR; + public static final short BTN_DIGI = LinuxInput.BTN_DIGI; + public static final short BTN_TOOL_PEN = LinuxInput.BTN_TOOL_PEN; + public static final short BTN_TOOL_RUBBER = LinuxInput.BTN_TOOL_RUBBER; + public static final short BTN_TOOL_BRUSH = LinuxInput.BTN_TOOL_BRUSH; + public static final short BTN_TOOL_PENCIL = LinuxInput.BTN_TOOL_PENCIL; + public static final short BTN_TOOL_AIRBRUSH = LinuxInput.BTN_TOOL_AIRBRUSH; + public static final short BTN_TOOL_FINGER = LinuxInput.BTN_TOOL_FINGER; + public static final short BTN_TOOL_MOUSE = LinuxInput.BTN_TOOL_MOUSE; + public static final short BTN_TOOL_LENS = LinuxInput.BTN_TOOL_LENS; + public static final short BTN_TOOL_QUINTTAP = LinuxInput.BTN_TOOL_QUINTTAP; + public static final short BTN_TOUCH = LinuxInput.BTN_TOUCH; + public static final short BTN_STYLUS = LinuxInput.BTN_STYLUS; + public static final short BTN_STYLUS2 = LinuxInput.BTN_STYLUS2; + public static final short BTN_TOOL_DOUBLETAP = LinuxInput.BTN_TOOL_DOUBLETAP; + public static final short BTN_TOOL_TRIPLETAP = LinuxInput.BTN_TOOL_TRIPLETAP; + public static final short BTN_TOOL_QUADTAP = LinuxInput.BTN_TOOL_QUADTAP; + public static final short BTN_WHEEL = LinuxInput.BTN_WHEEL; + public static final short BTN_GEAR_DOWN = LinuxInput.BTN_GEAR_DOWN; + public static final short BTN_GEAR_UP = LinuxInput.BTN_GEAR_UP; + public static final short KEY_OK = LinuxInput.KEY_OK; + public static final short KEY_SELECT = LinuxInput.KEY_SELECT; + public static final short KEY_GOTO = LinuxInput.KEY_GOTO; + public static final short KEY_CLEAR = LinuxInput.KEY_CLEAR; + public static final short KEY_POWER2 = LinuxInput.KEY_POWER2; + public static final short KEY_OPTION = LinuxInput.KEY_OPTION; + public static final short KEY_INFO = LinuxInput.KEY_INFO; + public static final short KEY_TIME = LinuxInput.KEY_TIME; + public static final short KEY_VENDOR = LinuxInput.KEY_VENDOR; + public static final short KEY_ARCHIVE = LinuxInput.KEY_ARCHIVE; + public static final short KEY_PROGRAM = LinuxInput.KEY_PROGRAM; + public static final short KEY_CHANNEL = LinuxInput.KEY_CHANNEL; + public static final short KEY_FAVORITES = LinuxInput.KEY_FAVORITES; + public static final short KEY_EPG = LinuxInput.KEY_EPG; + public static final short KEY_PVR = LinuxInput.KEY_PVR; + public static final short KEY_MHP = LinuxInput.KEY_MHP; + public static final short KEY_LANGUAGE = LinuxInput.KEY_LANGUAGE; + public static final short KEY_TITLE = LinuxInput.KEY_TITLE; + public static final short KEY_SUBTITLE = LinuxInput.KEY_SUBTITLE; + public static final short KEY_ANGLE = LinuxInput.KEY_ANGLE; + public static final short KEY_ZOOM = LinuxInput.KEY_ZOOM; + public static final short KEY_MODE = LinuxInput.KEY_MODE; + public static final short KEY_KEYBOARD = LinuxInput.KEY_KEYBOARD; + public static final short KEY_SCREEN = LinuxInput.KEY_SCREEN; + public static final short KEY_PC = LinuxInput.KEY_PC; + public static final short KEY_TV = LinuxInput.KEY_TV; + public static final short KEY_TV2 = LinuxInput.KEY_TV2; + public static final short KEY_VCR = LinuxInput.KEY_VCR; + public static final short KEY_VCR2 = LinuxInput.KEY_VCR2; + public static final short KEY_SAT = LinuxInput.KEY_SAT; + public static final short KEY_SAT2 = LinuxInput.KEY_SAT2; + public static final short KEY_CD = LinuxInput.KEY_CD; + public static final short KEY_TAPE = LinuxInput.KEY_TAPE; + public static final short KEY_RADIO = LinuxInput.KEY_RADIO; + public static final short KEY_TUNER = LinuxInput.KEY_TUNER; + public static final short KEY_PLAYER = LinuxInput.KEY_PLAYER; + public static final short KEY_TEXT = LinuxInput.KEY_TEXT; + public static final short KEY_DVD = LinuxInput.KEY_DVD; + public static final short KEY_AUX = LinuxInput.KEY_AUX; + public static final short KEY_MP3 = LinuxInput.KEY_MP3; + public static final short KEY_AUDIO = LinuxInput.KEY_AUDIO; + public static final short KEY_VIDEO = LinuxInput.KEY_VIDEO; + public static final short KEY_DIRECTORY = LinuxInput.KEY_DIRECTORY; + public static final short KEY_LIST = LinuxInput.KEY_LIST; + public static final short KEY_MEMO = LinuxInput.KEY_MEMO; + public static final short KEY_CALENDAR = LinuxInput.KEY_CALENDAR; + public static final short KEY_RED = LinuxInput.KEY_RED; + public static final short KEY_GREEN = LinuxInput.KEY_GREEN; + public static final short KEY_YELLOW = LinuxInput.KEY_YELLOW; + public static final short KEY_BLUE = LinuxInput.KEY_BLUE; + public static final short KEY_CHANNELUP = LinuxInput.KEY_CHANNELUP; + public static final short KEY_CHANNELDOWN = LinuxInput.KEY_CHANNELDOWN; + public static final short KEY_FIRST = LinuxInput.KEY_FIRST; + public static final short KEY_LAST = LinuxInput.KEY_LAST; + public static final short KEY_AB = LinuxInput.KEY_AB; + public static final short KEY_NEXT = LinuxInput.KEY_NEXT; + public static final short KEY_RESTART = LinuxInput.KEY_RESTART; + public static final short KEY_SLOW = LinuxInput.KEY_SLOW; + public static final short KEY_SHUFFLE = LinuxInput.KEY_SHUFFLE; + public static final short KEY_BREAK = LinuxInput.KEY_BREAK; + public static final short KEY_PREVIOUS = LinuxInput.KEY_PREVIOUS; + public static final short KEY_DIGITS = LinuxInput.KEY_DIGITS; + public static final short KEY_TEEN = LinuxInput.KEY_TEEN; + public static final short KEY_TWEN = LinuxInput.KEY_TWEN; + public static final short KEY_VIDEOPHONE = LinuxInput.KEY_VIDEOPHONE; + public static final short KEY_GAMES = LinuxInput.KEY_GAMES; + public static final short KEY_ZOOMIN = LinuxInput.KEY_ZOOMIN; + public static final short KEY_ZOOMOUT = LinuxInput.KEY_ZOOMOUT; + public static final short KEY_ZOOMRESET = LinuxInput.KEY_ZOOMRESET; + public static final short KEY_WORDPROCESSOR = LinuxInput.KEY_WORDPROCESSOR; + public static final short KEY_EDITOR = LinuxInput.KEY_EDITOR; + public static final short KEY_SPREADSHEET = LinuxInput.KEY_SPREADSHEET; + public static final short KEY_GRAPHICSEDITOR = LinuxInput.KEY_GRAPHICSEDITOR; + public static final short KEY_PRESENTATION = LinuxInput.KEY_PRESENTATION; + public static final short KEY_DATABASE = LinuxInput.KEY_DATABASE; + public static final short KEY_NEWS = LinuxInput.KEY_NEWS; + public static final short KEY_VOICEMAIL = LinuxInput.KEY_VOICEMAIL; + public static final short KEY_ADDRESSBOOK = LinuxInput.KEY_ADDRESSBOOK; + public static final short KEY_MESSENGER = LinuxInput.KEY_MESSENGER; + public static final short KEY_DISPLAYTOGGLE = LinuxInput.KEY_DISPLAYTOGGLE; + public static final short KEY_SPELLCHECK = LinuxInput.KEY_SPELLCHECK; + public static final short KEY_LOGOFF = LinuxInput.KEY_LOGOFF; + public static final short KEY_DOLLAR = LinuxInput.KEY_DOLLAR; + public static final short KEY_EURO = LinuxInput.KEY_EURO; + public static final short KEY_FRAMEBACK = LinuxInput.KEY_FRAMEBACK; + public static final short KEY_FRAMEFORWARD = LinuxInput.KEY_FRAMEFORWARD; + public static final short KEY_CONTEXT_MENU = LinuxInput.KEY_CONTEXT_MENU; + public static final short KEY_MEDIA_REPEAT = LinuxInput.KEY_MEDIA_REPEAT; + public static final short KEY_10CHANNELSUP = LinuxInput.KEY_10CHANNELSUP; + public static final short KEY_10CHANNELSDOWN = LinuxInput.KEY_10CHANNELSDOWN; + public static final short KEY_IMAGES = LinuxInput.KEY_IMAGES; + public static final short KEY_DEL_EOL = LinuxInput.KEY_DEL_EOL; + public static final short KEY_DEL_EOS = LinuxInput.KEY_DEL_EOS; + public static final short KEY_INS_LINE = LinuxInput.KEY_INS_LINE; + public static final short KEY_DEL_LINE = LinuxInput.KEY_DEL_LINE; + public static final short KEY_FN = LinuxInput.KEY_FN; + public static final short KEY_FN_ESC = LinuxInput.KEY_FN_ESC; + public static final short KEY_FN_F1 = LinuxInput.KEY_FN_F1; + public static final short KEY_FN_F2 = LinuxInput.KEY_FN_F2; + public static final short KEY_FN_F3 = LinuxInput.KEY_FN_F3; + public static final short KEY_FN_F4 = LinuxInput.KEY_FN_F4; + public static final short KEY_FN_F5 = LinuxInput.KEY_FN_F5; + public static final short KEY_FN_F6 = LinuxInput.KEY_FN_F6; + public static final short KEY_FN_F7 = LinuxInput.KEY_FN_F7; + public static final short KEY_FN_F8 = LinuxInput.KEY_FN_F8; + public static final short KEY_FN_F9 = LinuxInput.KEY_FN_F9; + public static final short KEY_FN_F10 = LinuxInput.KEY_FN_F10; + public static final short KEY_FN_F11 = LinuxInput.KEY_FN_F11; + public static final short KEY_FN_F12 = LinuxInput.KEY_FN_F12; + public static final short KEY_FN_1 = LinuxInput.KEY_FN_1; + public static final short KEY_FN_2 = LinuxInput.KEY_FN_2; + public static final short KEY_FN_D = LinuxInput.KEY_FN_D; + public static final short KEY_FN_E = LinuxInput.KEY_FN_E; + public static final short KEY_FN_F = LinuxInput.KEY_FN_F; + public static final short KEY_FN_S = LinuxInput.KEY_FN_S; + public static final short KEY_FN_B = LinuxInput.KEY_FN_B; + public static final short KEY_BRL_DOT1 = LinuxInput.KEY_BRL_DOT1; + public static final short KEY_BRL_DOT2 = LinuxInput.KEY_BRL_DOT2; + public static final short KEY_BRL_DOT3 = LinuxInput.KEY_BRL_DOT3; + public static final short KEY_BRL_DOT4 = LinuxInput.KEY_BRL_DOT4; + public static final short KEY_BRL_DOT5 = LinuxInput.KEY_BRL_DOT5; + public static final short KEY_BRL_DOT6 = LinuxInput.KEY_BRL_DOT6; + public static final short KEY_BRL_DOT7 = LinuxInput.KEY_BRL_DOT7; + public static final short KEY_BRL_DOT8 = LinuxInput.KEY_BRL_DOT8; + public static final short KEY_BRL_DOT9 = LinuxInput.KEY_BRL_DOT9; + public static final short KEY_BRL_DOT10 = LinuxInput.KEY_BRL_DOT10; + public static final short KEY_NUMERIC_0 = LinuxInput.KEY_NUMERIC_0; + public static final short KEY_NUMERIC_1 = LinuxInput.KEY_NUMERIC_1; + public static final short KEY_NUMERIC_2 = LinuxInput.KEY_NUMERIC_2; + public static final short KEY_NUMERIC_3 = LinuxInput.KEY_NUMERIC_3; + public static final short KEY_NUMERIC_4 = LinuxInput.KEY_NUMERIC_4; + public static final short KEY_NUMERIC_5 = LinuxInput.KEY_NUMERIC_5; + public static final short KEY_NUMERIC_6 = LinuxInput.KEY_NUMERIC_6; + public static final short KEY_NUMERIC_7 = LinuxInput.KEY_NUMERIC_7; + public static final short KEY_NUMERIC_8 = LinuxInput.KEY_NUMERIC_8; + public static final short KEY_NUMERIC_9 = LinuxInput.KEY_NUMERIC_9; + public static final short KEY_NUMERIC_STAR = LinuxInput.KEY_NUMERIC_STAR; + public static final short KEY_NUMERIC_POUND = LinuxInput.KEY_NUMERIC_POUND; + public static final short KEY_CAMERA_FOCUS = LinuxInput.KEY_CAMERA_FOCUS; + public static final short KEY_WPS_BUTTON = LinuxInput.KEY_WPS_BUTTON; + public static final short KEY_TOUCHPAD_TOGGLE = LinuxInput.KEY_TOUCHPAD_TOGGLE; + public static final short KEY_TOUCHPAD_ON = LinuxInput.KEY_TOUCHPAD_ON; + public static final short KEY_TOUCHPAD_OFF = LinuxInput.KEY_TOUCHPAD_OFF; + public static final short KEY_CAMERA_ZOOMIN = LinuxInput.KEY_CAMERA_ZOOMIN; + public static final short KEY_CAMERA_ZOOMOUT = LinuxInput.KEY_CAMERA_ZOOMOUT; + public static final short KEY_CAMERA_UP = LinuxInput.KEY_CAMERA_UP; + public static final short KEY_CAMERA_DOWN = LinuxInput.KEY_CAMERA_DOWN; + public static final short KEY_CAMERA_LEFT = LinuxInput.KEY_CAMERA_LEFT; + public static final short KEY_CAMERA_RIGHT = LinuxInput.KEY_CAMERA_RIGHT; + public static final short BTN_TRIGGER_HAPPY = LinuxInput.BTN_TRIGGER_HAPPY; + public static final short BTN_TRIGGER_HAPPY1 = LinuxInput.BTN_TRIGGER_HAPPY1; + public static final short BTN_TRIGGER_HAPPY2 = LinuxInput.BTN_TRIGGER_HAPPY2; + public static final short BTN_TRIGGER_HAPPY3 = LinuxInput.BTN_TRIGGER_HAPPY3; + public static final short BTN_TRIGGER_HAPPY4 = LinuxInput.BTN_TRIGGER_HAPPY4; + public static final short BTN_TRIGGER_HAPPY5 = LinuxInput.BTN_TRIGGER_HAPPY5; + public static final short BTN_TRIGGER_HAPPY6 = LinuxInput.BTN_TRIGGER_HAPPY6; + public static final short BTN_TRIGGER_HAPPY7 = LinuxInput.BTN_TRIGGER_HAPPY7; + public static final short BTN_TRIGGER_HAPPY8 = LinuxInput.BTN_TRIGGER_HAPPY8; + public static final short BTN_TRIGGER_HAPPY9 = LinuxInput.BTN_TRIGGER_HAPPY9; + public static final short BTN_TRIGGER_HAPPY10 = LinuxInput.BTN_TRIGGER_HAPPY10; + public static final short BTN_TRIGGER_HAPPY11 = LinuxInput.BTN_TRIGGER_HAPPY11; + public static final short BTN_TRIGGER_HAPPY12 = LinuxInput.BTN_TRIGGER_HAPPY12; + public static final short BTN_TRIGGER_HAPPY13 = LinuxInput.BTN_TRIGGER_HAPPY13; + public static final short BTN_TRIGGER_HAPPY14 = LinuxInput.BTN_TRIGGER_HAPPY14; + public static final short BTN_TRIGGER_HAPPY15 = LinuxInput.BTN_TRIGGER_HAPPY15; + public static final short BTN_TRIGGER_HAPPY16 = LinuxInput.BTN_TRIGGER_HAPPY16; + public static final short BTN_TRIGGER_HAPPY17 = LinuxInput.BTN_TRIGGER_HAPPY17; + public static final short BTN_TRIGGER_HAPPY18 = LinuxInput.BTN_TRIGGER_HAPPY18; + public static final short BTN_TRIGGER_HAPPY19 = LinuxInput.BTN_TRIGGER_HAPPY19; + public static final short BTN_TRIGGER_HAPPY20 = LinuxInput.BTN_TRIGGER_HAPPY20; + public static final short BTN_TRIGGER_HAPPY21 = LinuxInput.BTN_TRIGGER_HAPPY21; + public static final short BTN_TRIGGER_HAPPY22 = LinuxInput.BTN_TRIGGER_HAPPY22; + public static final short BTN_TRIGGER_HAPPY23 = LinuxInput.BTN_TRIGGER_HAPPY23; + public static final short BTN_TRIGGER_HAPPY24 = LinuxInput.BTN_TRIGGER_HAPPY24; + public static final short BTN_TRIGGER_HAPPY25 = LinuxInput.BTN_TRIGGER_HAPPY25; + public static final short BTN_TRIGGER_HAPPY26 = LinuxInput.BTN_TRIGGER_HAPPY26; + public static final short BTN_TRIGGER_HAPPY27 = LinuxInput.BTN_TRIGGER_HAPPY27; + public static final short BTN_TRIGGER_HAPPY28 = LinuxInput.BTN_TRIGGER_HAPPY28; + public static final short BTN_TRIGGER_HAPPY29 = LinuxInput.BTN_TRIGGER_HAPPY29; + public static final short BTN_TRIGGER_HAPPY30 = LinuxInput.BTN_TRIGGER_HAPPY30; + public static final short BTN_TRIGGER_HAPPY31 = LinuxInput.BTN_TRIGGER_HAPPY31; + public static final short BTN_TRIGGER_HAPPY32 = LinuxInput.BTN_TRIGGER_HAPPY32; + public static final short BTN_TRIGGER_HAPPY33 = LinuxInput.BTN_TRIGGER_HAPPY33; + public static final short BTN_TRIGGER_HAPPY34 = LinuxInput.BTN_TRIGGER_HAPPY34; + public static final short BTN_TRIGGER_HAPPY35 = LinuxInput.BTN_TRIGGER_HAPPY35; + public static final short BTN_TRIGGER_HAPPY36 = LinuxInput.BTN_TRIGGER_HAPPY36; + public static final short BTN_TRIGGER_HAPPY37 = LinuxInput.BTN_TRIGGER_HAPPY37; + public static final short BTN_TRIGGER_HAPPY38 = LinuxInput.BTN_TRIGGER_HAPPY38; + public static final short BTN_TRIGGER_HAPPY39 = LinuxInput.BTN_TRIGGER_HAPPY39; + public static final short BTN_TRIGGER_HAPPY40 = LinuxInput.BTN_TRIGGER_HAPPY40; + public static final short KEY_MIN_INTERESTING = LinuxInput.KEY_MIN_INTERESTING; + public static final short KEY_MAX = LinuxInput.KEY_MAX; + public static final short KEY_CNT = LinuxInput.KEY_CNT; + public static final short REL_X = LinuxInput.REL_X; + public static final short REL_Y = LinuxInput.REL_Y; + public static final short REL_Z = LinuxInput.REL_Z; + public static final short REL_RX = LinuxInput.REL_RX; + public static final short REL_RY = LinuxInput.REL_RY; + public static final short REL_RZ = LinuxInput.REL_RZ; + public static final short REL_HWHEEL = LinuxInput.REL_HWHEEL; + public static final short REL_DIAL = LinuxInput.REL_DIAL; + public static final short REL_WHEEL = LinuxInput.REL_WHEEL; + public static final short REL_MISC = LinuxInput.REL_MISC; + public static final short REL_MAX = LinuxInput.REL_MAX; + public static final short REL_CNT = LinuxInput.REL_CNT; + public static final short ABS_X = LinuxInput.ABS_X; + public static final short ABS_Y = LinuxInput.ABS_Y; + public static final short ABS_Z = LinuxInput.ABS_Z; + public static final short ABS_RX = LinuxInput.ABS_RX; + public static final short ABS_RY = LinuxInput.ABS_RY; + public static final short ABS_RZ = LinuxInput.ABS_RZ; + public static final short ABS_THROTTLE = LinuxInput.ABS_THROTTLE; + public static final short ABS_RUDDER = LinuxInput.ABS_RUDDER; + public static final short ABS_WHEEL = LinuxInput.ABS_WHEEL; + public static final short ABS_GAS = LinuxInput.ABS_GAS; + public static final short ABS_BRAKE = LinuxInput.ABS_BRAKE; + public static final short ABS_HAT0X = LinuxInput.ABS_HAT0X; + public static final short ABS_HAT0Y = LinuxInput.ABS_HAT0Y; + public static final short ABS_HAT1X = LinuxInput.ABS_HAT1X; + public static final short ABS_HAT1Y = LinuxInput.ABS_HAT1Y; + public static final short ABS_HAT2X = LinuxInput.ABS_HAT2X; + public static final short ABS_HAT2Y = LinuxInput.ABS_HAT2Y; + public static final short ABS_HAT3X = LinuxInput.ABS_HAT3X; + public static final short ABS_HAT3Y = LinuxInput.ABS_HAT3Y; + public static final short ABS_PRESSURE = LinuxInput.ABS_PRESSURE; + public static final short ABS_DISTANCE = LinuxInput.ABS_DISTANCE; + public static final short ABS_TILT_X = LinuxInput.ABS_TILT_X; + public static final short ABS_TILT_Y = LinuxInput.ABS_TILT_Y; + public static final short ABS_TOOL_WIDTH = LinuxInput.ABS_TOOL_WIDTH; + public static final short ABS_VOLUME = LinuxInput.ABS_VOLUME; + public static final short ABS_MISC = LinuxInput.ABS_MISC; + public static final short ABS_MT_SLOT = LinuxInput.ABS_MT_SLOT; + public static final short ABS_MT_TOUCH_MAJOR = LinuxInput.ABS_MT_TOUCH_MAJOR; + public static final short ABS_MT_TOUCH_MINOR = LinuxInput.ABS_MT_TOUCH_MINOR; + public static final short ABS_MT_WIDTH_MAJOR = LinuxInput.ABS_MT_WIDTH_MAJOR; + public static final short ABS_MT_WIDTH_MINOR = LinuxInput.ABS_MT_WIDTH_MINOR; + public static final short ABS_MT_ORIENTATION = LinuxInput.ABS_MT_ORIENTATION; + public static final short ABS_MT_POSITION_X = LinuxInput.ABS_MT_POSITION_X; + public static final short ABS_MT_POSITION_Y = LinuxInput.ABS_MT_POSITION_Y; + public static final short ABS_MT_TOOL_TYPE = LinuxInput.ABS_MT_TOOL_TYPE; + public static final short ABS_MT_BLOB_ID = LinuxInput.ABS_MT_BLOB_ID; + public static final short ABS_MT_TRACKING_ID = LinuxInput.ABS_MT_TRACKING_ID; + public static final short ABS_MT_PRESSURE = LinuxInput.ABS_MT_PRESSURE; + public static final short ABS_MT_DISTANCE = LinuxInput.ABS_MT_DISTANCE; + public static final short ABS_MAX = LinuxInput.ABS_MAX; + public static final short ABS_CNT = LinuxInput.ABS_CNT; + public static final short SW_LID = LinuxInput.SW_LID; + public static final short SW_TABLET_MODE = LinuxInput.SW_TABLET_MODE; + public static final short SW_HEADPHONE_INSERT = LinuxInput.SW_HEADPHONE_INSERT; + public static final short SW_RFKILL_ALL = LinuxInput.SW_RFKILL_ALL; + public static final short SW_RADIO = LinuxInput.SW_RADIO; + public static final short SW_MICROPHONE_INSERT = LinuxInput.SW_MICROPHONE_INSERT; + public static final short SW_DOCK = LinuxInput.SW_DOCK; + public static final short SW_LINEOUT_INSERT = LinuxInput.SW_LINEOUT_INSERT; + public static final short SW_JACK_PHYSICAL_INSERT = LinuxInput.SW_JACK_PHYSICAL_INSERT; + public static final short SW_VIDEOOUT_INSERT = LinuxInput.SW_VIDEOOUT_INSERT; + public static final short SW_CAMERA_LENS_COVER = LinuxInput.SW_CAMERA_LENS_COVER; + public static final short SW_KEYPAD_SLIDE = LinuxInput.SW_KEYPAD_SLIDE; + public static final short SW_FRONT_PROXIMITY = LinuxInput.SW_FRONT_PROXIMITY; + public static final short SW_ROTATE_LOCK = LinuxInput.SW_ROTATE_LOCK; + public static final short SW_LINEIN_INSERT = LinuxInput.SW_LINEIN_INSERT; + public static final short SW_MAX = LinuxInput.SW_MAX; + public static final short SW_CNT = LinuxInput.SW_CNT; + public static final short MSC_SERIAL = LinuxInput.MSC_SERIAL; + public static final short MSC_PULSELED = LinuxInput.MSC_PULSELED; + public static final short MSC_GESTURE = LinuxInput.MSC_GESTURE; + public static final short MSC_RAW = LinuxInput.MSC_RAW; + public static final short MSC_SCAN = LinuxInput.MSC_SCAN; + public static final short MSC_MAX = LinuxInput.MSC_MAX; + public static final short MSC_CNT = LinuxInput.MSC_CNT; + public static final short LED_NUML = LinuxInput.LED_NUML; + public static final short LED_CAPSL = LinuxInput.LED_CAPSL; + public static final short LED_SCROLLL = LinuxInput.LED_SCROLLL; + public static final short LED_COMPOSE = LinuxInput.LED_COMPOSE; + public static final short LED_KANA = LinuxInput.LED_KANA; + public static final short LED_SLEEP = LinuxInput.LED_SLEEP; + public static final short LED_SUSPEND = LinuxInput.LED_SUSPEND; + public static final short LED_MUTE = LinuxInput.LED_MUTE; + public static final short LED_MISC = LinuxInput.LED_MISC; + public static final short LED_MAIL = LinuxInput.LED_MAIL; + public static final short LED_CHARGING = LinuxInput.LED_CHARGING; + public static final short LED_MAX = LinuxInput.LED_MAX; + public static final short LED_CNT = LinuxInput.LED_CNT; + public static final short REP_DELAY = LinuxInput.REP_DELAY; + public static final short REP_PERIOD = LinuxInput.REP_PERIOD; + public static final short REP_MAX = LinuxInput.REP_MAX; + public static final short REP_CNT = LinuxInput.REP_CNT; + public static final short SND_CLICK = LinuxInput.SND_CLICK; + public static final short SND_BELL = LinuxInput.SND_BELL; + public static final short SND_TONE = LinuxInput.SND_TONE; + public static final short SND_MAX = LinuxInput.SND_MAX; + public static final short SND_CNT = LinuxInput.SND_CNT; + public static final short ID_BUS = LinuxInput.ID_BUS; + public static final short ID_VENDOR = LinuxInput.ID_VENDOR; + public static final short ID_PRODUCT = LinuxInput.ID_PRODUCT; + public static final short ID_VERSION = LinuxInput.ID_VERSION; + public static final short BUS_PCI = LinuxInput.BUS_PCI; + public static final short BUS_ISAPNP = LinuxInput.BUS_ISAPNP; + public static final short BUS_USB = LinuxInput.BUS_USB; + public static final short BUS_HIL = LinuxInput.BUS_HIL; + public static final short BUS_BLUETOOTH = LinuxInput.BUS_BLUETOOTH; + public static final short BUS_VIRTUAL = LinuxInput.BUS_VIRTUAL; + public static final short BUS_ISA = LinuxInput.BUS_ISA; + public static final short BUS_I8042 = LinuxInput.BUS_I8042; + public static final short BUS_XTKBD = LinuxInput.BUS_XTKBD; + public static final short BUS_RS232 = LinuxInput.BUS_RS232; + public static final short BUS_GAMEPORT = LinuxInput.BUS_GAMEPORT; + public static final short BUS_PARPORT = LinuxInput.BUS_PARPORT; + public static final short BUS_AMIGA = LinuxInput.BUS_AMIGA; + public static final short BUS_ADB = LinuxInput.BUS_ADB; + public static final short BUS_I2C = LinuxInput.BUS_I2C; + public static final short BUS_HOST = LinuxInput.BUS_HOST; + public static final short BUS_GSC = LinuxInput.BUS_GSC; + public static final short BUS_ATARI = LinuxInput.BUS_ATARI; + public static final short BUS_SPI = LinuxInput.BUS_SPI; + public static final short MT_TOOL_FINGER = LinuxInput.MT_TOOL_FINGER; + public static final short MT_TOOL_PEN = LinuxInput.MT_TOOL_PEN; + public static final short MT_TOOL_MAX = LinuxInput.MT_TOOL_MAX; + public static final short FF_STATUS_STOPPED = LinuxInput.FF_STATUS_STOPPED; + public static final short FF_STATUS_PLAYING = LinuxInput.FF_STATUS_PLAYING; + public static final short FF_STATUS_MAX = LinuxInput.FF_STATUS_MAX; + public static final short FF_RUMBLE = LinuxInput.FF_RUMBLE; + public static final short FF_PERIODIC = LinuxInput.FF_PERIODIC; + public static final short FF_CONSTANT = LinuxInput.FF_CONSTANT; + public static final short FF_SPRING = LinuxInput.FF_SPRING; + public static final short FF_FRICTION = LinuxInput.FF_FRICTION; + public static final short FF_DAMPER = LinuxInput.FF_DAMPER; + public static final short FF_INERTIA = LinuxInput.FF_INERTIA; + public static final short FF_RAMP = LinuxInput.FF_RAMP; + public static final short FF_EFFECT_MIN = LinuxInput.FF_EFFECT_MIN; + public static final short FF_EFFECT_MAX = LinuxInput.FF_EFFECT_MAX; + public static final short FF_SQUARE = LinuxInput.FF_SQUARE; + public static final short FF_TRIANGLE = LinuxInput.FF_TRIANGLE; + public static final short FF_SINE = LinuxInput.FF_SINE; + public static final short FF_SAW_UP = LinuxInput.FF_SAW_UP; + public static final short FF_SAW_DOWN = LinuxInput.FF_SAW_DOWN; + public static final short FF_CUSTOM = LinuxInput.FF_CUSTOM; + public static final short FF_WAVEFORM_MIN = LinuxInput.FF_WAVEFORM_MIN; + public static final short FF_WAVEFORM_MAX = LinuxInput.FF_WAVEFORM_MAX; + public static final short FF_GAIN = LinuxInput.FF_GAIN; + public static final short FF_AUTOCENTER = LinuxInput.FF_AUTOCENTER; + public static final short FF_MAX = LinuxInput.FF_MAX; + public static final short FF_CNT = LinuxInput.FF_CNT; + +} diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/LinuxSystemShim.java b/tests/system/src/test/java/com/sun/glass/ui/monocle/LinuxSystemShim.java new file mode 100644 --- /dev/null +++ b/tests/system/src/test/java/com/sun/glass/ui/monocle/LinuxSystemShim.java @@ -0,0 +1,95 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package com.sun.glass.ui.monocle; + +import java.nio.ByteBuffer; + +public class LinuxSystemShim { + + public static final int O_RDONLY = LinuxSystem.O_RDONLY; + public static final int O_WRONLY = LinuxSystem.O_WRONLY; + public static final int O_RDWR = LinuxSystem.O_RDWR; + public static final int O_NONBLOCK = LinuxSystem.O_NONBLOCK; + public static final int _SC_LONG_BIT = LinuxSystem._SC_LONG_BIT; + public static final int FBIOGET_VSCREENINFO = LinuxSystem.FBIOGET_VSCREENINFO; + public static final int FBIOPUT_VSCREENINFO = LinuxSystem.FBIOPUT_VSCREENINFO; + public static final int FBIOPAN_DISPLAY = LinuxSystem.FBIOPAN_DISPLAY; + public static final int FBIOBLANK = LinuxSystem.FBIOBLANK; + public static final int FB_BLANK_UNBLANK = LinuxSystem.FB_BLANK_UNBLANK; + public static final int FB_ACTIVATE_NOW = LinuxSystem.FB_ACTIVATE_NOW; + public static final int FB_ACTIVATE_VBL = LinuxSystem.FB_ACTIVATE_VBL; + public static final int I_FLUSH = LinuxSystem.I_FLUSH; + public static final int FLUSHRW = LinuxSystem.FLUSHRW; + public static final int ENXIO = LinuxSystem.ENXIO; + public static final int EAGAIN = LinuxSystem.EAGAIN; + public static final int RTLD_LAZY = LinuxSystem.RTLD_LAZY; + public static final int RTLD_GLOBAL = LinuxSystem.RTLD_GLOBAL; + public static final int S_IRWXU = LinuxSystem.S_IRWXU; + + public static final long PROT_READ = LinuxSystem.PROT_READ; + public static final long PROT_WRITE = LinuxSystem.PROT_WRITE; + public static final long MAP_PRIVATE = LinuxSystem.MAP_PRIVATE; + public static final long MAP_ANONYMOUS = LinuxSystem.MAP_ANONYMOUS; + public static final long MAP_SHARED = LinuxSystem.MAP_SHARED; + public static final long MAP_FAILED = LinuxSystem.MAP_FAILED; + + public static void loadLibrary() { + LinuxSystem.getLinuxSystem().loadLibrary(); + } + + public static void setenv(String key, String value, boolean overwrite) { + LinuxSystem.getLinuxSystem().setenv(value, value, overwrite); + } + + public static String getErrorMessage() { + return LinuxSystem.getLinuxSystem().getErrorMessage(); + } + + public static int mkfifo(String pathname, int mode) { + return LinuxSystem.getLinuxSystem().mkfifo(pathname, mode); + } + + public static long write(long fd, ByteBuffer buf, int position, int limit) { + return LinuxSystem.getLinuxSystem().write(fd, buf, limit, limit); + } + + public static int close(long fd) { + return LinuxSystem.getLinuxSystem().close(fd); + } + + public static long open(String path, int flags) { + return LinuxSystem.getLinuxSystem().open(path, flags); + } + + public static int errno() { + return LinuxSystem.getLinuxSystem().errno(); + } + + public static int ioctl(long fd, int request, long data) { + return LinuxSystem.getLinuxSystem().ioctl(fd, request, fd); + } + +} diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/MonocleApplicationShim.java b/tests/system/src/test/java/com/sun/glass/ui/monocle/MonocleApplicationShim.java new file mode 100644 --- /dev/null +++ b/tests/system/src/test/java/com/sun/glass/ui/monocle/MonocleApplicationShim.java @@ -0,0 +1,34 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package com.sun.glass.ui.monocle; + +public class MonocleApplicationShim { + + public static int _getKeyCodeForChar(char c) { + return MonocleApplication.getKeyCodeForChar(c); + } + +} diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/TestLog.java b/tests/system/src/test/java/com/sun/glass/ui/monocle/TestLog.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/TestLog.java +++ b/tests/system/src/test/java/com/sun/glass/ui/monocle/TestLog.java @@ -34,6 +34,10 @@ public class TestLog { + private static final boolean verbose = Boolean.getBoolean("verbose"); + private static final double timeScale = Double.parseDouble( + System.getProperty("timeScale", "1")); + private static final long DEFAULT_TIMEOUT = 3000l; private static final List log = new ArrayList<>(); @@ -43,7 +47,7 @@ public static void log(String s) { synchronized (lock) { - if (TestApplication.isVerbose()) { + if (verbose) { System.out.println(timestamp() + " TestLog: " + s); } log.add(s); @@ -155,7 +159,7 @@ synchronized (lock) { if (!checkLog(s)) { String err = "No line '" + s + "' in log"; - if (TestApplication.isVerbose()) { + if (verbose) { System.out.println(err); } throw new AssertionFailedError(err); @@ -167,7 +171,7 @@ synchronized (lock) { if (!checkLogContaining(s)) { String err = "No line containing '" + s + "' in log"; - if (TestApplication.isVerbose()) { + if (verbose) { System.out.println(err); } throw new AssertionFailedError(err); @@ -178,7 +182,7 @@ private static String waitForLog(String[] s, long timeout, boolean exact) throws InterruptedException { long startTime = System.currentTimeMillis(); long timeNow = startTime; - long endTime = timeNow + (long) (timeout * TestApplication.getTimeScale()); + long endTime = timeNow + (long) (timeout * timeScale); String line; String logString = Arrays.toString(s).substring(1, Arrays.toString(s).length() - 1); synchronized (lock) { @@ -192,7 +196,7 @@ if (timeNow >= endTime) { String message = "Timed out after " + (timeNow - startTime) + "ms waiting for '" + logString + "'"; - if (!TestApplication.isVerbose()) { + if (!verbose) { System.out.flush(); System.err.flush(); for (String logLine: log) { @@ -205,7 +209,7 @@ } } long matchTime = System.currentTimeMillis() - startTime; - if (TestApplication.isVerbose()) { + if (verbose) { if (exact) { System.out.println("TestLog matched '" + logString + "' in " diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/TouchFilterShim.java b/tests/system/src/test/java/com/sun/glass/ui/monocle/TouchFilterShim.java new file mode 100644 --- /dev/null +++ b/tests/system/src/test/java/com/sun/glass/ui/monocle/TouchFilterShim.java @@ -0,0 +1,156 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package com.sun.glass.ui.monocle; + +public class TouchFilterShim implements TouchFilter { + + public boolean filter(TouchState ts) { + throw new RuntimeException("not implemented"); + } + + public boolean flush(TouchState ts) { + throw new RuntimeException("not implemented"); + } + + public int getPriority() { + throw new RuntimeException("not implemented"); + } + + public static class TranslateFilter extends TouchFilterShim { + @Override + public boolean filter(TouchState state) { + for (int i = 0; i < state.getPointCount(); i++) { + state.getPoint(i).x += 8; + state.getPoint(i).y -= 5; + } + return false; + } + + @Override + public int getPriority() { + return 50; + } + + @Override + public boolean flush(TouchState state) { + return false; + } + } + + public static class OverrideIDFilter extends TouchFilterShim { + @Override + public boolean filter(TouchState state) { + for (int i = 0; i < state.getPointCount(); i++) { + state.getPoint(i).id = 5; + } + return false; + } + + @Override + public int getPriority() { + return -50; + } + + @Override + public boolean flush(TouchState state) { + return false; + } + } + + public static class NoMultiplesOfTenOnXFilter extends TouchFilterShim { + @Override + public boolean filter(TouchState state) { + for (int i = 0; i < state.getPointCount(); i++) { + if (state.getPoint(i).x % 10 == 0) { + return true; + } + } + return false; + } + + @Override + public int getPriority() { + return 60; + } + + @Override + public boolean flush(TouchState state) { + return false; + } + } + + public static class LoggingFilter extends TouchFilterShim { + @Override + public boolean filter(TouchState state) { + for (int i = 0; i < state.getPointCount(); i++) { + TestLog.format("Touch point id=%d at %d,%d", + state.getPoint(i).id, + state.getPoint(i).x, + state.getPoint(i).y); + } + return false; + } + + @Override + public int getPriority() { + return -100; + } + + @Override + public boolean flush(TouchState state) { + return false; + } + } + + public static class FlushingFilter extends TouchFilterShim { + int i = 3; + @Override + public boolean filter(TouchState state) { + return false; + } + + @Override + public int getPriority() { + return 90; + } + + @Override + public boolean flush(TouchState state) { + if (i > 0) { + i --; + state.clear(); + TouchState.Point p = state.addPoint(null); + p.x = 205 + i * 100; + p.y = 100; + p.id = -1; + return true; + } else { + return false; + } + } + } + +} diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/TouchInputShim.java b/tests/system/src/test/java/com/sun/glass/ui/monocle/TouchInputShim.java new file mode 100644 --- /dev/null +++ b/tests/system/src/test/java/com/sun/glass/ui/monocle/TouchInputShim.java @@ -0,0 +1,34 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package com.sun.glass.ui.monocle; + +public class TouchInputShim { + + public static int getTouchRadius() { + return TouchInput.getInstance().getTouchRadius(); + } + +} diff --git a/tests/system/src/test/java/com/sun/javafx/sg/prism/NGHelper.java b/tests/system/src/test/java/com/sun/javafx/sg/prism/NGHelper.java deleted file mode 100644 --- a/tests/system/src/test/java/com/sun/javafx/sg/prism/NGHelper.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2013, 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. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * 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. - */ - -package com.sun.javafx.sg.prism; - -import com.sun.prism.GraphicsPipeline; -import com.sun.prism.PhongMaterial; - - -public class NGHelper { - - public static NGPhongMaterial getMaterial(NGShape3D ngShape3D) { - // TODO: return ngShape3D.test_getMaterial(); - throw new UnsupportedOperationException("not yet supported"); - } - - public static PhongMaterial createMaterial(NGPhongMaterial mat) { - return (PhongMaterial)mat.createMaterial(GraphicsPipeline.getDefaultResourceFactory()); - } -} diff --git a/tests/system/src/test/java/com/sun/glass/ui/DefaultExceptionHandlerTest.java b/tests/system/src/test/java/test/com/sun/glass/ui/DefaultExceptionHandlerTest.java rename from tests/system/src/test/java/com/sun/glass/ui/DefaultExceptionHandlerTest.java rename to tests/system/src/test/java/test/com/sun/glass/ui/DefaultExceptionHandlerTest.java --- a/tests/system/src/test/java/com/sun/glass/ui/DefaultExceptionHandlerTest.java +++ b/tests/system/src/test/java/test/com/sun/glass/ui/DefaultExceptionHandlerTest.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.glass.ui; +package test.com.sun.glass.ui; import javafx.application.Application; import javafx.application.Platform; diff --git a/tests/system/src/test/java/com/sun/glass/ui/ExceptionHandlerTest.java b/tests/system/src/test/java/test/com/sun/glass/ui/ExceptionHandlerTest.java rename from tests/system/src/test/java/com/sun/glass/ui/ExceptionHandlerTest.java rename to tests/system/src/test/java/test/com/sun/glass/ui/ExceptionHandlerTest.java --- a/tests/system/src/test/java/com/sun/glass/ui/ExceptionHandlerTest.java +++ b/tests/system/src/test/java/test/com/sun/glass/ui/ExceptionHandlerTest.java @@ -23,17 +23,12 @@ * questions. */ -package com.sun.glass.ui; +package test.com.sun.glass.ui; import javafx.application.Application; import javafx.application.Platform; -import javafx.scene.Group; -import javafx.scene.Scene; -import javafx.stage.Modality; import javafx.stage.Stage; -import org.junit.AfterClass; -import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/FramebufferTest.java b/tests/system/src/test/java/test/com/sun/glass/ui/monocle/FramebufferTest.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/FramebufferTest.java rename to tests/system/src/test/java/test/com/sun/glass/ui/monocle/FramebufferTest.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/FramebufferTest.java +++ b/tests/system/src/test/java/test/com/sun/glass/ui/monocle/FramebufferTest.java @@ -23,8 +23,9 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.com.sun.glass.ui.monocle; +import com.sun.glass.ui.monocle.FramebufferShim; import org.junit.Test; import java.nio.ByteBuffer; @@ -34,7 +35,7 @@ @Test public void testOverflow32() { ByteBuffer screenBuffer = ByteBuffer.allocate(100 * 100 * 4); - Framebuffer fb = new Framebuffer(screenBuffer, 100, 100, 4, false); + FramebufferShim fb = new FramebufferShim(screenBuffer, 100, 100, 4, false); ByteBuffer windowBuffer = ByteBuffer.allocate(200 * 200 * 4); fb.reset(); fb.composePixels(windowBuffer, -50, -50, 200, 200, 1f); @@ -53,7 +54,7 @@ // A 16-bit framebuffer stores its content in 32-bits and writes out // to a 32-bit target. So it needs four bytes per pixel in its buffer. ByteBuffer screenBuffer = ByteBuffer.allocate(100 * 100 * 4); - Framebuffer fb = new Framebuffer(screenBuffer, 100, 100, 2, false); + FramebufferShim fb = new FramebufferShim(screenBuffer, 100, 100, 2, false); ByteBuffer windowBuffer = ByteBuffer.allocate(200 * 200 * 4); fb.reset(); fb.composePixels(windowBuffer, -50, -50, 200, 200, 1f); diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/IntSetTest.java b/tests/system/src/test/java/test/com/sun/glass/ui/monocle/IntSetTest.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/IntSetTest.java rename to tests/system/src/test/java/test/com/sun/glass/ui/monocle/IntSetTest.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/IntSetTest.java +++ b/tests/system/src/test/java/test/com/sun/glass/ui/monocle/IntSetTest.java @@ -23,8 +23,9 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.com.sun.glass.ui.monocle; +import com.sun.glass.ui.monocle.IntSetShim; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -60,7 +61,7 @@ this.array = array; } - private int[] getIntSetAsArray(IntSet s) { + private int[] getIntSetAsArray(IntSetShim s) { int[] a = new int[s.size()]; for (int i = 0; i < s.size(); i++) { a[i] = s.get(i); @@ -73,7 +74,7 @@ return set.stream().sorted().mapToInt(x -> x).toArray(); } - private void assertSet(Set expected, IntSet actual) { + private void assertSet(Set expected, IntSetShim actual) { Assert.assertArrayEquals( "Expected: " + expected + ", found " + actual, getHashSetAsArray(expected), @@ -82,7 +83,7 @@ @Test public void testAddInOrderRemoveInOrder() { - IntSet set = new IntSet(); + IntSetShim set = new IntSetShim(); Set hashSet = new HashSet<>(); assertSet(hashSet, set); for (int i = 0; i < array.length; i++) { @@ -99,7 +100,7 @@ @Test public void testAddInOrderRemoveInReverse() { - IntSet set = new IntSet(); + IntSetShim set = new IntSetShim(); Set hashSet = new HashSet<>(); assertSet(hashSet, set); for (int i = 0; i < array.length; i++) { @@ -116,7 +117,7 @@ @Test public void testAddInReverseRemoveInOrder() { - IntSet set = new IntSet(); + IntSetShim set = new IntSetShim(); Set hashSet = new HashSet<>(); assertSet(hashSet, set); for (int i = array.length - 1; i >= 0; i--) { @@ -133,7 +134,7 @@ @Test public void testAddInReverseRemoveInReverse() { - IntSet set = new IntSet(); + IntSetShim set = new IntSetShim(); Set hashSet = new HashSet<>(); assertSet(hashSet, set); for (int i = array.length - 1; i >= 0; i--) { diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/LensUInput.java b/tests/system/src/test/java/test/com/sun/glass/ui/monocle/LensUInput.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/LensUInput.java rename to tests/system/src/test/java/test/com/sun/glass/ui/monocle/LensUInput.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/LensUInput.java +++ b/tests/system/src/test/java/test/com/sun/glass/ui/monocle/LensUInput.java @@ -23,8 +23,10 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.com.sun.glass.ui.monocle; +import com.sun.glass.ui.monocle.LinuxInputShim; +import com.sun.glass.ui.monocle.LinuxSystemShim; import javafx.animation.AnimationTimer; import javafx.application.Platform; @@ -37,8 +39,6 @@ public class LensUInput extends NativeUInput { - private LinuxSystem system = LinuxSystem.getLinuxSystem(); - private long fd = -1; private long devFD = -1; private String deviceName; @@ -59,15 +59,15 @@ return; } try { - system.loadLibrary(); - system.setenv("LENS_TEST_INPUT", INPUT_PATH, true); + LinuxSystemShim.loadLibrary(); + LinuxSystemShim.setenv("LENS_TEST_INPUT", INPUT_PATH, true); File pipe = new File(INPUT_PATH); if (pipe.exists()) { pipe.delete(); } pipe.deleteOnExit(); - if (system.mkfifo(pipe.getPath(), LinuxSystem.S_IRWXU) != 0) { - throw new IOException(system.getErrorMessage()); + if (LinuxSystemShim.mkfifo(pipe.getPath(), LinuxSystemShim.S_IRWXU) != 0) { + throw new IOException(LinuxSystemShim.getErrorMessage()); } isSetup = true; } catch (IOException e) { @@ -109,9 +109,9 @@ private void writeBytes(int length) throws IOException { int offset = 0; while (offset < length) { - int bytesWritten = (int) system.write(fd, byteBuffer, offset, length); + int bytesWritten = (int) LinuxSystemShim.write(fd, byteBuffer, offset, length); if (bytesWritten < 0) { - throw new IOException(system.getErrorMessage()); + throw new IOException(LinuxSystemShim.getErrorMessage()); } else { offset += bytesWritten; } @@ -150,8 +150,8 @@ if (devNodeFile.exists()) { devNodeFile.delete(); } - if (system.mkfifo(devNode, LinuxSystem.S_IRWXU) != 0) { - throw new IOException(system.getErrorMessage()); + if (LinuxSystemShim.mkfifo(devNode, LinuxSystemShim.S_IRWXU) != 0) { + throw new IOException(LinuxSystemShim.getErrorMessage()); } writeInt(1); // attach device writeShort(bustype); @@ -163,7 +163,7 @@ writeString("Test Input Device"); BitSet evBits = capabilities.get("ev"); if (evBits != null) { - for (int i = 0; i < LinuxInput.EV_MAX; i++) { + for (int i = 0; i < LinuxInputShim.EV_MAX; i++) { if (evBits.get(i)) { writeInt(i); } @@ -172,7 +172,7 @@ writeInt(-1); BitSet keyBits = capabilities.get("key"); if (keyBits != null) { - for (int i = 0; i < LinuxInput.KEY_MAX; i++) { + for (int i = 0; i < LinuxInputShim.KEY_MAX; i++) { if (keyBits.get(i)) { writeInt(i); } @@ -181,7 +181,7 @@ writeInt(-1); BitSet relBits = capabilities.get("rel"); if (relBits != null) { - for (int i = 0; i < LinuxInput.REL_MAX; i++) { + for (int i = 0; i < LinuxInputShim.REL_MAX; i++) { if (relBits.get(i)) { writeInt(i); } @@ -190,7 +190,7 @@ writeInt(-1); BitSet absBits = capabilities.get("abs"); if (absBits != null) { - for (int i = 0; i < LinuxInput.ABS_MAX; i++) { + for (int i = 0; i < LinuxInputShim.ABS_MAX; i++) { if (absBits.get(i)) { writeInt(i); int[] caps = absCaps.get(i); @@ -215,7 +215,7 @@ @Override protected void destroyDevice() throws IOException { if (devFD != -1l) { - system.close(devFD); + LinuxSystemShim.close(devFD); devFD = -1; } new File(devNode).delete(); @@ -226,10 +226,10 @@ private long openPipe(String path) throws IOException { long timeOut = System.currentTimeMillis() + 10000l; while (System.currentTimeMillis() < timeOut) { - long pipeFD = system.open(path, - LinuxSystem.O_WRONLY | LinuxSystem.O_NONBLOCK); + long pipeFD = LinuxSystemShim.open(path, + LinuxSystemShim.O_WRONLY | LinuxSystemShim.O_NONBLOCK); if (pipeFD < 0l) { - if (system.errno() == LinuxSystem.ENXIO) { // no reader on pipe + if (LinuxSystemShim.errno() == LinuxSystemShim.ENXIO) { // no reader on pipe try { Thread.sleep(100l); } catch (InterruptedException e) { } @@ -240,7 +240,7 @@ return pipeFD; } } - throw new IOException(system.getErrorMessage()); + throw new IOException(LinuxSystemShim.getErrorMessage()); } @Override @@ -251,7 +251,7 @@ @Override protected void closeConnection() { if (fd >= 0l) { - system.close(fd); + LinuxSystemShim.close(fd); fd = -1l; } } @@ -260,21 +260,21 @@ public void write(ByteBuffer buffer) throws IOException { int offset = 0; while (offset < buffer.limit()) { - int bytesWritten = (int) system.write(devFD, buffer, offset, buffer.limit()); + int bytesWritten = (int) LinuxSystemShim.write(devFD, buffer, offset, buffer.limit()); if (bytesWritten < 0) { - if (system.errno() == LinuxSystem.EAGAIN) { + if (LinuxSystemShim.errno() == LinuxSystemShim.EAGAIN) { try { Thread.sleep(1); } catch (InterruptedException e) { e.printStackTrace(); } } else { - throw new IOException(system.getErrorMessage()); + throw new IOException(LinuxSystemShim.getErrorMessage()); } } else { offset += bytesWritten; } } - system.ioctl(devFD, LinuxSystem.I_FLUSH, LinuxSystem.FLUSHRW); + LinuxSystemShim.ioctl(devFD, LinuxSystemShim.I_FLUSH, LinuxSystemShim.FLUSHRW); } } diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/NativeUInput.java b/tests/system/src/test/java/test/com/sun/glass/ui/monocle/NativeUInput.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/NativeUInput.java rename to tests/system/src/test/java/test/com/sun/glass/ui/monocle/NativeUInput.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/NativeUInput.java +++ b/tests/system/src/test/java/test/com/sun/glass/ui/monocle/NativeUInput.java @@ -23,8 +23,9 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.com.sun.glass.ui.monocle; +import com.sun.glass.ui.monocle.LinuxInputShim; import java.io.IOException; import java.lang.reflect.Field; import java.nio.ByteBuffer; @@ -107,7 +108,7 @@ } else if (s.length() > 0 && s.charAt(0) >= '0' && s.charAt(0) <= '9') { return Short.parseShort(s); } - Field f = LinuxInput.class.getDeclaredField(s); + Field f = LinuxInputShim.class.getDeclaredField(s); return f.getShort(null); } catch (Exception e) { e.printStackTrace(); @@ -148,25 +149,6 @@ absCap[index] = valueToInt(valueString); } - public Map createAbsCapsMap() { - Map map = - new HashMap(); - for (Integer axis : absCaps.keySet()) { - int[] a = absCaps.get(axis); - if (a != null) { - LinuxAbsoluteInputCapabilities absCap = new LinuxAbsoluteInputCapabilities( - a[INDEX_VALUE], - a[INDEX_MAX], - a[INDEX_MIN], - a[INDEX_FUZZ], - a[INDEX_FLAT], - a[INDEX_RESOLUTION]); - map.put(axis, absCap); - } - } - return map; - } - protected abstract void createDevice() throws IOException; protected abstract void destroyDevice() throws IOException; diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/TestRunnable.java b/tests/system/src/test/java/test/com/sun/glass/ui/monocle/TestRunnable.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/TestRunnable.java rename to tests/system/src/test/java/test/com/sun/glass/ui/monocle/TestRunnable.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/TestRunnable.java +++ b/tests/system/src/test/java/test/com/sun/glass/ui/monocle/TestRunnable.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package com.sun.glass.ui.monocle; +package test.com.sun.glass.ui.monocle; import javafx.application.Platform; diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/headless/HeadlessGeometry1Test.java b/tests/system/src/test/java/test/com/sun/glass/ui/monocle/headless/HeadlessGeometry1Test.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/headless/HeadlessGeometry1Test.java rename to tests/system/src/test/java/test/com/sun/glass/ui/monocle/headless/HeadlessGeometry1Test.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/headless/HeadlessGeometry1Test.java +++ b/tests/system/src/test/java/test/com/sun/glass/ui/monocle/headless/HeadlessGeometry1Test.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.glass.ui.monocle.headless; +package test.com.sun.glass.ui.monocle.headless; import com.sun.glass.ui.Screen; import javafx.application.Application; diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/headless/HeadlessGeometry2Test.java b/tests/system/src/test/java/test/com/sun/glass/ui/monocle/headless/HeadlessGeometry2Test.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/headless/HeadlessGeometry2Test.java rename to tests/system/src/test/java/test/com/sun/glass/ui/monocle/headless/HeadlessGeometry2Test.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/headless/HeadlessGeometry2Test.java +++ b/tests/system/src/test/java/test/com/sun/glass/ui/monocle/headless/HeadlessGeometry2Test.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.glass.ui.monocle.headless; +package test.com.sun.glass.ui.monocle.headless; import com.sun.glass.ui.Screen; import javafx.application.Application; diff --git a/tests/system/src/test/java/com/sun/javafx/application/ListenerError1Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerError1Test.java rename from tests/system/src/test/java/com/sun/javafx/application/ListenerError1Test.java rename to tests/system/src/test/java/test/com/sun/javafx/application/ListenerError1Test.java --- a/tests/system/src/test/java/com/sun/javafx/application/ListenerError1Test.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerError1Test.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/ListenerError2Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerError2Test.java rename from tests/system/src/test/java/com/sun/javafx/application/ListenerError2Test.java rename to tests/system/src/test/java/test/com/sun/javafx/application/ListenerError2Test.java --- a/tests/system/src/test/java/com/sun/javafx/application/ListenerError2Test.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerError2Test.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/ListenerException1Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerException1Test.java rename from tests/system/src/test/java/com/sun/javafx/application/ListenerException1Test.java rename to tests/system/src/test/java/test/com/sun/javafx/application/ListenerException1Test.java --- a/tests/system/src/test/java/com/sun/javafx/application/ListenerException1Test.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerException1Test.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/ListenerException2Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerException2Test.java rename from tests/system/src/test/java/com/sun/javafx/application/ListenerException2Test.java rename to tests/system/src/test/java/test/com/sun/javafx/application/ListenerException2Test.java --- a/tests/system/src/test/java/com/sun/javafx/application/ListenerException2Test.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerException2Test.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/ListenerExitTest.java b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerExitTest.java rename from tests/system/src/test/java/com/sun/javafx/application/ListenerExitTest.java rename to tests/system/src/test/java/test/com/sun/javafx/application/ListenerExitTest.java --- a/tests/system/src/test/java/com/sun/javafx/application/ListenerExitTest.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerExitTest.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/ListenerIdle1Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerIdle1Test.java rename from tests/system/src/test/java/com/sun/javafx/application/ListenerIdle1Test.java rename to tests/system/src/test/java/test/com/sun/javafx/application/ListenerIdle1Test.java --- a/tests/system/src/test/java/com/sun/javafx/application/ListenerIdle1Test.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerIdle1Test.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/ListenerIdle2Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerIdle2Test.java rename from tests/system/src/test/java/com/sun/javafx/application/ListenerIdle2Test.java rename to tests/system/src/test/java/test/com/sun/javafx/application/ListenerIdle2Test.java --- a/tests/system/src/test/java/com/sun/javafx/application/ListenerIdle2Test.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerIdle2Test.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/ListenerTestCommon.java b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerTestCommon.java rename from tests/system/src/test/java/com/sun/javafx/application/ListenerTestCommon.java rename to tests/system/src/test/java/test/com/sun/javafx/application/ListenerTestCommon.java --- a/tests/system/src/test/java/com/sun/javafx/application/ListenerTestCommon.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/ListenerTestCommon.java @@ -23,8 +23,10 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; +import com.sun.javafx.application.PlatformImpl; +import com.sun.javafx.application.PlatformImplShim; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; @@ -34,10 +36,10 @@ import javafx.scene.paint.Color; import javafx.stage.Stage; import junit.framework.AssertionFailedError; -import util.Util; +import test.util.Util; import static org.junit.Assert.*; -import static util.Util.TIMEOUT; +import static test.util.Util.TIMEOUT; /** * Test program for Platform finishListener @@ -89,7 +91,7 @@ err.initCause(ex); throw err; } - exitLatch = PlatformImpl.test_getPlatformExitLatch(); + exitLatch = PlatformImplShim.test_getPlatformExitLatch(); assertEquals(1, exitLatch.getCount()); assertEquals(0, launchLatch.getCount()); assertEquals(1, exitLatch.getCount()); diff --git a/tests/system/src/test/java/com/sun/javafx/application/PlatformStartupCommon.java b/tests/system/src/test/java/test/com/sun/javafx/application/PlatformStartupCommon.java rename from tests/system/src/test/java/com/sun/javafx/application/PlatformStartupCommon.java rename to tests/system/src/test/java/test/com/sun/javafx/application/PlatformStartupCommon.java --- a/tests/system/src/test/java/com/sun/javafx/application/PlatformStartupCommon.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/PlatformStartupCommon.java @@ -23,8 +23,9 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; +import com.sun.javafx.application.PlatformImplShim; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; @@ -34,10 +35,10 @@ import javafx.scene.paint.Color; import javafx.stage.Stage; import junit.framework.AssertionFailedError; -import util.Util; +import test.util.Util; import static org.junit.Assert.*; -import static util.Util.TIMEOUT; +import static test.util.Util.TIMEOUT; /** * Test program for Platform startup. @@ -118,7 +119,7 @@ // Test exit behavior after another short delay Thread.sleep(SLEEP_TIME); - final CountDownLatch exitLatch = PlatformImpl.test_getPlatformExitLatch(); + final CountDownLatch exitLatch = PlatformImplShim.test_getPlatformExitLatch(); if (implicitExit) { // Verify that that the runtime has exited diff --git a/tests/system/src/test/java/com/sun/javafx/application/PlatformStartupExplicitTest.java b/tests/system/src/test/java/test/com/sun/javafx/application/PlatformStartupExplicitTest.java rename from tests/system/src/test/java/com/sun/javafx/application/PlatformStartupExplicitTest.java rename to tests/system/src/test/java/test/com/sun/javafx/application/PlatformStartupExplicitTest.java --- a/tests/system/src/test/java/com/sun/javafx/application/PlatformStartupExplicitTest.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/PlatformStartupExplicitTest.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/PlatformStartupImplicitTest.java b/tests/system/src/test/java/test/com/sun/javafx/application/PlatformStartupImplicitTest.java rename from tests/system/src/test/java/com/sun/javafx/application/PlatformStartupImplicitTest.java rename to tests/system/src/test/java/test/com/sun/javafx/application/PlatformStartupImplicitTest.java --- a/tests/system/src/test/java/com/sun/javafx/application/PlatformStartupImplicitTest.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/PlatformStartupImplicitTest.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/RunLaterTest.java b/tests/system/src/test/java/test/com/sun/javafx/application/RunLaterTest.java rename from tests/system/src/test/java/com/sun/javafx/application/RunLaterTest.java rename to tests/system/src/test/java/test/com/sun/javafx/application/RunLaterTest.java --- a/tests/system/src/test/java/com/sun/javafx/application/RunLaterTest.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/RunLaterTest.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -35,10 +35,10 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import util.Util; +import test.util.Util; import static org.junit.Assert.*; -import static util.Util.TIMEOUT; +import static test.util.Util.TIMEOUT; /** * Unit tests for Platform runLater. diff --git a/tests/system/src/test/java/com/sun/javafx/application/SceneGraphThread1Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThread1Test.java rename from tests/system/src/test/java/com/sun/javafx/application/SceneGraphThread1Test.java rename to tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThread1Test.java --- a/tests/system/src/test/java/com/sun/javafx/application/SceneGraphThread1Test.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThread1Test.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/SceneGraphThread2Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThread2Test.java rename from tests/system/src/test/java/com/sun/javafx/application/SceneGraphThread2Test.java rename to tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThread2Test.java --- a/tests/system/src/test/java/com/sun/javafx/application/SceneGraphThread2Test.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThread2Test.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/SceneGraphThread3Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThread3Test.java rename from tests/system/src/test/java/com/sun/javafx/application/SceneGraphThread3Test.java rename to tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThread3Test.java --- a/tests/system/src/test/java/com/sun/javafx/application/SceneGraphThread3Test.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThread3Test.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/SceneGraphThread4Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThread4Test.java rename from tests/system/src/test/java/com/sun/javafx/application/SceneGraphThread4Test.java rename to tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThread4Test.java --- a/tests/system/src/test/java/com/sun/javafx/application/SceneGraphThread4Test.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThread4Test.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/SceneGraphThreadCommon.java b/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThreadCommon.java rename from tests/system/src/test/java/com/sun/javafx/application/SceneGraphThreadCommon.java rename to tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThreadCommon.java --- a/tests/system/src/test/java/com/sun/javafx/application/SceneGraphThreadCommon.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/SceneGraphThreadCommon.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; @@ -45,10 +45,10 @@ import javafx.stage.Stage; import junit.framework.AssertionFailedError; import org.junit.AfterClass; -import util.Util; +import test.util.Util; import static org.junit.Assert.*; -import static util.Util.TIMEOUT; +import static test.util.Util.TIMEOUT; /** * Unit tests for scene graph construction on a background thread diff --git a/tests/system/src/test/java/com/sun/javafx/application/SingleExitCommon.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitCommon.java rename from tests/system/src/test/java/com/sun/javafx/application/SingleExitCommon.java rename to tests/system/src/test/java/test/com/sun/javafx/application/SingleExitCommon.java --- a/tests/system/src/test/java/com/sun/javafx/application/SingleExitCommon.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitCommon.java @@ -23,8 +23,9 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; +import com.sun.javafx.application.PlatformImplShim; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import javafx.application.Application; @@ -34,10 +35,10 @@ import javafx.scene.paint.Color; import javafx.stage.Stage; import junit.framework.AssertionFailedError; -import util.Util; +import test.util.Util; import static org.junit.Assert.*; -import static util.Util.TIMEOUT; +import static test.util.Util.TIMEOUT; /** * Test program for Platform implicit exit behavior using the primary stage. @@ -194,7 +195,7 @@ Util.runAndWait(myApp.primaryStage::hide); } - final CountDownLatch exitLatch = PlatformImpl.test_getPlatformExitLatch(); + final CountDownLatch exitLatch = PlatformImplShim.test_getPlatformExitLatch(); if (reEnableImplicitExit) { Thread.sleep(SLEEP_TIME); diff --git a/tests/system/src/test/java/com/sun/javafx/application/SingleExitExplicit1Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicit1Test.java rename from tests/system/src/test/java/com/sun/javafx/application/SingleExitExplicit1Test.java rename to tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicit1Test.java --- a/tests/system/src/test/java/com/sun/javafx/application/SingleExitExplicit1Test.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicit1Test.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/SingleExitExplicit2Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicit2Test.java rename from tests/system/src/test/java/com/sun/javafx/application/SingleExitExplicit2Test.java rename to tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicit2Test.java --- a/tests/system/src/test/java/com/sun/javafx/application/SingleExitExplicit2Test.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicit2Test.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/SingleExitExplicitError1Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicitError1Test.java rename from tests/system/src/test/java/com/sun/javafx/application/SingleExitExplicitError1Test.java rename to tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicitError1Test.java --- a/tests/system/src/test/java/com/sun/javafx/application/SingleExitExplicitError1Test.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicitError1Test.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/SingleExitExplicitError2Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicitError2Test.java rename from tests/system/src/test/java/com/sun/javafx/application/SingleExitExplicitError2Test.java rename to tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicitError2Test.java --- a/tests/system/src/test/java/com/sun/javafx/application/SingleExitExplicitError2Test.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicitError2Test.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/SingleExitExplicitException1Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicitException1Test.java rename from tests/system/src/test/java/com/sun/javafx/application/SingleExitExplicitException1Test.java rename to tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicitException1Test.java --- a/tests/system/src/test/java/com/sun/javafx/application/SingleExitExplicitException1Test.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicitException1Test.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/SingleExitExplicitException2Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicitException2Test.java rename from tests/system/src/test/java/com/sun/javafx/application/SingleExitExplicitException2Test.java rename to tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicitException2Test.java --- a/tests/system/src/test/java/com/sun/javafx/application/SingleExitExplicitException2Test.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitExplicitException2Test.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/SingleExitImplicitErrorTest.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitImplicitErrorTest.java rename from tests/system/src/test/java/com/sun/javafx/application/SingleExitImplicitErrorTest.java rename to tests/system/src/test/java/test/com/sun/javafx/application/SingleExitImplicitErrorTest.java --- a/tests/system/src/test/java/com/sun/javafx/application/SingleExitImplicitErrorTest.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitImplicitErrorTest.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/SingleExitImplicitExceptionTest.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitImplicitExceptionTest.java rename from tests/system/src/test/java/com/sun/javafx/application/SingleExitImplicitExceptionTest.java rename to tests/system/src/test/java/test/com/sun/javafx/application/SingleExitImplicitExceptionTest.java --- a/tests/system/src/test/java/com/sun/javafx/application/SingleExitImplicitExceptionTest.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitImplicitExceptionTest.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/SingleExitImplicitTest.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitImplicitTest.java rename from tests/system/src/test/java/com/sun/javafx/application/SingleExitImplicitTest.java rename to tests/system/src/test/java/test/com/sun/javafx/application/SingleExitImplicitTest.java --- a/tests/system/src/test/java/com/sun/javafx/application/SingleExitImplicitTest.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleExitImplicitTest.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/SingleNoShowExplicit1Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicit1Test.java rename from tests/system/src/test/java/com/sun/javafx/application/SingleNoShowExplicit1Test.java rename to tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicit1Test.java --- a/tests/system/src/test/java/com/sun/javafx/application/SingleNoShowExplicit1Test.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicit1Test.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/SingleNoShowExplicit2Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicit2Test.java rename from tests/system/src/test/java/com/sun/javafx/application/SingleNoShowExplicit2Test.java rename to tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicit2Test.java --- a/tests/system/src/test/java/com/sun/javafx/application/SingleNoShowExplicit2Test.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicit2Test.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/SingleNoShowExplicitError1Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicitError1Test.java rename from tests/system/src/test/java/com/sun/javafx/application/SingleNoShowExplicitError1Test.java rename to tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicitError1Test.java --- a/tests/system/src/test/java/com/sun/javafx/application/SingleNoShowExplicitError1Test.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicitError1Test.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/SingleNoShowExplicitError2Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicitError2Test.java rename from tests/system/src/test/java/com/sun/javafx/application/SingleNoShowExplicitError2Test.java rename to tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicitError2Test.java --- a/tests/system/src/test/java/com/sun/javafx/application/SingleNoShowExplicitError2Test.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicitError2Test.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/SingleNoShowExplicitException1Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicitException1Test.java rename from tests/system/src/test/java/com/sun/javafx/application/SingleNoShowExplicitException1Test.java rename to tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicitException1Test.java --- a/tests/system/src/test/java/com/sun/javafx/application/SingleNoShowExplicitException1Test.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicitException1Test.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/SingleNoShowExplicitException2Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicitException2Test.java rename from tests/system/src/test/java/com/sun/javafx/application/SingleNoShowExplicitException2Test.java rename to tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicitException2Test.java --- a/tests/system/src/test/java/com/sun/javafx/application/SingleNoShowExplicitException2Test.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowExplicitException2Test.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/SingleNoShowImplicitErrorTest.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowImplicitErrorTest.java rename from tests/system/src/test/java/com/sun/javafx/application/SingleNoShowImplicitErrorTest.java rename to tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowImplicitErrorTest.java --- a/tests/system/src/test/java/com/sun/javafx/application/SingleNoShowImplicitErrorTest.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowImplicitErrorTest.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/SingleNoShowImplicitExceptionTest.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowImplicitExceptionTest.java rename from tests/system/src/test/java/com/sun/javafx/application/SingleNoShowImplicitExceptionTest.java rename to tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowImplicitExceptionTest.java --- a/tests/system/src/test/java/com/sun/javafx/application/SingleNoShowImplicitExceptionTest.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowImplicitExceptionTest.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/SingleNoShowImplicitTest.java b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowImplicitTest.java rename from tests/system/src/test/java/com/sun/javafx/application/SingleNoShowImplicitTest.java rename to tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowImplicitTest.java --- a/tests/system/src/test/java/com/sun/javafx/application/SingleNoShowImplicitTest.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/SingleNoShowImplicitTest.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/SwingExitCommon.java b/tests/system/src/test/java/test/com/sun/javafx/application/SwingExitCommon.java rename from tests/system/src/test/java/com/sun/javafx/application/SwingExitCommon.java rename to tests/system/src/test/java/test/com/sun/javafx/application/SwingExitCommon.java --- a/tests/system/src/test/java/com/sun/javafx/application/SwingExitCommon.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/SwingExitCommon.java @@ -23,8 +23,9 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; +import com.sun.javafx.application.PlatformImplShim; import java.awt.BorderLayout; import javax.swing.SwingUtilities; import java.awt.Dimension; @@ -38,10 +39,10 @@ import javafx.scene.paint.Color; import javax.swing.JFrame; import junit.framework.AssertionFailedError; -import util.Util; +import test.util.Util; import static org.junit.Assert.*; -import static util.Util.TIMEOUT; +import static test.util.Util.TIMEOUT; /** * Test program for Platform implicit exit behavior using an embedded JFXPanel. @@ -133,7 +134,7 @@ throw err; } - final CountDownLatch exitLatch = PlatformImpl.test_getPlatformExitLatch(); + final CountDownLatch exitLatch = PlatformImplShim.test_getPlatformExitLatch(); if (reEnableImplicitExit) { Thread.sleep(SLEEP_TIME); diff --git a/tests/system/src/test/java/com/sun/javafx/application/SwingExitExplicit1Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SwingExitExplicit1Test.java rename from tests/system/src/test/java/com/sun/javafx/application/SwingExitExplicit1Test.java rename to tests/system/src/test/java/test/com/sun/javafx/application/SwingExitExplicit1Test.java --- a/tests/system/src/test/java/com/sun/javafx/application/SwingExitExplicit1Test.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/SwingExitExplicit1Test.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/SwingExitExplicit2Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/SwingExitExplicit2Test.java rename from tests/system/src/test/java/com/sun/javafx/application/SwingExitExplicit2Test.java rename to tests/system/src/test/java/test/com/sun/javafx/application/SwingExitExplicit2Test.java --- a/tests/system/src/test/java/com/sun/javafx/application/SwingExitExplicit2Test.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/SwingExitExplicit2Test.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Ignore; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/SwingExitImplicitTest.java b/tests/system/src/test/java/test/com/sun/javafx/application/SwingExitImplicitTest.java rename from tests/system/src/test/java/com/sun/javafx/application/SwingExitImplicitTest.java rename to tests/system/src/test/java/test/com/sun/javafx/application/SwingExitImplicitTest.java --- a/tests/system/src/test/java/com/sun/javafx/application/SwingExitImplicitTest.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/SwingExitImplicitTest.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/SwingNoExit.java b/tests/system/src/test/java/test/com/sun/javafx/application/SwingNoExit.java rename from tests/system/src/test/java/com/sun/javafx/application/SwingNoExit.java rename to tests/system/src/test/java/test/com/sun/javafx/application/SwingNoExit.java --- a/tests/system/src/test/java/com/sun/javafx/application/SwingNoExit.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/SwingNoExit.java @@ -23,15 +23,16 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; +import com.sun.javafx.application.PlatformImplShim; import javafx.application.Platform; import javafx.embed.swing.JFXPanel; import javafx.scene.Group; import javafx.scene.Scene; import javafx.scene.paint.Color; import junit.framework.AssertionFailedError; -import util.Util; +import test.util.Util; import javax.swing.JFrame; import javax.swing.SwingUtilities; @@ -111,7 +112,7 @@ throw new AssertionFailedError("Timeout waiting for Platform.exit()"); } - final CountDownLatch exitLatch = PlatformImpl.test_getPlatformExitLatch(); + final CountDownLatch exitLatch = PlatformImplShim.test_getPlatformExitLatch(); Thread.sleep(SLEEP_TIME); // Platform.exit() should not cause FX to exit, while JFXPanel is alive Assert.assertEquals("Platform.exit() caused FX to exit, while JFXPanel is alive", diff --git a/tests/system/src/test/java/com/sun/javafx/application/TaskbarApp1Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp1Test.java rename from tests/system/src/test/java/com/sun/javafx/application/TaskbarApp1Test.java rename to tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp1Test.java --- a/tests/system/src/test/java/com/sun/javafx/application/TaskbarApp1Test.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp1Test.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/TaskbarApp2Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp2Test.java rename from tests/system/src/test/java/com/sun/javafx/application/TaskbarApp2Test.java rename to tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp2Test.java --- a/tests/system/src/test/java/com/sun/javafx/application/TaskbarApp2Test.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp2Test.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/TaskbarApp3Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp3Test.java rename from tests/system/src/test/java/com/sun/javafx/application/TaskbarApp3Test.java rename to tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp3Test.java --- a/tests/system/src/test/java/com/sun/javafx/application/TaskbarApp3Test.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp3Test.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/TaskbarApp4Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp4Test.java rename from tests/system/src/test/java/com/sun/javafx/application/TaskbarApp4Test.java rename to tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp4Test.java --- a/tests/system/src/test/java/com/sun/javafx/application/TaskbarApp4Test.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp4Test.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/TaskbarApp5Test.java b/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp5Test.java rename from tests/system/src/test/java/com/sun/javafx/application/TaskbarApp5Test.java rename to tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp5Test.java --- a/tests/system/src/test/java/com/sun/javafx/application/TaskbarApp5Test.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarApp5Test.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/javafx/application/TaskbarAppCommon.java b/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarAppCommon.java rename from tests/system/src/test/java/com/sun/javafx/application/TaskbarAppCommon.java rename to tests/system/src/test/java/test/com/sun/javafx/application/TaskbarAppCommon.java --- a/tests/system/src/test/java/com/sun/javafx/application/TaskbarAppCommon.java +++ b/tests/system/src/test/java/test/com/sun/javafx/application/TaskbarAppCommon.java @@ -23,15 +23,17 @@ * questions. */ -package com.sun.javafx.application; +package test.com.sun.javafx.application; +import com.sun.javafx.application.PlatformImpl; +import com.sun.javafx.application.PlatformImplShim; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import javafx.application.Platform; import junit.framework.AssertionFailedError; import static org.junit.Assert.*; -import static util.Util.TIMEOUT; +import static test.util.Util.TIMEOUT; /** @@ -61,7 +63,7 @@ throw err; } assertEquals(0, launchLatch.getCount()); - final CountDownLatch exitLatch = PlatformImpl.test_getPlatformExitLatch(); + final CountDownLatch exitLatch = PlatformImplShim.test_getPlatformExitLatch(); assertEquals(1, exitLatch.getCount()); } diff --git a/tests/system/src/test/java/com/sun/javafx/css/StylesheetWithSecurityManagerTest.java b/tests/system/src/test/java/test/com/sun/javafx/css/StylesheetWithSecurityManagerTest.java rename from tests/system/src/test/java/com/sun/javafx/css/StylesheetWithSecurityManagerTest.java rename to tests/system/src/test/java/test/com/sun/javafx/css/StylesheetWithSecurityManagerTest.java --- a/tests/system/src/test/java/com/sun/javafx/css/StylesheetWithSecurityManagerTest.java +++ b/tests/system/src/test/java/test/com/sun/javafx/css/StylesheetWithSecurityManagerTest.java @@ -1,10 +1,11 @@ -package com.sun.javafx.css; +package test.com.sun.javafx.css; import javafx.css.Declaration; import javafx.css.Rule; import javafx.css.Selector; import com.sun.javafx.css.StyleManager; +import com.sun.javafx.css.StyleManager; import javafx.css.Stylesheet; import javafx.collections.FXCollections; import javafx.collections.ObservableList; @@ -99,7 +100,7 @@ public void testRT_38395_the_sequel() throws Exception { System.setSecurityManager(new TestSecurityManager()); - Stylesheet stylesheet = StyleManager.loadStylesheet("com/sun/javafx/css/StylesheetTest.css"); + Stylesheet stylesheet = StyleManager.loadStylesheet("test/com/sun/javafx/css/StylesheetTest.css"); assertNotNull(stylesheet); Color hoverBase = null; diff --git a/tests/system/src/test/java/com/sun/javafx/image/impl/ImageRaceTest.java b/tests/system/src/test/java/test/com/sun/javafx/image/impl/ImageRaceTest.java rename from tests/system/src/test/java/com/sun/javafx/image/impl/ImageRaceTest.java rename to tests/system/src/test/java/test/com/sun/javafx/image/impl/ImageRaceTest.java --- a/tests/system/src/test/java/com/sun/javafx/image/impl/ImageRaceTest.java +++ b/tests/system/src/test/java/test/com/sun/javafx/image/impl/ImageRaceTest.java @@ -23,15 +23,26 @@ * questions. */ -package com.sun.javafx.image.impl; +package test.com.sun.javafx.image.impl; +import com.sun.javafx.image.impl.ByteArgb; +import com.sun.javafx.image.impl.ByteBgr; +import com.sun.javafx.image.impl.ByteBgra; +import com.sun.javafx.image.impl.ByteBgraPre; +import com.sun.javafx.image.impl.ByteGray; +import com.sun.javafx.image.impl.ByteGrayAlpha; +import com.sun.javafx.image.impl.ByteGrayAlphaPre; +import com.sun.javafx.image.impl.ByteRgb; +import com.sun.javafx.image.impl.ByteRgba; +import com.sun.javafx.image.impl.IntArgb; +import com.sun.javafx.image.impl.IntArgbPre; import java.util.ArrayList; import java.util.List; import javafx.application.Application; import javafx.application.Platform; import javafx.stage.Stage; import org.junit.Test; -import static util.Util.TIMEOUT; +import static test.util.Util.TIMEOUT; public class ImageRaceTest extends Application { static boolean verbose; diff --git a/tests/system/src/test/java/com/sun/javafx/sg/prism/RT36296Test.java b/tests/system/src/test/java/test/com/sun/javafx/sg/prism/RT36296Test.java rename from tests/system/src/test/java/com/sun/javafx/sg/prism/RT36296Test.java rename to tests/system/src/test/java/test/com/sun/javafx/sg/prism/RT36296Test.java --- a/tests/system/src/test/java/com/sun/javafx/sg/prism/RT36296Test.java +++ b/tests/system/src/test/java/test/com/sun/javafx/sg/prism/RT36296Test.java @@ -22,7 +22,7 @@ * questions. */ -package com.sun.javafx.sg.prism; +package test.com.sun.javafx.sg.prism; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -42,7 +42,7 @@ import static org.junit.Assert.assertEquals; import org.junit.BeforeClass; import org.junit.Test; -import static util.Util.TIMEOUT; +import static test.util.Util.TIMEOUT; public class RT36296Test { CountDownLatch latch = new CountDownLatch(1); diff --git a/tests/system/src/test/java/com/sun/javafx/tk/quantum/CloseWindowTest.java b/tests/system/src/test/java/test/com/sun/javafx/tk/quantum/CloseWindowTest.java rename from tests/system/src/test/java/com/sun/javafx/tk/quantum/CloseWindowTest.java rename to tests/system/src/test/java/test/com/sun/javafx/tk/quantum/CloseWindowTest.java --- a/tests/system/src/test/java/com/sun/javafx/tk/quantum/CloseWindowTest.java +++ b/tests/system/src/test/java/test/com/sun/javafx/tk/quantum/CloseWindowTest.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.tk.quantum; +package test.com.sun.javafx.tk.quantum; import javafx.application.Application; import javafx.application.Platform; diff --git a/tests/system/src/test/java/com/sun/javafx/tk/quantum/WindowSceneInitDisposeTest.java b/tests/system/src/test/java/test/com/sun/javafx/tk/quantum/WindowSceneInitDisposeTest.java rename from tests/system/src/test/java/com/sun/javafx/tk/quantum/WindowSceneInitDisposeTest.java rename to tests/system/src/test/java/test/com/sun/javafx/tk/quantum/WindowSceneInitDisposeTest.java --- a/tests/system/src/test/java/com/sun/javafx/tk/quantum/WindowSceneInitDisposeTest.java +++ b/tests/system/src/test/java/test/com/sun/javafx/tk/quantum/WindowSceneInitDisposeTest.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.javafx.tk.quantum; +package test.com.sun.javafx.tk.quantum; import javafx.application.Application; import javafx.application.Platform; diff --git a/tests/system/src/test/java/javafx/embed/swing/RT23603Test.java b/tests/system/src/test/java/test/javafx/embed/swing/RT23603Test.java rename from tests/system/src/test/java/javafx/embed/swing/RT23603Test.java rename to tests/system/src/test/java/test/javafx/embed/swing/RT23603Test.java --- a/tests/system/src/test/java/javafx/embed/swing/RT23603Test.java +++ b/tests/system/src/test/java/test/javafx/embed/swing/RT23603Test.java @@ -23,7 +23,7 @@ * questions. */ -package javafx.embed.swing; +package test.javafx.embed.swing; import javafx.application.Platform; import javafx.scene.Scene; @@ -45,6 +45,7 @@ import java.util.concurrent.TimeUnit; import javafx.animation.AnimationTimer; +import javafx.embed.swing.JFXPanel; import junit.framework.Assert; import org.junit.Test; diff --git a/tests/system/src/test/java/javafx/scene/Snapshot1Test.java b/tests/system/src/test/java/test/javafx/scene/Snapshot1Test.java rename from tests/system/src/test/java/javafx/scene/Snapshot1Test.java rename to tests/system/src/test/java/test/javafx/scene/Snapshot1Test.java --- a/tests/system/src/test/java/javafx/scene/Snapshot1Test.java +++ b/tests/system/src/test/java/test/javafx/scene/Snapshot1Test.java @@ -23,12 +23,16 @@ * questions. */ -package javafx.scene; +package test.javafx.scene; import java.util.concurrent.TimeUnit; import java.util.concurrent.CountDownLatch; import javafx.scene.paint.Color; import javafx.application.Platform; +import javafx.scene.Group; +import javafx.scene.Node; +import javafx.scene.Scene; +import javafx.scene.SnapshotResult; import javafx.scene.image.WritableImage; import javafx.scene.shape.Rectangle; import javafx.util.Callback; @@ -38,10 +42,10 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import util.Util; +import test.util.Util; import static org.junit.Assert.*; -import static util.Util.TIMEOUT; +import static test.util.Util.TIMEOUT; /** * Tests for snapshot. diff --git a/tests/system/src/test/java/javafx/scene/Snapshot2Test.java b/tests/system/src/test/java/test/javafx/scene/Snapshot2Test.java rename from tests/system/src/test/java/javafx/scene/Snapshot2Test.java rename to tests/system/src/test/java/test/javafx/scene/Snapshot2Test.java --- a/tests/system/src/test/java/javafx/scene/Snapshot2Test.java +++ b/tests/system/src/test/java/test/javafx/scene/Snapshot2Test.java @@ -23,11 +23,16 @@ * questions. */ -package javafx.scene; +package test.javafx.scene; import java.util.ArrayList; import java.util.Collection; import javafx.geometry.Rectangle2D; +import javafx.scene.Group; +import javafx.scene.Node; +import javafx.scene.Scene; +import javafx.scene.SnapshotParameters; +import javafx.scene.SnapshotResult; import javafx.scene.image.WritableImage; import javafx.scene.shape.Rectangle; import javafx.scene.transform.Transform; @@ -41,7 +46,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import util.Util; +import test.util.Util; import static org.junit.Assert.*; diff --git a/tests/system/src/test/java/javafx/scene/SnapshotCommon.java b/tests/system/src/test/java/test/javafx/scene/SnapshotCommon.java rename from tests/system/src/test/java/javafx/scene/SnapshotCommon.java rename to tests/system/src/test/java/test/javafx/scene/SnapshotCommon.java --- a/tests/system/src/test/java/javafx/scene/SnapshotCommon.java +++ b/tests/system/src/test/java/test/javafx/scene/SnapshotCommon.java @@ -23,22 +23,27 @@ * questions. */ -package javafx.scene; +package test.javafx.scene; -import util.Util; +import test.util.Util; import javafx.scene.image.WritableImage; import javafx.stage.Stage; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import javafx.application.Application; import javafx.application.Platform; +import javafx.scene.Group; +import javafx.scene.Node; +import javafx.scene.Scene; +import javafx.scene.SnapshotParameters; +import javafx.scene.SnapshotResult; import javafx.scene.paint.Color; import javafx.stage.StageStyle; import javafx.util.Callback; import junit.framework.AssertionFailedError; import static org.junit.Assert.*; -import static util.Util.TIMEOUT; +import static test.util.Util.TIMEOUT; /** * Common base class for testing snapshot. diff --git a/tests/system/src/test/java/javafx/scene/text/TextNodeTest.java b/tests/system/src/test/java/test/javafx/scene/text/TextNodeTest.java rename from tests/system/src/test/java/javafx/scene/text/TextNodeTest.java rename to tests/system/src/test/java/test/javafx/scene/text/TextNodeTest.java --- a/tests/system/src/test/java/javafx/scene/text/TextNodeTest.java +++ b/tests/system/src/test/java/test/javafx/scene/text/TextNodeTest.java @@ -23,7 +23,7 @@ * questions. */ -package javafx.scene.text; +package test.javafx.scene.text; import com.sun.javafx.application.PlatformImpl; import java.util.concurrent.CountDownLatch; @@ -33,6 +33,8 @@ import javafx.scene.shape.LineTo; import javafx.scene.shape.MoveTo; import javafx.scene.shape.PathElement; +import javafx.scene.text.Font; +import javafx.scene.text.Text; import org.junit.BeforeClass; import org.junit.Test; diff --git a/tests/system/src/test/java/javafx/stage/NestedEventLoopTest.java b/tests/system/src/test/java/test/javafx/stage/NestedEventLoopTest.java rename from tests/system/src/test/java/javafx/stage/NestedEventLoopTest.java rename to tests/system/src/test/java/test/javafx/stage/NestedEventLoopTest.java --- a/tests/system/src/test/java/javafx/stage/NestedEventLoopTest.java +++ b/tests/system/src/test/java/test/javafx/stage/NestedEventLoopTest.java @@ -23,7 +23,7 @@ * questions. */ -package javafx.stage; +package test.javafx.stage; import java.util.*; import java.util.concurrent.CountDownLatch; @@ -41,6 +41,7 @@ import javafx.scene.control.Alert; import javafx.scene.paint.Color; import javafx.scene.shape.Rectangle; +import javafx.stage.Stage; import javafx.util.Duration; import junit.framework.AssertionFailedError; import org.junit.After; @@ -51,11 +52,11 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import util.Util; +import test.util.Util; import static org.junit.Assert.*; import static org.junit.Assume.*; -import static util.Util.TIMEOUT; +import static test.util.Util.TIMEOUT; /** * Test program for nested event loop functionality. diff --git a/tests/system/src/test/java/javafx/stage/ShowAndWaitTest.java b/tests/system/src/test/java/test/javafx/stage/ShowAndWaitTest.java rename from tests/system/src/test/java/javafx/stage/ShowAndWaitTest.java rename to tests/system/src/test/java/test/javafx/stage/ShowAndWaitTest.java --- a/tests/system/src/test/java/javafx/stage/ShowAndWaitTest.java +++ b/tests/system/src/test/java/test/javafx/stage/ShowAndWaitTest.java @@ -23,8 +23,9 @@ * questions. */ -package javafx.stage; +package test.javafx.stage; +import javafx.stage.StageShim; import java.util.Arrays; import java.util.Collection; import java.util.HashSet; @@ -42,6 +43,10 @@ import javafx.scene.control.Alert; import javafx.scene.paint.Color; import javafx.scene.shape.Rectangle; +import javafx.stage.Modality; +import javafx.stage.Stage; +import javafx.stage.StageShim; +import javafx.stage.Window; import javafx.util.Duration; import junit.framework.AssertionFailedError; import org.junit.After; @@ -52,11 +57,11 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import util.Util; +import test.util.Util; import static org.junit.Assert.*; import static org.junit.Assume.*; -import static util.Util.TIMEOUT; +import static test.util.Util.TIMEOUT; /** * Test program for showAndWait functionality. @@ -211,7 +216,7 @@ assertEquals(0, launchLatch.getCount()); Util.runAndWait(() -> { assertTrue(Platform.isFxApplicationThread()); - assertTrue(myApp.primaryStage.isPrimary()); + assertTrue(StageShim.isPrimary(myApp.primaryStage)); assertFalse(myApp.primaryStage.isShowing()); // Verify that we cannot call showAndWait on the primaryStage @@ -247,7 +252,7 @@ Util.runAndWait(() -> { tmpStage1 = new TestStage(modality); stages.add(tmpStage1); - assertFalse(tmpStage1.isPrimary()); + assertFalse(StageShim.isPrimary(tmpStage1)); assertFalse(tmpStage1.isShowing()); }); assertNotNull(tmpStage1); @@ -263,7 +268,7 @@ Util.runAndWait(() -> { tmpStage1 = new TestStage(modality); stages.add(tmpStage1); - assertFalse(tmpStage1.isPrimary()); + assertFalse(StageShim.isPrimary(tmpStage1)); assertFalse(tmpStage1.isShowing()); tmpStage1.show(); assertTrue(tmpStage1.isShowing()); @@ -288,7 +293,7 @@ Runnable rShow = () -> { tmpStage1 = new TestStage(modality); stages.add(tmpStage1); - assertFalse(tmpStage1.isPrimary()); + assertFalse(StageShim.isPrimary(tmpStage1)); assertFalse(tmpStage1.isShowing()); tmpStage1.show(); stageShowReturned.set(true); @@ -324,7 +329,7 @@ Runnable rShow1 = () -> { tmpStage1 = new TestStage(modality); stages.add(tmpStage1); - assertFalse(tmpStage1.isPrimary()); + assertFalse(StageShim.isPrimary(tmpStage1)); assertFalse(tmpStage1.isShowing()); tmpStage1.showAndWait(); stage1ShowReturned.set(true); @@ -368,7 +373,7 @@ Runnable rShow1 = () -> { tmpStage1 = new TestStage(modality); stages.add(tmpStage1); - assertFalse(tmpStage1.isPrimary()); + assertFalse(StageShim.isPrimary(tmpStage1)); assertFalse(tmpStage1.isShowing()); tmpStage1.showAndWait(); stage1ShowReturned.set(true); @@ -409,7 +414,7 @@ Runnable rShow1 = () -> { tmpStage1 = new TestStage(modality); stages.add(tmpStage1); - assertFalse(tmpStage1.isPrimary()); + assertFalse(StageShim.isPrimary(tmpStage1)); assertFalse(tmpStage1.isShowing()); tmpStage1.showAndWait(); stage1ShowReturned.set(true); @@ -422,7 +427,7 @@ Runnable rShow2 = () -> { tmpStage2 = new TestStage(modality); stages.add(tmpStage2); - assertFalse(tmpStage2.isPrimary()); + assertFalse(StageShim.isPrimary(tmpStage2)); assertFalse(tmpStage2.isShowing()); tmpStage2.showAndWait(); stage2ShowReturned.set(true); @@ -474,7 +479,7 @@ Runnable rShow1 = () -> { tmpStage1 = new TestStage(modality); stages.add(tmpStage1); - assertFalse(tmpStage1.isPrimary()); + assertFalse(StageShim.isPrimary(tmpStage1)); assertFalse(tmpStage1.isShowing()); tmpStage1.showAndWait(); stage1ShowReturned.set(true); @@ -487,7 +492,7 @@ Runnable rShow2 = () -> { tmpStage2 = new TestStage(modality); stages.add(tmpStage2); - assertFalse(tmpStage2.isPrimary()); + assertFalse(StageShim.isPrimary(tmpStage2)); assertFalse(tmpStage2.isShowing()); tmpStage2.showAndWait(); stage2ShowReturned.set(true); @@ -668,7 +673,7 @@ try { tmpStage1 = new TestStage(modality); stages.add(tmpStage1); - assertFalse(tmpStage1.isPrimary()); + assertFalse(StageShim.isPrimary(tmpStage1)); assertFalse(tmpStage1.isShowing()); try { tmpStage1.showAndWait(); diff --git a/tests/system/src/test/java/launchertest/Constants.java b/tests/system/src/test/java/test/launchertest/Constants.java rename from tests/system/src/test/java/launchertest/Constants.java rename to tests/system/src/test/java/test/launchertest/Constants.java --- a/tests/system/src/test/java/launchertest/Constants.java +++ b/tests/system/src/test/java/test/launchertest/Constants.java @@ -23,7 +23,7 @@ * questions. */ -package launchertest; +package test.launchertest; public class Constants { diff --git a/tests/system/src/test/java/launchertest/MainLauncherTest.java b/tests/system/src/test/java/test/launchertest/MainLauncherTest.java rename from tests/system/src/test/java/launchertest/MainLauncherTest.java rename to tests/system/src/test/java/test/launchertest/MainLauncherTest.java --- a/tests/system/src/test/java/launchertest/MainLauncherTest.java +++ b/tests/system/src/test/java/test/launchertest/MainLauncherTest.java @@ -23,7 +23,7 @@ * questions. */ -package launchertest; +package test.launchertest; import com.sun.javafx.PlatformUtil; import java.util.ArrayList; @@ -34,7 +34,7 @@ import org.junit.runners.Parameterized; import org.junit.Test; -import static launchertest.Constants.*; +import static test.launchertest.Constants.*; import static org.junit.Assume.*; /** diff --git a/tests/system/src/test/java/launchertest/TestApp.java b/tests/system/src/test/java/test/launchertest/TestApp.java rename from tests/system/src/test/java/launchertest/TestApp.java rename to tests/system/src/test/java/test/launchertest/TestApp.java --- a/tests/system/src/test/java/launchertest/TestApp.java +++ b/tests/system/src/test/java/test/launchertest/TestApp.java @@ -23,13 +23,13 @@ * questions. */ -package launchertest; +package test.launchertest; import javafx.application.Application; import javafx.application.Platform; import javafx.stage.Stage; -import static launchertest.Constants.*; +import static test.launchertest.Constants.*; /** * Test application with no main method. This is launched by MainLauncherTest. diff --git a/tests/system/src/test/java/launchertest/TestAppCCL.java b/tests/system/src/test/java/test/launchertest/TestAppCCL.java rename from tests/system/src/test/java/launchertest/TestAppCCL.java rename to tests/system/src/test/java/test/launchertest/TestAppCCL.java --- a/tests/system/src/test/java/launchertest/TestAppCCL.java +++ b/tests/system/src/test/java/test/launchertest/TestAppCCL.java @@ -23,7 +23,7 @@ * questions. */ -package launchertest; +package test.launchertest; import java.net.URL; import java.net.URLClassLoader; @@ -31,7 +31,7 @@ import javafx.application.Platform; import javafx.stage.Stage; -import static launchertest.Constants.*; +import static test.launchertest.Constants.*; /** * Test application with main method. This is launched by MainLauncherTest. diff --git a/tests/system/src/test/java/launchertest/TestAppCCL1.java b/tests/system/src/test/java/test/launchertest/TestAppCCL1.java rename from tests/system/src/test/java/launchertest/TestAppCCL1.java rename to tests/system/src/test/java/test/launchertest/TestAppCCL1.java --- a/tests/system/src/test/java/launchertest/TestAppCCL1.java +++ b/tests/system/src/test/java/test/launchertest/TestAppCCL1.java @@ -23,7 +23,7 @@ * questions. */ -package launchertest; +package test.launchertest; import java.net.URL; import java.net.URLClassLoader; @@ -31,7 +31,7 @@ import javafx.application.Platform; import javafx.stage.Stage; -import static launchertest.Constants.*; +import static test.launchertest.Constants.*; /** * Test application with main method. This is launched by MainLauncherTest. diff --git a/tests/system/src/test/java/launchertest/TestAppCCL2.java b/tests/system/src/test/java/test/launchertest/TestAppCCL2.java rename from tests/system/src/test/java/launchertest/TestAppCCL2.java rename to tests/system/src/test/java/test/launchertest/TestAppCCL2.java --- a/tests/system/src/test/java/launchertest/TestAppCCL2.java +++ b/tests/system/src/test/java/test/launchertest/TestAppCCL2.java @@ -23,7 +23,7 @@ * questions. */ -package launchertest; +package test.launchertest; import java.net.URL; import java.net.URLClassLoader; @@ -31,7 +31,7 @@ import javafx.application.Platform; import javafx.stage.Stage; -import static launchertest.Constants.*; +import static test.launchertest.Constants.*; /** * Test application with main method. This is launched by MainLauncherTest. diff --git a/tests/system/src/test/java/launchertest/TestAppNoMain.java b/tests/system/src/test/java/test/launchertest/TestAppNoMain.java rename from tests/system/src/test/java/launchertest/TestAppNoMain.java rename to tests/system/src/test/java/test/launchertest/TestAppNoMain.java --- a/tests/system/src/test/java/launchertest/TestAppNoMain.java +++ b/tests/system/src/test/java/test/launchertest/TestAppNoMain.java @@ -23,13 +23,13 @@ * questions. */ -package launchertest; +package test.launchertest; import javafx.application.Application; import javafx.application.Platform; import javafx.stage.Stage; -import static launchertest.Constants.*; +import static test.launchertest.Constants.*; /** * Test application with no main method. This is launched by MainLauncherTest. diff --git a/tests/system/src/test/java/launchertest/TestAppNoMainCCL.java b/tests/system/src/test/java/test/launchertest/TestAppNoMainCCL.java rename from tests/system/src/test/java/launchertest/TestAppNoMainCCL.java rename to tests/system/src/test/java/test/launchertest/TestAppNoMainCCL.java --- a/tests/system/src/test/java/launchertest/TestAppNoMainCCL.java +++ b/tests/system/src/test/java/test/launchertest/TestAppNoMainCCL.java @@ -23,7 +23,7 @@ * questions. */ -package launchertest; +package test.launchertest; import java.net.URL; import java.net.URLClassLoader; @@ -31,7 +31,7 @@ import javafx.application.Platform; import javafx.stage.Stage; -import static launchertest.Constants.*; +import static test.launchertest.Constants.*; /** * Test application with no main method. This is launched by MainLauncherTest. diff --git a/tests/system/src/test/java/launchertest/TestAppNoMainCCL2.java b/tests/system/src/test/java/test/launchertest/TestAppNoMainCCL2.java rename from tests/system/src/test/java/launchertest/TestAppNoMainCCL2.java rename to tests/system/src/test/java/test/launchertest/TestAppNoMainCCL2.java --- a/tests/system/src/test/java/launchertest/TestAppNoMainCCL2.java +++ b/tests/system/src/test/java/test/launchertest/TestAppNoMainCCL2.java @@ -23,7 +23,7 @@ * questions. */ -package launchertest; +package test.launchertest; import java.net.URL; import java.net.URLClassLoader; @@ -31,7 +31,7 @@ import javafx.application.Platform; import javafx.stage.Stage; -import static launchertest.Constants.*; +import static test.launchertest.Constants.*; /** * Test application with no main method. This is launched by MainLauncherTest. diff --git a/tests/system/src/test/java/launchertest/TestAppNoMainCCL3.java b/tests/system/src/test/java/test/launchertest/TestAppNoMainCCL3.java rename from tests/system/src/test/java/launchertest/TestAppNoMainCCL3.java rename to tests/system/src/test/java/test/launchertest/TestAppNoMainCCL3.java --- a/tests/system/src/test/java/launchertest/TestAppNoMainCCL3.java +++ b/tests/system/src/test/java/test/launchertest/TestAppNoMainCCL3.java @@ -23,7 +23,7 @@ * questions. */ -package launchertest; +package test.launchertest; import com.sun.javafx.application.PlatformImpl; import java.net.URL; @@ -32,7 +32,7 @@ import javafx.application.Platform; import javafx.stage.Stage; -import static launchertest.Constants.*; +import static test.launchertest.Constants.*; /** * Test application with no main method. This is launched by MainLauncherTest. diff --git a/tests/system/src/test/java/launchertest/TestAppNoMainThreadCheck.java b/tests/system/src/test/java/test/launchertest/TestAppNoMainThreadCheck.java rename from tests/system/src/test/java/launchertest/TestAppNoMainThreadCheck.java rename to tests/system/src/test/java/test/launchertest/TestAppNoMainThreadCheck.java --- a/tests/system/src/test/java/launchertest/TestAppNoMainThreadCheck.java +++ b/tests/system/src/test/java/test/launchertest/TestAppNoMainThreadCheck.java @@ -23,13 +23,13 @@ * questions. */ -package launchertest; +package test.launchertest; import javafx.application.Application; import javafx.application.Platform; import javafx.stage.Stage; -import static launchertest.Constants.*; +import static test.launchertest.Constants.*; /** * Test application with no main method. This is launched by MainLauncherTest. diff --git a/tests/system/src/test/java/launchertest/TestAppThreadCheck.java b/tests/system/src/test/java/test/launchertest/TestAppThreadCheck.java rename from tests/system/src/test/java/launchertest/TestAppThreadCheck.java rename to tests/system/src/test/java/test/launchertest/TestAppThreadCheck.java --- a/tests/system/src/test/java/launchertest/TestAppThreadCheck.java +++ b/tests/system/src/test/java/test/launchertest/TestAppThreadCheck.java @@ -23,13 +23,13 @@ * questions. */ -package launchertest; +package test.launchertest; import javafx.application.Application; import javafx.application.Platform; import javafx.stage.Stage; -import static launchertest.Constants.*; +import static test.launchertest.Constants.*; /** * Test application with no main method. This is launched by MainLauncherTest. diff --git a/tests/system/src/test/java/launchertest/TestHeadlessApp.java b/tests/system/src/test/java/test/launchertest/TestHeadlessApp.java rename from tests/system/src/test/java/launchertest/TestHeadlessApp.java rename to tests/system/src/test/java/test/launchertest/TestHeadlessApp.java --- a/tests/system/src/test/java/launchertest/TestHeadlessApp.java +++ b/tests/system/src/test/java/test/launchertest/TestHeadlessApp.java @@ -23,11 +23,11 @@ * questions. */ -package launchertest; +package test.launchertest; import javafx.application.Application; -import static launchertest.Constants.*; +import static test.launchertest.Constants.*; /** * Headless test of ordinary Java class without extending Application. diff --git a/tests/system/src/test/java/launchertest/TestNotApplication.java b/tests/system/src/test/java/test/launchertest/TestNotApplication.java rename from tests/system/src/test/java/launchertest/TestNotApplication.java rename to tests/system/src/test/java/test/launchertest/TestNotApplication.java --- a/tests/system/src/test/java/launchertest/TestNotApplication.java +++ b/tests/system/src/test/java/test/launchertest/TestNotApplication.java @@ -23,12 +23,12 @@ * questions. */ -package launchertest; +package test.launchertest; import javafx.application.Application; import javafx.application.Platform; -import static launchertest.Constants.*; +import static test.launchertest.Constants.*; /** * Test ordinary Java class without extending Application. This is launched by MainLauncherTest. diff --git a/tests/system/src/test/java/launchertest/TestNotApplicationCCL.java b/tests/system/src/test/java/test/launchertest/TestNotApplicationCCL.java rename from tests/system/src/test/java/launchertest/TestNotApplicationCCL.java rename to tests/system/src/test/java/test/launchertest/TestNotApplicationCCL.java --- a/tests/system/src/test/java/launchertest/TestNotApplicationCCL.java +++ b/tests/system/src/test/java/test/launchertest/TestNotApplicationCCL.java @@ -23,14 +23,14 @@ * questions. */ -package launchertest; +package test.launchertest; import java.net.URL; import java.net.URLClassLoader; import javafx.application.Application; import javafx.application.Platform; -import static launchertest.Constants.*; +import static test.launchertest.Constants.*; /** * Test ordinary Java class without extending Application. This is launched by MainLauncherTest. diff --git a/tests/system/src/test/java/launchertest/TestNotApplicationCCLApp.java b/tests/system/src/test/java/test/launchertest/TestNotApplicationCCLApp.java rename from tests/system/src/test/java/launchertest/TestNotApplicationCCLApp.java rename to tests/system/src/test/java/test/launchertest/TestNotApplicationCCLApp.java --- a/tests/system/src/test/java/launchertest/TestNotApplicationCCLApp.java +++ b/tests/system/src/test/java/test/launchertest/TestNotApplicationCCLApp.java @@ -23,7 +23,7 @@ * questions. */ -package launchertest; +package test.launchertest; import java.net.URL; import java.net.URLClassLoader; @@ -31,7 +31,7 @@ import javafx.application.Platform; import javafx.stage.Stage; -import static launchertest.Constants.*; +import static test.launchertest.Constants.*; /** * Test application with no main method. This is launched by MainLauncherTest. diff --git a/tests/system/src/test/java/launchertest/TestNotApplicationThreadCheck.java b/tests/system/src/test/java/test/launchertest/TestNotApplicationThreadCheck.java rename from tests/system/src/test/java/launchertest/TestNotApplicationThreadCheck.java rename to tests/system/src/test/java/test/launchertest/TestNotApplicationThreadCheck.java --- a/tests/system/src/test/java/launchertest/TestNotApplicationThreadCheck.java +++ b/tests/system/src/test/java/test/launchertest/TestNotApplicationThreadCheck.java @@ -23,12 +23,12 @@ * questions. */ -package launchertest; +package test.launchertest; import javafx.application.Application; import javafx.application.Platform; -import static launchertest.Constants.*; +import static test.launchertest.Constants.*; /** * Test ordinary Java class without extending Application. This is launched by MainLauncherTest. diff --git a/tests/system/src/test/java/launchertest/TestPreloader.java b/tests/system/src/test/java/test/launchertest/TestPreloader.java rename from tests/system/src/test/java/launchertest/TestPreloader.java rename to tests/system/src/test/java/test/launchertest/TestPreloader.java --- a/tests/system/src/test/java/launchertest/TestPreloader.java +++ b/tests/system/src/test/java/test/launchertest/TestPreloader.java @@ -23,14 +23,14 @@ * questions. */ -package launchertest; +package test.launchertest; import javafx.application.Application; import javafx.application.Platform; import javafx.application.Preloader; import javafx.stage.Stage; -import static launchertest.Constants.*; +import static test.launchertest.Constants.*; /** * Test application with no main method. This is launched by MainLauncherTest. diff --git a/tests/system/src/test/java/launchertest/TestStartupApp1.java b/tests/system/src/test/java/test/launchertest/TestStartupApp1.java rename from tests/system/src/test/java/launchertest/TestStartupApp1.java rename to tests/system/src/test/java/test/launchertest/TestStartupApp1.java --- a/tests/system/src/test/java/launchertest/TestStartupApp1.java +++ b/tests/system/src/test/java/test/launchertest/TestStartupApp1.java @@ -23,13 +23,13 @@ * questions. */ -package launchertest; +package test.launchertest; import javafx.application.Application; import javafx.application.Platform; import javafx.stage.Stage; -import static launchertest.Constants.*; +import static test.launchertest.Constants.*; /** * Test Platform.startup from FX application. diff --git a/tests/system/src/test/java/launchertest/TestStartupApp2.java b/tests/system/src/test/java/test/launchertest/TestStartupApp2.java rename from tests/system/src/test/java/launchertest/TestStartupApp2.java rename to tests/system/src/test/java/test/launchertest/TestStartupApp2.java --- a/tests/system/src/test/java/launchertest/TestStartupApp2.java +++ b/tests/system/src/test/java/test/launchertest/TestStartupApp2.java @@ -23,13 +23,13 @@ * questions. */ -package launchertest; +package test.launchertest; import javafx.application.Application; import javafx.application.Platform; import javafx.stage.Stage; -import static launchertest.Constants.*; +import static test.launchertest.Constants.*; /** * Test Platform.startup from FX application. diff --git a/tests/system/src/test/java/launchertest/TestStartupAppNoMain.java b/tests/system/src/test/java/test/launchertest/TestStartupAppNoMain.java rename from tests/system/src/test/java/launchertest/TestStartupAppNoMain.java rename to tests/system/src/test/java/test/launchertest/TestStartupAppNoMain.java --- a/tests/system/src/test/java/launchertest/TestStartupAppNoMain.java +++ b/tests/system/src/test/java/test/launchertest/TestStartupAppNoMain.java @@ -23,13 +23,13 @@ * questions. */ -package launchertest; +package test.launchertest; import javafx.application.Application; import javafx.application.Platform; import javafx.stage.Stage; -import static launchertest.Constants.*; +import static test.launchertest.Constants.*; /** * Test Platform.startup from application with no main method. diff --git a/tests/system/src/test/java/launchertest/TestStartupJFXPanel.java b/tests/system/src/test/java/test/launchertest/TestStartupJFXPanel.java rename from tests/system/src/test/java/launchertest/TestStartupJFXPanel.java rename to tests/system/src/test/java/test/launchertest/TestStartupJFXPanel.java --- a/tests/system/src/test/java/launchertest/TestStartupJFXPanel.java +++ b/tests/system/src/test/java/test/launchertest/TestStartupJFXPanel.java @@ -23,12 +23,12 @@ * questions. */ -package launchertest; +package test.launchertest; import javafx.application.Platform; import javafx.embed.swing.JFXPanel; -import static launchertest.Constants.*; +import static test.launchertest.Constants.*; /** * Test Platform.startup from class that is not an Application. diff --git a/tests/system/src/test/java/launchertest/TestStartupNotApplication.java b/tests/system/src/test/java/test/launchertest/TestStartupNotApplication.java rename from tests/system/src/test/java/launchertest/TestStartupNotApplication.java rename to tests/system/src/test/java/test/launchertest/TestStartupNotApplication.java --- a/tests/system/src/test/java/launchertest/TestStartupNotApplication.java +++ b/tests/system/src/test/java/test/launchertest/TestStartupNotApplication.java @@ -23,14 +23,14 @@ * questions. */ -package launchertest; +package test.launchertest; import java.util.ArrayList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Semaphore; import javafx.application.Platform; -import static launchertest.Constants.*; +import static test.launchertest.Constants.*; /** * Test Platform.startup from class that is not an Application. diff --git a/tests/system/src/test/java/renderlock/RenderLock1Test.java b/tests/system/src/test/java/test/renderlock/RenderLock1Test.java rename from tests/system/src/test/java/renderlock/RenderLock1Test.java rename to tests/system/src/test/java/test/renderlock/RenderLock1Test.java --- a/tests/system/src/test/java/renderlock/RenderLock1Test.java +++ b/tests/system/src/test/java/test/renderlock/RenderLock1Test.java @@ -23,7 +23,7 @@ * questions. */ -package renderlock; +package test.renderlock; import org.junit.Test; diff --git a/tests/system/src/test/java/renderlock/RenderLockCommon.java b/tests/system/src/test/java/test/renderlock/RenderLockCommon.java rename from tests/system/src/test/java/renderlock/RenderLockCommon.java rename to tests/system/src/test/java/test/renderlock/RenderLockCommon.java --- a/tests/system/src/test/java/renderlock/RenderLockCommon.java +++ b/tests/system/src/test/java/test/renderlock/RenderLockCommon.java @@ -23,7 +23,7 @@ * questions. */ -package renderlock; +package test.renderlock; import com.sun.javafx.PlatformUtil; import java.util.concurrent.CountDownLatch; @@ -46,11 +46,11 @@ import junit.framework.AssertionFailedError; import org.junit.AfterClass; import org.junit.BeforeClass; -import util.Util; +import test.util.Util; import static org.junit.Assert.*; import static org.junit.Assume.*; -import static util.Util.TIMEOUT; +import static test.util.Util.TIMEOUT; /** * Common base class for testing snapshot. diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/CreateDeviceTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/CreateDeviceTest.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/CreateDeviceTest.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/CreateDeviceTest.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/CreateDeviceTest.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/CreateDeviceTest.java @@ -23,8 +23,10 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; +import com.sun.glass.ui.monocle.TestLog; +import test.robot.com.sun.glass.ui.monocle.TestApplication; import javafx.geometry.Rectangle2D; import javafx.stage.Screen; import org.junit.After; diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/DoubleClickTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/DoubleClickTest.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/DoubleClickTest.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/DoubleClickTest.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/DoubleClickTest.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/DoubleClickTest.java @@ -23,10 +23,12 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevice; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevices; +import com.sun.glass.ui.monocle.TestLog; +import test.robot.com.sun.glass.ui.monocle.TestApplication; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices; import org.junit.Test; import org.junit.runners.Parameterized; diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/DragAndDropTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/DragAndDropTest.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/DragAndDropTest.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/DragAndDropTest.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/DragAndDropTest.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/DragAndDropTest.java @@ -1,4 +1,4 @@ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; /* * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -25,8 +25,10 @@ * questions. */ -import com.sun.glass.ui.monocle.input.devices.TestTouchDevice; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevices; +import com.sun.glass.ui.monocle.TestLog; +import test.robot.com.sun.glass.ui.monocle.TestApplication; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices; import javafx.scene.Node; import javafx.scene.input.ClipboardContent; import javafx.scene.input.Dragboard; @@ -37,6 +39,7 @@ import org.junit.runners.Parameterized; import java.util.Collection; +import test.com.sun.glass.ui.monocle.TestRunnable; public class DragAndDropTest extends ParameterizedTestBase { diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/DragTouchInAndOutAWindowTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/DragTouchInAndOutAWindowTest.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/DragTouchInAndOutAWindowTest.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/DragTouchInAndOutAWindowTest.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/DragTouchInAndOutAWindowTest.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/DragTouchInAndOutAWindowTest.java @@ -23,10 +23,12 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevice; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevices; +import com.sun.glass.ui.monocle.TestLog; +import test.robot.com.sun.glass.ui.monocle.TestApplication; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices; import javafx.geometry.Rectangle2D; import javafx.stage.Stage; import org.junit.Assert; @@ -37,6 +39,7 @@ import org.junit.runners.Parameterized; import java.util.Collection; +import test.com.sun.glass.ui.monocle.TestRunnable; /** * This is a regression test for RT-33771 - Lens:FXML-LoginDemo throws diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/FuzzyTapTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/FuzzyTapTest.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/FuzzyTapTest.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/FuzzyTapTest.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/FuzzyTapTest.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/FuzzyTapTest.java @@ -23,10 +23,12 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevice; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevices; +import com.sun.glass.ui.monocle.TestLog; +import test.robot.com.sun.glass.ui.monocle.ParameterizedTestBase; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices; import org.junit.Assert; import org.junit.Test; import org.junit.runners.Parameterized; diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/InputDevicePropertyTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/InputDevicePropertyTest.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/InputDevicePropertyTest.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/InputDevicePropertyTest.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/InputDevicePropertyTest.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/InputDevicePropertyTest.java @@ -23,10 +23,11 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevice; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevices; +import test.robot.com.sun.glass.ui.monocle.TestApplication; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices; import javafx.application.ConditionalFeature; import javafx.application.Platform; import junit.framework.Assert; @@ -36,6 +37,7 @@ import org.junit.runners.Parameterized; import java.util.Collection; +import test.com.sun.glass.ui.monocle.TestRunnable; public class InputDevicePropertyTest extends ParameterizedTestBase { diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/ModalDialogTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ModalDialogTest.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/ModalDialogTest.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ModalDialogTest.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/ModalDialogTest.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ModalDialogTest.java @@ -23,9 +23,10 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; -import javafx.application.Application; +import com.sun.glass.ui.monocle.TestLog; +import test.robot.com.sun.glass.ui.monocle.TestApplication; import javafx.application.Platform; import javafx.scene.Group; import javafx.scene.Scene; @@ -36,7 +37,6 @@ import org.junit.*; import org.junit.rules.TestName; -import java.util.concurrent.CountDownLatch; public class ModalDialogTest { diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/MonocleApplicationTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MonocleApplicationTest.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/MonocleApplicationTest.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MonocleApplicationTest.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/MonocleApplicationTest.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MonocleApplicationTest.java @@ -22,13 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; +import test.robot.com.sun.glass.ui.monocle.TestApplication; import com.sun.glass.events.KeyEvent; -import com.sun.glass.ui.Application; +import com.sun.glass.ui.monocle.MonocleApplicationShim; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; +import test.com.sun.glass.ui.monocle.TestRunnable; public class MonocleApplicationTest { @@ -135,12 +137,10 @@ TestApplication.getStage(); Assume.assumeTrue(TestApplication.isMonocle()); TestRunnable.invokeAndWait(() -> { - MonocleApplication app = (MonocleApplication) - Application.GetApplication(); for (int i = 0; i < TEST_CASES.length; i++) { char ch = (char) TEST_CASES[i][0]; int expectedCode = TEST_CASES[i][1]; - int code = app._getKeyCodeForChar(ch); + int code = MonocleApplicationShim._getKeyCodeForChar(ch); Assert.assertEquals("Code for character " + ((int) ch) + " ('" + ch + "')", expectedCode, code); diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/MonocleUInput.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MonocleUInput.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/MonocleUInput.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MonocleUInput.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/MonocleUInput.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MonocleUInput.java @@ -23,9 +23,11 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; +import test.robot.com.sun.glass.ui.monocle.TestApplication; import com.sun.glass.ui.Application; +import com.sun.glass.ui.monocle.LinuxInputDeviceRegistryShim; import javafx.application.Platform; import java.io.IOException; @@ -33,17 +35,15 @@ import java.nio.channels.Pipe; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicReference; +import test.com.sun.glass.ui.monocle.NativeUInput; class MonocleUInput extends NativeUInput { private Pipe pipe; - private LinuxInputDevice device; - private final LinuxInputDeviceRegistry registry; + private LinuxInputDeviceRegistryShim.LinuxInputDeviceShim device; MonocleUInput() { super(); - registry = (LinuxInputDeviceRegistry) - NativePlatformFactory.getNativePlatform().getInputDeviceRegistry(); } @Override @@ -58,13 +58,13 @@ + Integer.toHexString(vendor) + "/" + Integer.toHexString(product) + "/" + Integer.toHexString(version)); - Application.invokeAndWait(() -> device = registry.addDevice( - new LinuxInputDevice(capabilities, - createAbsCapsMap(), - pipe.source(), - udevManifest, - uevent), - "Simulated Linux Input Device")); + Application.invokeAndWait(() -> device + = LinuxInputDeviceRegistryShim.addDevice(capabilities, + absCaps, + pipe.source(), + udevManifest, + uevent, + "Simulated Linux Input Device")); } protected void openConnection() { @@ -86,13 +86,13 @@ } pipe = null; if (device != null) { - final LinuxInputDevice d = device; + final LinuxInputDeviceRegistryShim.LinuxInputDeviceShim d = device; if (Platform.isFxApplicationThread()) { - registry.removeDevice(d); + LinuxInputDeviceRegistryShim.removeDevice(d); } else { CountDownLatch latch = new CountDownLatch(1); Platform.runLater(() -> { - registry.removeDevice(d); + LinuxInputDeviceRegistryShim.removeDevice(d); latch.countDown(); }); try { diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/MouseLagTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MouseLagTest.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/MouseLagTest.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MouseLagTest.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/MouseLagTest.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MouseLagTest.java @@ -23,8 +23,10 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; +import com.sun.glass.ui.monocle.TestLog; +import test.robot.com.sun.glass.ui.monocle.TestApplication; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/MultiTouch2Test.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MultiTouch2Test.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/MultiTouch2Test.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MultiTouch2Test.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/MultiTouch2Test.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MultiTouch2Test.java @@ -23,10 +23,12 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevice; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevices; +import com.sun.glass.ui.monocle.TestLog; +import test.robot.com.sun.glass.ui.monocle.ParameterizedTestBase; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices; import org.junit.Test; import org.junit.runners.Parameterized; diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/MultiTouch3Test.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MultiTouch3Test.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/MultiTouch3Test.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MultiTouch3Test.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/MultiTouch3Test.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/MultiTouch3Test.java @@ -23,10 +23,12 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevice; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevices; +import com.sun.glass.ui.monocle.TestLog; +import test.robot.com.sun.glass.ui.monocle.ParameterizedTestBase; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices; import org.junit.Test; import org.junit.runners.Parameterized; diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/ParameterizedTestBase.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ParameterizedTestBase.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/ParameterizedTestBase.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ParameterizedTestBase.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/ParameterizedTestBase.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ParameterizedTestBase.java @@ -23,9 +23,11 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevice; +import com.sun.glass.ui.monocle.TestLog; +import test.robot.com.sun.glass.ui.monocle.TestApplication; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice; import javafx.application.Platform; import javafx.geometry.Rectangle2D; import org.junit.After; diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/RapidTapTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/RapidTapTest.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/RapidTapTest.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/RapidTapTest.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/RapidTapTest.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/RapidTapTest.java @@ -23,10 +23,12 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevice; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevices; +import com.sun.glass.ui.monocle.TestLog; +import test.robot.com.sun.glass.ui.monocle.TestApplication; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices; import javafx.animation.AnimationTimer; import javafx.application.Platform; import org.junit.Assert; @@ -35,6 +37,7 @@ import java.util.Collection; import java.util.concurrent.CountDownLatch; +import test.com.sun.glass.ui.monocle.TestRunnable; public class RapidTapTest extends ParameterizedTestBase { diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/RobotTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/RobotTest.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/RobotTest.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/RobotTest.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/RobotTest.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/RobotTest.java @@ -23,8 +23,9 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; +import com.sun.glass.ui.monocle.TestLog; import com.sun.glass.events.KeyEvent; import com.sun.glass.ui.Application; import com.sun.glass.ui.Robot; diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/RotateTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/RotateTest.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/RotateTest.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/RotateTest.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/RotateTest.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/RotateTest.java @@ -23,11 +23,12 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevice; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevices; -import com.sun.javafx.PlatformUtil; +import com.sun.glass.ui.monocle.TestLog; +import test.robot.com.sun.glass.ui.monocle.ParameterizedTestBase; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices; import org.junit.After; import org.junit.Assert; import org.junit.Assume; diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/ScrollTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ScrollTest.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/ScrollTest.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ScrollTest.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/ScrollTest.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ScrollTest.java @@ -23,9 +23,11 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevice; +import com.sun.glass.ui.monocle.TestLog; +import test.robot.com.sun.glass.ui.monocle.ScrollTestBase; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/ScrollTestBase.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ScrollTestBase.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/ScrollTestBase.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ScrollTestBase.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/ScrollTestBase.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ScrollTestBase.java @@ -23,10 +23,12 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevice; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevices; +import com.sun.glass.ui.monocle.TestLog; +import test.robot.com.sun.glass.ui.monocle.TestApplication; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices; import org.junit.After; import org.junit.Assert; import org.junit.Assume; diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/ScrollThresholdTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ScrollThresholdTest.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/ScrollThresholdTest.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ScrollThresholdTest.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/ScrollThresholdTest.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ScrollThresholdTest.java @@ -23,10 +23,10 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevice; -import com.sun.javafx.PlatformUtil; +import test.robot.com.sun.glass.ui.monocle.ScrollTestBase; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice; import org.junit.Assume; import org.junit.Before; import org.junit.BeforeClass; diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/SimpleMouseTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SimpleMouseTest.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/SimpleMouseTest.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SimpleMouseTest.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/SimpleMouseTest.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SimpleMouseTest.java @@ -23,8 +23,10 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; +import com.sun.glass.ui.monocle.TestLog; +import test.robot.com.sun.glass.ui.monocle.TestApplication; import javafx.geometry.Rectangle2D; import javafx.stage.Screen; import org.junit.After; @@ -34,6 +36,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestName; +import test.com.sun.glass.ui.monocle.TestRunnable; public class SimpleMouseTest { diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/SingleTouchNonFullScreenTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SingleTouchNonFullScreenTest.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/SingleTouchNonFullScreenTest.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SingleTouchNonFullScreenTest.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/SingleTouchNonFullScreenTest.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SingleTouchNonFullScreenTest.java @@ -23,10 +23,12 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevice; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevices; +import com.sun.glass.ui.monocle.TestLog; +import test.robot.com.sun.glass.ui.monocle.TestApplication; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices; import javafx.geometry.Rectangle2D; import javafx.scene.input.TouchEvent; import org.junit.*; diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/SingleTouchTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SingleTouchTest.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/SingleTouchTest.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SingleTouchTest.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/SingleTouchTest.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SingleTouchTest.java @@ -23,10 +23,12 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevice; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevices; +import com.sun.glass.ui.monocle.TestLog; +import test.robot.com.sun.glass.ui.monocle.TestApplication; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices; import javafx.scene.Group; import javafx.scene.Scene; import javafx.scene.shape.Rectangle; @@ -37,6 +39,7 @@ import org.junit.runners.Parameterized; import java.util.Collection; +import test.com.sun.glass.ui.monocle.TestRunnable; public class SingleTouchTest extends ParameterizedTestBase { diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/SwipeSimpleTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SwipeSimpleTest.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/SwipeSimpleTest.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SwipeSimpleTest.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/SwipeSimpleTest.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SwipeSimpleTest.java @@ -23,10 +23,12 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevice; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevices; +import com.sun.glass.ui.monocle.TestLog; +import test.robot.com.sun.glass.ui.monocle.TestApplication; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices; import javafx.scene.input.GestureEvent; import org.junit.*; import org.junit.runners.Parameterized; diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/SwipeTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SwipeTest.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/SwipeTest.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SwipeTest.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/SwipeTest.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/SwipeTest.java @@ -23,10 +23,12 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevice; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevices; +import com.sun.glass.ui.monocle.TestLog; +import test.robot.com.sun.glass.ui.monocle.TestApplication; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices; import com.sun.javafx.PlatformUtil; import javafx.scene.input.GestureEvent; import org.junit.Assert; @@ -42,6 +44,7 @@ import java.util.Timer; import java.util.TimerTask; import java.util.concurrent.CountDownLatch; +import test.com.sun.glass.ui.monocle.TestRunnable; public class SwipeTest extends ParameterizedTestBase { diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/TestApplication.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TestApplication.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/TestApplication.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TestApplication.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/TestApplication.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TestApplication.java @@ -23,9 +23,11 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; +import com.sun.glass.ui.monocle.TestLog; import com.sun.glass.ui.Robot; +import com.sun.glass.ui.monocle.TouchInputShim; import javafx.animation.AnimationTimer; import javafx.application.Application; import javafx.application.Platform; @@ -48,6 +50,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; +import test.com.sun.glass.ui.monocle.TestRunnable; public class TestApplication extends Application { @@ -101,7 +104,7 @@ ready.acquire(); Platform.runLater(() -> { if (isMonocle()) { - tapRadius = TouchInput.getInstance().getTouchRadius(); + tapRadius = TouchInputShim.getTouchRadius(); } else { tapRadius = Integer.getInteger("lens.input.touch.TapRadius", 20); } diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/TouchButtonTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchButtonTest.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/TouchButtonTest.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchButtonTest.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/TouchButtonTest.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchButtonTest.java @@ -23,10 +23,12 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevice; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevices; +import com.sun.glass.ui.monocle.TestLog; +import test.robot.com.sun.glass.ui.monocle.TestApplication; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices; import javafx.geometry.BoundingBox; import javafx.geometry.Bounds; import javafx.geometry.Point2D; @@ -40,6 +42,7 @@ import java.util.Collection; import java.util.concurrent.atomic.AtomicReference; +import test.com.sun.glass.ui.monocle.TestRunnable; public class TouchButtonTest extends ParameterizedTestBase { diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/TouchEventLookaheadTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchEventLookaheadTest.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/TouchEventLookaheadTest.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchEventLookaheadTest.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/TouchEventLookaheadTest.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchEventLookaheadTest.java @@ -23,10 +23,12 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevice; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevices; +import com.sun.glass.ui.monocle.TestLog; +import test.robot.com.sun.glass.ui.monocle.TestApplication; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices; import javafx.geometry.Rectangle2D; import javafx.stage.Screen; import org.junit.Assert; @@ -35,6 +37,7 @@ import org.junit.runners.Parameterized; import java.util.Collection; +import test.com.sun.glass.ui.monocle.TestRunnable; public class TouchEventLookaheadTest extends ParameterizedTestBase { diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/TouchExceptionTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchExceptionTest.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/TouchExceptionTest.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchExceptionTest.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/TouchExceptionTest.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchExceptionTest.java @@ -23,10 +23,12 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevice; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevices; +import com.sun.glass.ui.monocle.TestLog; +import test.robot.com.sun.glass.ui.monocle.TestApplication; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices; import javafx.application.Platform; import javafx.scene.input.InputEvent; import org.junit.Test; diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/TouchLagTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchLagTest.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/TouchLagTest.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchLagTest.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/TouchLagTest.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchLagTest.java @@ -23,8 +23,10 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; +import com.sun.glass.ui.monocle.TestLog; +import test.robot.com.sun.glass.ui.monocle.TestApplication; import javafx.geometry.Rectangle2D; import javafx.stage.Screen; import org.junit.After; diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/TouchPipelineTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchPipelineTest.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/TouchPipelineTest.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchPipelineTest.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/TouchPipelineTest.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchPipelineTest.java @@ -23,8 +23,15 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; +import com.sun.glass.ui.monocle.TestLog; +import test.robot.com.sun.glass.ui.monocle.TestApplication; +import com.sun.glass.ui.monocle.TouchFilterShim.FlushingFilter; +import com.sun.glass.ui.monocle.TouchFilterShim.LoggingFilter; +import com.sun.glass.ui.monocle.TouchFilterShim.NoMultiplesOfTenOnXFilter; +import com.sun.glass.ui.monocle.TouchFilterShim.OverrideIDFilter; +import com.sun.glass.ui.monocle.TouchFilterShim.TranslateFilter; import javafx.geometry.Rectangle2D; import javafx.stage.Screen; import org.junit.Assert; @@ -37,120 +44,6 @@ */ public class TouchPipelineTest extends TouchTestBase { - public static class TranslateFilter implements TouchFilter { - @Override - public boolean filter(TouchState state) { - for (int i = 0; i < state.getPointCount(); i++) { - state.getPoint(i).x += 8; - state.getPoint(i).y -= 5; - } - return false; - } - - @Override - public int getPriority() { - return 50; - } - - @Override - public boolean flush(TouchState state) { - return false; - } - } - - public static class OverrideIDFilter implements TouchFilter { - @Override - public boolean filter(TouchState state) { - for (int i = 0; i < state.getPointCount(); i++) { - state.getPoint(i).id = 5; - } - return false; - } - - @Override - public int getPriority() { - return -50; - } - - @Override - public boolean flush(TouchState state) { - return false; - } - } - - public static class NoMultiplesOfTenOnXFilter implements TouchFilter { - @Override - public boolean filter(TouchState state) { - for (int i = 0; i < state.getPointCount(); i++) { - if (state.getPoint(i).x % 10 == 0) { - return true; - } - } - return false; - } - - @Override - public int getPriority() { - return 60; - } - - @Override - public boolean flush(TouchState state) { - return false; - } - } - - public static class LoggingFilter implements TouchFilter { - @Override - public boolean filter(TouchState state) { - for (int i = 0; i < state.getPointCount(); i++) { - TestLog.format("Touch point id=%d at %d,%d", - state.getPoint(i).id, - state.getPoint(i).x, - state.getPoint(i).y); - } - return false; - } - - @Override - public int getPriority() { - return -100; - } - - @Override - public boolean flush(TouchState state) { - return false; - } - } - - public static class FlushingFilter implements TouchFilter { - int i = 3; - @Override - public boolean filter(TouchState state) { - return false; - } - - @Override - public int getPriority() { - return 90; - } - - @Override - public boolean flush(TouchState state) { - if (i > 0) { - i --; - state.clear(); - TouchState.Point p = state.addPoint(null); - p.x = 205 + i * 100; - p.y = 100; - p.id = -1; - return true; - } else { - return false; - } - } - } - @Before public void createDevice() throws Exception { Assume.assumeTrue(TestApplication.isMonocle()); diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/TouchTestBase.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchTestBase.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/TouchTestBase.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchTestBase.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/TouchTestBase.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/TouchTestBase.java @@ -23,8 +23,9 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; +import test.robot.com.sun.glass.ui.monocle.TestApplication; import javafx.geometry.Rectangle2D; import javafx.stage.Screen; import org.junit.After; @@ -32,6 +33,7 @@ import java.io.OutputStream; import java.io.PrintStream; +import test.com.sun.glass.ui.monocle.TestRunnable; public class TouchTestBase { diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/UInput.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/UInput.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/UInput.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/UInput.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/UInput.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/UInput.java @@ -23,9 +23,13 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; +import test.robot.com.sun.glass.ui.monocle.MonocleUInput; +import test.com.sun.glass.ui.monocle.LensUInput; import com.sun.glass.ui.Application; +import test.com.sun.glass.ui.monocle.LensUInput; +import test.com.sun.glass.ui.monocle.NativeUInput; public class UInput { diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/USKeyboardTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/USKeyboardTest.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/USKeyboardTest.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/USKeyboardTest.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/USKeyboardTest.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/USKeyboardTest.java @@ -23,15 +23,15 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; +import com.sun.glass.ui.monocle.TestLog; +import test.robot.com.sun.glass.ui.monocle.TestApplication; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import java.util.ArrayList; -import java.util.List; public class USKeyboardTest { diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/ZoomTest.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ZoomTest.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/ZoomTest.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ZoomTest.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/ZoomTest.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/ZoomTest.java @@ -23,10 +23,12 @@ * questions. */ -package com.sun.glass.ui.monocle; +package test.robot.com.sun.glass.ui.monocle; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevice; -import com.sun.glass.ui.monocle.input.devices.TestTouchDevices; +import com.sun.glass.ui.monocle.TestLog; +import test.robot.com.sun.glass.ui.monocle.ParameterizedTestBase; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevice; +import test.robot.com.sun.glass.ui.monocle.input.devices.TestTouchDevices; import org.junit.*; import org.junit.runners.Parameterized; diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/DellP2714TDevice.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/DellP2714TDevice.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/DellP2714TDevice.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/DellP2714TDevice.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/DellP2714TDevice.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/DellP2714TDevice.java @@ -23,10 +23,10 @@ * questions. */ -package com.sun.glass.ui.monocle.input.devices; +package test.robot.com.sun.glass.ui.monocle.input.devices; -import com.sun.glass.ui.monocle.TestApplication; -import com.sun.glass.ui.monocle.UInput; +import test.robot.com.sun.glass.ui.monocle.TestApplication; +import test.robot.com.sun.glass.ui.monocle.UInput; import org.junit.Assume; import java.util.HashMap; diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice1.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice1.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice1.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice1.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice1.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice1.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.glass.ui.monocle.input.devices; +package test.robot.com.sun.glass.ui.monocle.input.devices; /** The touch screen used in the Freescale i.MX6Q Sabre Device Platform, * extrapolated to five touch points. There is some guesswork here as to diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice2.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice2.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice2.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice2.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice2.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice2.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.glass.ui.monocle.input.devices; +package test.robot.com.sun.glass.ui.monocle.input.devices; /** The touch screen used in the Freescale i.MX6Q Sabre Device Platform, * extrapolated to five touch points. There is some guesswork here as to diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice3.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice3.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice3.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice3.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice3.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice3.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.glass.ui.monocle.input.devices; +package test.robot.com.sun.glass.ui.monocle.input.devices; /** The touch screen used in the Freescale i.MX6Q Sabre Device Platform, * extrapolated to five touch points. There is some guesswork here as to diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice4.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice4.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice4.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice4.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice4.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice4.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.glass.ui.monocle.input.devices; +package test.robot.com.sun.glass.ui.monocle.input.devices; /** The touch screen used in the Freescale i.MX6Q Sabre Device Platform, * extrapolated to five touch points. There is some guesswork here as to diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice5.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice5.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice5.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice5.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice5.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice5.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.glass.ui.monocle.input.devices; +package test.robot.com.sun.glass.ui.monocle.input.devices; /** The touch screen used in the Fujitsu MB86S70 board. There is some * guesswork here as to whether the screen always resends stationary points. diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice6.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice6.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice6.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice6.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice6.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDevice6.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.glass.ui.monocle.input.devices; +package test.robot.com.sun.glass.ui.monocle.input.devices; /** The touch screen used in the Fujitsu MB86S70 board. There is some * guesswork here as to whether the screen always resends stationary points. diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDeviceBase.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDeviceBase.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDeviceBase.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDeviceBase.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDeviceBase.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxMultiTouchDeviceBase.java @@ -23,11 +23,11 @@ * questions. */ -package com.sun.glass.ui.monocle.input.devices; +package test.robot.com.sun.glass.ui.monocle.input.devices; -import com.sun.glass.ui.monocle.TestApplication; +import test.robot.com.sun.glass.ui.monocle.TestApplication; import com.sun.glass.ui.monocle.TestLog; -import com.sun.glass.ui.monocle.UInput; +import test.robot.com.sun.glass.ui.monocle.UInput; import org.junit.Assume; import java.util.HashSet; diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/EGalaxSingleTouchDevice1.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxSingleTouchDevice1.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/EGalaxSingleTouchDevice1.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxSingleTouchDevice1.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/EGalaxSingleTouchDevice1.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxSingleTouchDevice1.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.glass.ui.monocle.input.devices; +package test.robot.com.sun.glass.ui.monocle.input.devices; public class EGalaxSingleTouchDevice1 extends EGalaxSingleTouchDeviceBase { diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/EGalaxSingleTouchDevice2.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxSingleTouchDevice2.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/EGalaxSingleTouchDevice2.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxSingleTouchDevice2.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/EGalaxSingleTouchDevice2.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxSingleTouchDevice2.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.glass.ui.monocle.input.devices; +package test.robot.com.sun.glass.ui.monocle.input.devices; public class EGalaxSingleTouchDevice2 extends EGalaxSingleTouchDeviceBase { diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/EGalaxSingleTouchDeviceBase.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxSingleTouchDeviceBase.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/EGalaxSingleTouchDeviceBase.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxSingleTouchDeviceBase.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/EGalaxSingleTouchDeviceBase.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/EGalaxSingleTouchDeviceBase.java @@ -23,10 +23,10 @@ * questions. */ -package com.sun.glass.ui.monocle.input.devices; +package test.robot.com.sun.glass.ui.monocle.input.devices; -import com.sun.glass.ui.monocle.TestApplication; -import com.sun.glass.ui.monocle.UInput; +import test.robot.com.sun.glass.ui.monocle.TestApplication; +import test.robot.com.sun.glass.ui.monocle.UInput; import org.junit.Assume; /** diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/NTrigDevice.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/NTrigDevice.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/NTrigDevice.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/NTrigDevice.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/NTrigDevice.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/NTrigDevice.java @@ -23,9 +23,9 @@ * questions. */ -package com.sun.glass.ui.monocle.input.devices; +package test.robot.com.sun.glass.ui.monocle.input.devices; -import com.sun.glass.ui.monocle.UInput; +import test.robot.com.sun.glass.ui.monocle.UInput; import java.util.Random; diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/SamsungLMS700KF07004Device.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/SamsungLMS700KF07004Device.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/SamsungLMS700KF07004Device.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/SamsungLMS700KF07004Device.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/SamsungLMS700KF07004Device.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/SamsungLMS700KF07004Device.java @@ -23,10 +23,10 @@ * questions. */ -package com.sun.glass.ui.monocle.input.devices; +package test.robot.com.sun.glass.ui.monocle.input.devices; -import com.sun.glass.ui.monocle.TestApplication; -import com.sun.glass.ui.monocle.UInput; +import test.robot.com.sun.glass.ui.monocle.TestApplication; +import test.robot.com.sun.glass.ui.monocle.UInput; import org.junit.Assume; /** diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/SingleTouchDevice1.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/SingleTouchDevice1.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/SingleTouchDevice1.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/SingleTouchDevice1.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/SingleTouchDevice1.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/SingleTouchDevice1.java @@ -23,9 +23,9 @@ * questions. */ -package com.sun.glass.ui.monocle.input.devices; +package test.robot.com.sun.glass.ui.monocle.input.devices; -import com.sun.glass.ui.monocle.UInput; +import test.robot.com.sun.glass.ui.monocle.UInput; /** * SingleTouchDevice1 sends ABS_X and ABS_Y events. It uses BTN_TOUCH to notify diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/SingleTouchDevice2.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/SingleTouchDevice2.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/SingleTouchDevice2.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/SingleTouchDevice2.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/SingleTouchDevice2.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/SingleTouchDevice2.java @@ -23,10 +23,10 @@ * questions. */ -package com.sun.glass.ui.monocle.input.devices; +package test.robot.com.sun.glass.ui.monocle.input.devices; -import com.sun.glass.ui.monocle.TestApplication; -import com.sun.glass.ui.monocle.UInput; +import test.robot.com.sun.glass.ui.monocle.TestApplication; +import test.robot.com.sun.glass.ui.monocle.UInput; import org.junit.Assume; /** diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/TabletDevice.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/TabletDevice.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/TabletDevice.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/TabletDevice.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/TabletDevice.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/TabletDevice.java @@ -23,9 +23,9 @@ * questions. */ -package com.sun.glass.ui.monocle.input.devices; +package test.robot.com.sun.glass.ui.monocle.input.devices; -import com.sun.glass.ui.monocle.UInput; +import test.robot.com.sun.glass.ui.monocle.UInput; /** * TabletDevice sends ABS_X and ABS_Y events. It uses BTN_TOUCH and BTN_TOOL_PEN diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/TestDevice.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/TestDevice.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/TestDevice.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/TestDevice.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/TestDevice.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/TestDevice.java @@ -23,9 +23,9 @@ * questions. */ -package com.sun.glass.ui.monocle.input.devices; +package test.robot.com.sun.glass.ui.monocle.input.devices; -import com.sun.glass.ui.monocle.UInput; +import test.robot.com.sun.glass.ui.monocle.UInput; public abstract class TestDevice { diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/TestTouchDevice.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/TestTouchDevice.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/TestTouchDevice.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/TestTouchDevice.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/TestTouchDevice.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/TestTouchDevice.java @@ -23,9 +23,9 @@ * questions. */ -package com.sun.glass.ui.monocle.input.devices; +package test.robot.com.sun.glass.ui.monocle.input.devices; -import com.sun.glass.ui.monocle.TestApplication; +import test.robot.com.sun.glass.ui.monocle.TestApplication; import com.sun.glass.ui.monocle.TestLog; import javafx.geometry.Rectangle2D; diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/TestTouchDevices.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/TestTouchDevices.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/TestTouchDevices.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/TestTouchDevices.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/TestTouchDevices.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/TestTouchDevices.java @@ -23,7 +23,7 @@ * questions. */ -package com.sun.glass.ui.monocle.input.devices; +package test.robot.com.sun.glass.ui.monocle.input.devices; import java.util.ArrayList; import java.util.Arrays; diff --git a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/TouchRevolutionFusionDevice.java b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/TouchRevolutionFusionDevice.java rename from tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/TouchRevolutionFusionDevice.java rename to tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/TouchRevolutionFusionDevice.java --- a/tests/system/src/test/java/com/sun/glass/ui/monocle/input/devices/TouchRevolutionFusionDevice.java +++ b/tests/system/src/test/java/test/robot/com/sun/glass/ui/monocle/input/devices/TouchRevolutionFusionDevice.java @@ -23,10 +23,10 @@ * questions. */ -package com.sun.glass.ui.monocle.input.devices; +package test.robot.com.sun.glass.ui.monocle.input.devices; -import com.sun.glass.ui.monocle.TestApplication; -import com.sun.glass.ui.monocle.UInput; +import test.robot.com.sun.glass.ui.monocle.TestApplication; +import test.robot.com.sun.glass.ui.monocle.UInput; import org.junit.Assume; import java.util.HashMap; diff --git a/tests/system/src/test/java/helloworld/CustomSecurityManagerTest.java b/tests/system/src/test/java/test/robot/helloworld/CustomSecurityManagerTest.java rename from tests/system/src/test/java/helloworld/CustomSecurityManagerTest.java rename to tests/system/src/test/java/test/robot/helloworld/CustomSecurityManagerTest.java --- a/tests/system/src/test/java/helloworld/CustomSecurityManagerTest.java +++ b/tests/system/src/test/java/test/robot/helloworld/CustomSecurityManagerTest.java @@ -23,7 +23,7 @@ * questions. */ -package helloworld; +package test.robot.helloworld; import com.sun.glass.ui.Application; import com.sun.glass.ui.Robot; @@ -40,10 +40,10 @@ import javafx.stage.StageStyle; import org.junit.After; import org.junit.Test; -import testharness.VisualTestBase; import static org.junit.Assert.*; import static org.junit.Assume.*; +import test.robot.testharness.VisualTestBase; /** * Basic visual tests using glass Robot to sample pixels. diff --git a/tests/system/src/test/java/helloworld/RectangleTest.java b/tests/system/src/test/java/test/robot/helloworld/RectangleTest.java rename from tests/system/src/test/java/helloworld/RectangleTest.java rename to tests/system/src/test/java/test/robot/helloworld/RectangleTest.java --- a/tests/system/src/test/java/helloworld/RectangleTest.java +++ b/tests/system/src/test/java/test/robot/helloworld/RectangleTest.java @@ -23,7 +23,7 @@ * questions. */ -package helloworld; +package test.robot.helloworld; import javafx.scene.Group; import javafx.scene.Scene; @@ -31,7 +31,7 @@ import javafx.scene.shape.Rectangle; import javafx.stage.Stage; import org.junit.Test; -import testharness.VisualTestBase; +import test.robot.testharness.VisualTestBase; /** * Basic visual tests using glass Robot to sample pixels. diff --git a/tests/system/src/test/java/javafx/embed/swing/RT30650GUI.java b/tests/system/src/test/java/test/robot/javafx/embed/swing/RT30650GUI.java rename from tests/system/src/test/java/javafx/embed/swing/RT30650GUI.java rename to tests/system/src/test/java/test/robot/javafx/embed/swing/RT30650GUI.java --- a/tests/system/src/test/java/javafx/embed/swing/RT30650GUI.java +++ b/tests/system/src/test/java/test/robot/javafx/embed/swing/RT30650GUI.java @@ -23,7 +23,7 @@ * questions. */ -package javafx.embed.swing; +package test.robot.javafx.embed.swing; import com.sun.glass.ui.Robot; import static com.sun.javafx.application.PlatformImpl.runAndWait; @@ -37,6 +37,7 @@ import javafx.application.Application; import javafx.application.Platform; +import javafx.embed.swing.SwingNode; import javafx.scene.layout.Background; import javafx.scene.layout.BackgroundFill; import javafx.scene.layout.Pane; diff --git a/tests/system/src/test/java/javafx/embed/swing/RT30650Test.java b/tests/system/src/test/java/test/robot/javafx/embed/swing/RT30650Test.java rename from tests/system/src/test/java/javafx/embed/swing/RT30650Test.java rename to tests/system/src/test/java/test/robot/javafx/embed/swing/RT30650Test.java --- a/tests/system/src/test/java/javafx/embed/swing/RT30650Test.java +++ b/tests/system/src/test/java/test/robot/javafx/embed/swing/RT30650Test.java @@ -23,8 +23,9 @@ * questions. */ -package javafx.embed.swing; +package test.robot.javafx.embed.swing; +import test.robot.javafx.embed.swing.RT30650GUI; import junit.framework.Assert; import org.junit.Test; diff --git a/tests/system/src/test/java/javafx/embed/swing/RT32570Test.java b/tests/system/src/test/java/test/robot/javafx/embed/swing/RT32570Test.java rename from tests/system/src/test/java/javafx/embed/swing/RT32570Test.java rename to tests/system/src/test/java/test/robot/javafx/embed/swing/RT32570Test.java --- a/tests/system/src/test/java/javafx/embed/swing/RT32570Test.java +++ b/tests/system/src/test/java/test/robot/javafx/embed/swing/RT32570Test.java @@ -23,9 +23,10 @@ * questions. */ -package javafx.embed.swing; +package test.robot.javafx.embed.swing; import java.awt.Dimension; +import javafx.embed.swing.SwingNode; import javafx.scene.Group; import javafx.scene.Scene; import javafx.scene.paint.Color; @@ -35,7 +36,7 @@ import javax.swing.JPopupMenu; import javax.swing.SwingUtilities; import org.junit.Test; -import testharness.VisualTestBase; +import test.robot.testharness.VisualTestBase; /** * Tests that a JPopupMenu shown from inside of SwingNode second and diff --git a/tests/system/src/test/java/javafx/scene/layout/RegionBackgroundFillUITest.java b/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBackgroundFillUITest.java rename from tests/system/src/test/java/javafx/scene/layout/RegionBackgroundFillUITest.java rename to tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBackgroundFillUITest.java --- a/tests/system/src/test/java/javafx/scene/layout/RegionBackgroundFillUITest.java +++ b/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBackgroundFillUITest.java @@ -22,8 +22,9 @@ * questions. */ -package javafx.scene.layout; +package test.robot.javafx.scene.layout; +import javafx.scene.layout.BackgroundFill; import javafx.scene.paint.Color; import org.junit.Ignore; import org.junit.Test; @@ -233,14 +234,14 @@ @Test(timeout=20000) public void imageFill() { - setStyle("-fx-background-color: repeating-image-pattern('javafx/scene/layout/test20x20.png');"); + setStyle("-fx-background-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); checkRegionCornersAndBoundariesForFills(); } @Test(timeout=20000) public void imageFill_MixedInsets() { setStyle( - "-fx-background-color: repeating-image-pattern('javafx/scene/layout/test20x20.png');" + + "-fx-background-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-insets: 5 10 -15 20"); checkRegionCornersAndBoundariesForFills(); } @@ -248,7 +249,7 @@ @Test(timeout=20000) public void imageFill_Radius4() { setStyle( - "-fx-background-color: repeating-image-pattern('javafx/scene/layout/test20x20.png');" + + "-fx-background-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-radius: 10 20 30 40"); checkRegionCornersAndBoundariesForFills(); } @@ -256,32 +257,32 @@ @Test(timeout=20000) public void imageFill_MissingImage() { setStyle( - "-fx-background-color: repeating-image-pattern('javafx/scene/layout/missing.png');" + + "-fx-background-color: repeating-image-pattern('test/robot/javafx/scene/layout/missing.png');" + "-fx-background-radius: 10 20 30 40"); assertColorEquals(SCENE_FILL, WIDTH / 2, HEIGHT / 2, TOLERANCE); } @Test(timeout=20000) public void imageFill_Stretched() { - setStyle("-fx-background-color: image-pattern('javafx/scene/layout/test20x20.png');"); + setStyle("-fx-background-color: image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); checkRegionCornersAndBoundariesForFills(); } @Test(timeout=20000) public void imageFill_Stretched2() { - setStyle("-fx-background-color: image-pattern('javafx/scene/layout/test20x20.png', 0, 0, 1, 1);"); + setStyle("-fx-background-color: image-pattern('test/robot/javafx/scene/layout/test20x20.png', 0, 0, 1, 1);"); checkRegionCornersAndBoundariesForFills(); } @Test(timeout=20000) public void imageFill_Stretched3() { - setStyle("-fx-background-color: image-pattern('javafx/scene/layout/test20x20.png', 0, 0, 1, 1, true);"); + setStyle("-fx-background-color: image-pattern('test/robot/javafx/scene/layout/test20x20.png', 0, 0, 1, 1, true);"); checkRegionCornersAndBoundariesForFills(); } @Test(timeout=20000) public void imageFill_Tiled() { - setStyle("-fx-background-color: image-pattern('javafx/scene/layout/test20x20.png', 0, 0, 40, 40, false);"); + setStyle("-fx-background-color: image-pattern('test/robot/javafx/scene/layout/test20x20.png', 0, 0, 40, 40, false);"); checkRegionCornersAndBoundariesForFills(); } @@ -404,7 +405,7 @@ @Test(timeout=20000) public void testScenario4() { setStyle( - "-fx-background-color: red, green, blue, repeating-image-pattern('javafx/scene/layout/test20x20.png');" + + "-fx-background-color: red, green, blue, repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-insets: 0 0 -10 0, 0, 10, 20;" + "-fx-background-radius: 10 20 30 40;" + "-fx-padding: 10 20 30 40;"); @@ -439,7 +440,7 @@ @Test(timeout=20000) public void testScenario5() { setStyle( - "-fx-background-color: red, green, repeating-image-pattern('javafx/scene/layout/test20x20.png'), blue;" + + "-fx-background-color: red, green, repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png'), blue;" + "-fx-background-insets: 0 0 -10 0, 0, 10, 20;" + "-fx-background-radius: 10 20 30 40;" + "-fx-padding: 10 20 30 40;"); @@ -777,6 +778,6 @@ // This just plain shouldn't work. // public void testImageFill() { -// setStyle("-fx-background-color: url('javafx/scene/layout/test20x20.png');"); +// setStyle("-fx-background-color: url('test/robot/javafx/scene/layout/test20x20.png');"); // } } diff --git a/tests/system/src/test/java/javafx/scene/layout/RegionBackgroundImageUITest.java b/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBackgroundImageUITest.java rename from tests/system/src/test/java/javafx/scene/layout/RegionBackgroundImageUITest.java rename to tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBackgroundImageUITest.java --- a/tests/system/src/test/java/javafx/scene/layout/RegionBackgroundImageUITest.java +++ b/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBackgroundImageUITest.java @@ -22,8 +22,9 @@ * questions. */ -package javafx.scene.layout; +package test.robot.javafx.scene.layout; +import test.robot.javafx.scene.layout.RegionUITestBase; import javafx.geometry.Bounds; import javafx.scene.paint.Color; import org.junit.Ignore; @@ -43,7 +44,7 @@ @Test(timeout=20000) public void alignedImage() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');"); + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');"); checkCompletelyFilled(20); } @@ -51,7 +52,7 @@ @Test(timeout=20000) public void alignedImage_RepeatX() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-repeat: repeat-x"); checkHorizontalStripAlongTop(20, LEFT); @@ -60,7 +61,7 @@ @Test(timeout=20000) public void alignedImage_RepeatY() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-repeat: repeat-y"); checkVerticalStripAlongLeft(20, TOP); @@ -69,7 +70,7 @@ @Test(timeout=20000) public void alignedImage_Space() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-repeat: space space"); checkCompletelyFilled(20); @@ -78,7 +79,7 @@ @Test(timeout=20000) public void alignedImage_Round() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-repeat: round"); checkCompletelyFilled(20); @@ -87,7 +88,7 @@ @Test(timeout=20000) public void alignedImage_RoundSpace() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-repeat: round space"); checkCompletelyFilled(20); @@ -96,7 +97,7 @@ @Test(timeout=20000) public void alignedImage_PositionCenter() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-repeat: no-repeat;" + "-fx-background-position: center"); @@ -106,7 +107,7 @@ @Test(timeout=20000) public void alignedImage_PositionCenterFiftyPercent() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-repeat: no-repeat;" + "-fx-background-position: 50%"); @@ -116,7 +117,7 @@ @Test(timeout=20000) public void alignedImage_PositionCenterLeft() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-repeat: no-repeat;" + "-fx-background-position: left center"); @@ -129,7 +130,7 @@ @Test(timeout=20000) public void alignedImage_PositionCenterRight() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-repeat: no-repeat;" + "-fx-background-position: right center"); @@ -142,7 +143,7 @@ @Test(timeout=20000) public void alignedImage_PositionCenterTop() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-repeat: no-repeat;" + "-fx-background-position: center top"); @@ -155,7 +156,7 @@ @Test(timeout=20000) public void alignedImage_PositionCenterBottom() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-repeat: no-repeat;" + "-fx-background-position: center bottom"); @@ -168,7 +169,7 @@ @Test(timeout=20000) public void alignedImage_PositionBottomRight() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-repeat: no-repeat;" + "-fx-background-position: right bottom"); @@ -184,7 +185,7 @@ @Test(timeout=20000) public void alignedImage_PositionCenterRepeatX() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-repeat: repeat-x;" + "-fx-background-position: center"); @@ -194,7 +195,7 @@ @Test(timeout=20000) public void alignedImage_PositionCenterFiftyPercentRepeatX() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-repeat: repeat-x;" + "-fx-background-position: 50%"); @@ -204,7 +205,7 @@ @Test(timeout=20000) public void alignedImage_PositionCenterLeftRepeatX() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-repeat: repeat-x;" + "-fx-background-position: left center"); @@ -214,7 +215,7 @@ @Test(timeout=20000) public void alignedImage_PositionCenterRightRepeatX() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-repeat: repeat-x;" + "-fx-background-position: right center"); checkHorizontalStripAlongCenter(20, LEFT); @@ -223,7 +224,7 @@ @Test(timeout=20000) public void alignedImage_PositionCenterTopRepeatX() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-repeat: repeat-x;" + "-fx-background-position: center top"); @@ -233,7 +234,7 @@ @Test(timeout=20000) public void alignedImage_PositionCenterBottomRepeatX() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-repeat: repeat-x;" + "-fx-background-position: center bottom"); @@ -243,7 +244,7 @@ @Test(timeout=20000) public void alignedImage_PositionBottomRightRepeatX() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-repeat: repeat-x;" + "-fx-background-position: right bottom"); @@ -253,7 +254,7 @@ @Test(timeout=20000) public void alignedImage_PositionCenterRepeatY() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-repeat: repeat-y;" + "-fx-background-position: center"); @@ -263,7 +264,7 @@ @Test(timeout=20000) public void alignedImage_PositionCenterFiftyPercentRepeatY() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-repeat: repeat-y;" + "-fx-background-position: 50%"); @@ -273,7 +274,7 @@ @Test(timeout=20000) public void alignedImage_PositionCenterLeftRepeatY() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-repeat: repeat-y;" + "-fx-background-position: left center"); @@ -283,7 +284,7 @@ @Test(timeout=20000) public void alignedImage_PositionCenterRightRepeatY() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-repeat: repeat-y;" + "-fx-background-position: right center"); @@ -293,7 +294,7 @@ @Test(timeout=20000) public void alignedImage_PositionCenterTopRepeatY() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-repeat: repeat-y;" + "-fx-background-position: center top"); @@ -303,7 +304,7 @@ @Test(timeout=20000) public void alignedImage_PositionCenterBottomRepeatY() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-repeat: repeat-y;" + "-fx-background-position: center bottom"); @@ -313,7 +314,7 @@ @Test(timeout=20000) public void alignedImage_PositionBottomRightRepeatY() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-repeat: repeat-y;" + "-fx-background-position: right bottom"); @@ -323,7 +324,7 @@ @Test(timeout=20000) public void alignedImage_Position25PercentLeft() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-repeat: no-repeat;" + "-fx-background-position: left 25% center"); @@ -336,7 +337,7 @@ @Test(timeout=20000) public void alignedImage_Position25PercentRight() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-repeat: no-repeat;" + "-fx-background-position: right 25% center"); @@ -352,7 +353,7 @@ @Test(timeout=20000) public void alignedImage_Cover() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-size: cover;"); // The image is 20x20. To fit, it would need to be stretched to be 300x300. @@ -363,7 +364,7 @@ @Test(timeout=20000) public void alignedImage_Contain() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-size: contain;"); // The image is 20x20. So there will be two copies, 200x200 in size @@ -374,7 +375,7 @@ @Test(timeout=20000) public void alignedImage_ContainNoRepeat() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test20x20.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + "-fx-background-size: contain;" + "-fx-background-repeat: no-repeat;"); @@ -384,14 +385,14 @@ @Test(timeout=20000) public void unalignedImage() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');"); + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');"); checkCompletelyFilled(48); } @Test(timeout=20000) public void unalignedImage_RepeatX() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" + "-fx-background-repeat: repeat-x"); checkHorizontalStripAlongTop(48, LEFT); @@ -400,7 +401,7 @@ @Test(timeout=20000) public void unalignedImage_RepeatY() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" + "-fx-background-repeat: repeat-y"); checkVerticalStripAlongLeft(48, TOP); @@ -410,7 +411,7 @@ @Test(timeout=20000) public void unalignedImage_Space() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" + "-fx-background-repeat: space space"); checkEvenlyFilled(48); @@ -419,7 +420,7 @@ @Test(timeout=20000) public void unalignedImage_Round() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" + "-fx-background-repeat: round"); checkCompletelyFilled(50); // rounded up from 48 to 50 @@ -429,7 +430,7 @@ @Test(timeout=20000) public void unalignedImage_RoundSpace() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" + "-fx-background-repeat: round space"); // Need to update checkEvenlyFilled / checkCompletely filled to handle case like this where it is @@ -439,7 +440,7 @@ @Test(timeout=20000) public void unalignedImage_PositionCenter() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" + "-fx-background-repeat: no-repeat;" + "-fx-background-position: center"); checkNonRepeating(48, WIDTH / 2, HEIGHT / 2, true); @@ -448,7 +449,7 @@ @Test(timeout=20000) public void unalignedImage_PositionCenterFiftyPercent() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" + "-fx-background-repeat: no-repeat;" + "-fx-background-position: 50%"); checkNonRepeating(48, WIDTH / 2, HEIGHT / 2, true); @@ -457,7 +458,7 @@ @Test(timeout=20000) public void unalignedImage_PositionCenterLeft() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" + "-fx-background-repeat: no-repeat;" + "-fx-background-position: left center"); checkNonRepeating(48, REGION_LEFT + 24, HEIGHT / 2, true); @@ -466,7 +467,7 @@ @Test(timeout=20000) public void unalignedImage_PositionCenterRight() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" + "-fx-background-repeat: no-repeat;" + "-fx-background-position: right center"); checkNonRepeating(48, REGION_RIGHT - 24, HEIGHT / 2, true); @@ -475,7 +476,7 @@ @Test(timeout=20000) public void unalignedImage_PositionCenterTop() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" + "-fx-background-repeat: no-repeat;" + "-fx-background-position: center top"); checkNonRepeating(48, WIDTH / 2, REGION_TOP + 24, true); @@ -484,7 +485,7 @@ @Test(timeout=20000) public void unalignedImage_PositionCenterBottom() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" + "-fx-background-repeat: no-repeat;" + "-fx-background-position: center bottom"); checkNonRepeating(48, WIDTH / 2, REGION_BOTTOM - 24, true); @@ -493,7 +494,7 @@ @Test(timeout=20000) public void unalignedImage_PositionBottomRight() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" + "-fx-background-repeat: no-repeat;" + "-fx-background-position: right bottom"); checkNonRepeating(48, REGION_RIGHT - 24, REGION_BOTTOM - 24, true); @@ -502,7 +503,7 @@ @Test(timeout=20000) public void unalignedImage_PositionCenterRepeatX() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" + "-fx-background-repeat: repeat-x;" + "-fx-background-position: center"); @@ -512,7 +513,7 @@ @Test(timeout=20000) public void unalignedImage_PositionCenterFiftyPercentRepeatX() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" + "-fx-background-repeat: repeat-x;" + "-fx-background-position: 50%"); @@ -522,7 +523,7 @@ @Test(timeout=20000) public void unalignedImage_PositionCenterLeftRepeatX() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" + "-fx-background-repeat: repeat-x;" + "-fx-background-position: left center"); @@ -532,7 +533,7 @@ @Test(timeout=20000) public void unalignedImage_PositionCenterRightRepeatX() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" + "-fx-background-repeat: repeat-x;" + "-fx-background-position: right center"); @@ -542,7 +543,7 @@ @Test(timeout=20000) public void unalignedImage_PositionCenterTopRepeatX() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" + "-fx-background-repeat: repeat-x;" + "-fx-background-position: center top"); @@ -552,7 +553,7 @@ @Test(timeout=20000) public void unalignedImage_PositionCenterBottomRepeatX() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" + "-fx-background-repeat: repeat-x;" + "-fx-background-position: center bottom"); @@ -562,7 +563,7 @@ @Test(timeout=20000) public void unalignedImage_PositionBottomRightRepeatX() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" + "-fx-background-repeat: repeat-x;" + "-fx-background-position: right bottom"); @@ -572,7 +573,7 @@ @Test(timeout=20000) public void unalignedImage_PositionCenterRepeatY() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" + "-fx-background-repeat: repeat-y;" + "-fx-background-position: center"); @@ -582,7 +583,7 @@ @Test(timeout=20000) public void unalignedImage_PositionCenterFiftyPercentRepeatY() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" + "-fx-background-repeat: repeat-y;" + "-fx-background-position: 50%"); @@ -592,7 +593,7 @@ @Test(timeout=20000) public void unalignedImage_PositionCenterLeftRepeatY() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" + "-fx-background-repeat: repeat-y;" + "-fx-background-position: left center"); @@ -602,7 +603,7 @@ @Test(timeout=20000) public void unalignedImage_PositionCenterRightRepeatY() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" + "-fx-background-repeat: repeat-y;" + "-fx-background-position: right center"); @@ -612,7 +613,7 @@ @Test(timeout=20000) public void unalignedImage_PositionCenterTopRepeatY() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" + "-fx-background-repeat: repeat-y;" + "-fx-background-position: center top"); @@ -622,7 +623,7 @@ @Test(timeout=20000) public void unalignedImage_PositionCenterBottomRepeatY() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" + "-fx-background-repeat: repeat-y;" + "-fx-background-position: center bottom"); @@ -632,7 +633,7 @@ @Test(timeout=20000) public void unalignedImage_PositionBottomRightRepeatY() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" + "-fx-background-repeat: repeat-y;" + "-fx-background-position: right bottom"); @@ -642,7 +643,7 @@ @Test(timeout=20000) public void unalignedImage_Position25PercentLeft() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" + "-fx-background-repeat: no-repeat;" + "-fx-background-position: left 25% center"); @@ -655,7 +656,7 @@ @Test(timeout=20000) public void unalignedImage_Position25PercentRight() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" + "-fx-background-repeat: no-repeat;" + "-fx-background-position: right 25% center"); @@ -672,7 +673,7 @@ @Test(timeout=20000) public void unalignedImage_Cover() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" + "-fx-background-size: cover;"); // The image is 48x48. To fit it would need to be stretched to 336x336 @@ -683,7 +684,7 @@ @Test(timeout=20000) public void unalignedImage_Contain() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" + "-fx-background-size: contain;"); // The image is 48x48. So there will be two copies, 200x200 in size @@ -694,7 +695,7 @@ @Test(timeout=20000) public void unalignedImage_ContainNoRepeat() { setStyle("-fx-background-color: black;" + - "-fx-background-image: url('javafx/scene/layout/test48x48.png');" + + "-fx-background-image: url('test/robot/javafx/scene/layout/test48x48.png');" + "-fx-background-size: contain;" + "-fx-background-repeat: no-repeat;"); diff --git a/tests/system/src/test/java/javafx/scene/layout/RegionBorderImageUITest.java b/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBorderImageUITest.java rename from tests/system/src/test/java/javafx/scene/layout/RegionBorderImageUITest.java rename to tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBorderImageUITest.java --- a/tests/system/src/test/java/javafx/scene/layout/RegionBorderImageUITest.java +++ b/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBorderImageUITest.java @@ -22,7 +22,7 @@ * questions. */ -package javafx.scene.layout; +package test.robot.javafx.scene.layout; import org.junit.Test; @@ -35,7 +35,7 @@ // @Test(timeout=20000) // public void test() { // setStyle( -// "-fx-border-image-source: url('javafx/scene/layout/border.png');" + +// "-fx-border-image-source: url('test/robot/javafx/scene/layout/border.png');" + // "-fx-border-image-slice: 10;" + // "-fx-border-image-width: 10;" + // "-fx-border-image-repeat: round;"); @@ -46,7 +46,7 @@ // @Test(timeout=20000) // public void test2() { // setStyle( -// "-fx-border-image-source: url('javafx/scene/layout/border.png');" + +// "-fx-border-image-source: url('test/robot/javafx/scene/layout/border.png');" + // "-fx-border-image-slice: 10;" + // "-fx-border-image-width: 10;" + // "-fx-border-image-repeat: repeat;"); @@ -57,7 +57,7 @@ // @Test(timeout=20000) // public void test3() { // setStyle( -// "-fx-border-image-source: url('javafx/scene/layout/border-uneven.png');" + +// "-fx-border-image-source: url('test/robot/javafx/scene/layout/border-uneven.png');" + // "-fx-border-image-slice: 11;" + // "-fx-border-image-width: 11;" + // "-fx-border-image-repeat: space;"); @@ -68,7 +68,7 @@ @Test(timeout=20000) public void test4() { setStyle( - "-fx-border-image-source: url('javafx/scene/layout/border-stretch.png');" + + "-fx-border-image-source: url('test/robot/javafx/scene/layout/border-stretch.png');" + "-fx-border-image-slice: 14;" + "-fx-border-image-width: 14;" + "-fx-border-image-repeat: stretch;"); @@ -79,7 +79,7 @@ // @Test(timeout=20000) // public void differentSliceAndWidths() { // setStyle( -// "-fx-border-image-source: url('javafx/scene/layout/border.png');" + +// "-fx-border-image-source: url('test/robot/javafx/scene/layout/border.png');" + // "-fx-border-color:green;" + // "-fx-border-image-repeat: repeat;" + // "-fx-border-image-slice: 27;" + @@ -88,7 +88,7 @@ // // @Test(timeout=20000) // public void repeatX() { -// setStyle("-fx-border-image-source: url('javafx/scene/layout/border.png');" + +// setStyle("-fx-border-image-source: url('test/robot/javafx/scene/layout/border.png');" + // "-fx-border-image-repeat: repeat-x;" + // "-fx-border-image-slice: 28;" + // "-fx-border-image-width: 28;"); @@ -96,7 +96,7 @@ // // @Test(timeout=20000) // public void repeatY() { -// setStyle("-fx-border-image-source: url('javafx/scene/layout/border.png');" + +// setStyle("-fx-border-image-source: url('test/robot/javafx/scene/layout/border.png');" + // "-fx-border-image-repeat: repeat-y;" + // "-fx-border-image-slice: 28;" + // "-fx-border-image-width: 28;"); @@ -105,7 +105,7 @@ // @Test(timeout=20000) // public void testWider() { // setStyle( -// "-fx-border-image-source: url('javafx/scene/layout/border.png');" + +// "-fx-border-image-source: url('test/robot/javafx/scene/layout/border.png');" + // "-fx-border-image-slice: 27;" + // "-fx-border-image-width: 40;" + // "-fx-border-image-repeat: round;"); @@ -114,7 +114,7 @@ // @Test(timeout=20000) // public void testWider2() { // setStyle( -// "-fx-border-image-source: url('javafx/scene/layout/border.png');" + +// "-fx-border-image-source: url('test/robot/javafx/scene/layout/border.png');" + // "-fx-border-image-slice: 27;" + // "-fx-border-image-width: 40;" + // "-fx-border-image-repeat: repeat;"); @@ -123,7 +123,7 @@ // @Test(timeout=20000) // public void testWider3() { // setStyle( -// "-fx-border-image-source: url('javafx/scene/layout/border.png');" + +// "-fx-border-image-source: url('test/robot/javafx/scene/layout/border.png');" + // "-fx-border-image-slice: 27;" + // "-fx-border-image-width: 40;" + // "-fx-border-image-repeat: space;"); @@ -132,7 +132,7 @@ // @Test(timeout=20000) // public void testWider4() { // setStyle( -// "-fx-border-image-source: url('javafx/scene/layout/border.png');" + +// "-fx-border-image-source: url('test/robot/javafx/scene/layout/border.png');" + // "-fx-border-image-slice: 27;" + // "-fx-border-image-width: 40;" + // "-fx-border-image-repeat: stretch;"); @@ -140,7 +140,7 @@ // // @Test(timeout=20000) // public void repeatXWider() { -// setStyle("-fx-border-image-source: url('javafx/scene/layout/border.png');" + +// setStyle("-fx-border-image-source: url('test/robot/javafx/scene/layout/border.png');" + // "-fx-border-image-repeat: repeat-x;" + // "-fx-border-image-slice: 28;" + // "-fx-border-image-width: 40;"); @@ -148,7 +148,7 @@ // // @Test(timeout=20000) // public void repeatYWider() { -// setStyle("-fx-border-image-source: url('javafx/scene/layout/border.png');" + +// setStyle("-fx-border-image-source: url('test/robot/javafx/scene/layout/border.png');" + // "-fx-border-image-repeat: repeat-y;" + // "-fx-border-image-slice: 28;" + // "-fx-border-image-width: 40;"); @@ -157,7 +157,7 @@ // @Test(timeout=20000) // public void withInsets() { // setStyle( -// "-fx-border-image-source: url('javafx/scene/layout/popover-no-arrow-empty.png');" + +// "-fx-border-image-source: url('test/robot/javafx/scene/layout/popover-no-arrow-empty.png');" + // "-fx-border-image-slice: 78 50 60 50;" + // "-fx-border-image-width: 78 50 60 50;"); // } @@ -165,7 +165,7 @@ // @Test(timeout=20000) // public void withInsets2() { // setStyle( -// "-fx-border-image-source: url('javafx/scene/layout/popover-no-arrow-empty.png');" + +// "-fx-border-image-source: url('test/robot/javafx/scene/layout/popover-no-arrow-empty.png');" + // "-fx-border-image-slice: 78 50 60 50;" + // "-fx-border-image-width: 78 50 60 50;" + // "-fx-border-image-insets: -27 -37 -47 -37;"); @@ -174,7 +174,7 @@ // @Test(timeout=20000) // public void button() { // setStyle( -// "-fx-border-image-source: url('javafx/scene/layout/BlackButton.png');" + +// "-fx-border-image-source: url('test/robot/javafx/scene/layout/BlackButton.png');" + // "-fx-border-image-slice: 25 95 25 95 fill;" + // "-fx-border-image-width: 25 95 25 95;" + // "-fx-border-image-repeat: stretch;"); diff --git a/tests/system/src/test/java/javafx/scene/layout/RegionBorderStrokeUITest.java b/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBorderStrokeUITest.java rename from tests/system/src/test/java/javafx/scene/layout/RegionBorderStrokeUITest.java rename to tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBorderStrokeUITest.java --- a/tests/system/src/test/java/javafx/scene/layout/RegionBorderStrokeUITest.java +++ b/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionBorderStrokeUITest.java @@ -22,8 +22,9 @@ * questions. */ -package javafx.scene.layout; +package test.robot.javafx.scene.layout; +import test.robot.javafx.scene.layout.RegionUITestBase; import org.junit.Test; /** @@ -366,273 +367,273 @@ //// region.setStyle("-fx-background-color: lightgrey;" + //// "-fx-border-style: solid;" + //// "-fx-border-width: thin;" + -//// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +//// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); //// } // // public void image_BorderWidth_Thin1(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: solid;" + // "-fx-border-width: 1;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // //// public void image_BorderWidth_Medium(Region region) { //// region.setStyle("-fx-background-color: lightgrey;" + //// "-fx-border-style: solid;" + //// "-fx-border-width: medium;" + -//// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +//// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); //// } // // public void image_BorderWidth_Medium2(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: solid;" + // "-fx-border-width: 3;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // //// public void image_BorderWidth_Thick(Region region) { //// region.setStyle("-fx-background-color: lightgrey;" + //// "-fx-border-style: solid;" + //// "-fx-border-width: thick;" + -//// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +//// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); //// } // // public void image_BorderWidth_Thick2(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: solid;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_Solid(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: solid;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_SolidPhase5(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: solid phase 5;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_SolidCentered(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: solid centered;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_SolidInside(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: solid inside;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_SolidOutside(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: solid outside;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_SolidLineJoinBevel(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: solid line-join bevel;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_SolidLineJoinRound(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: solid line-join round;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_SolidLineJoinMiter5(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: solid line-join miter 5;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_SolidLineCapSquare(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: solid line-cap square;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_SolidLineCapButt(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: solid line-cap butt;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_SolidLineCapRound(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: solid line-cap round;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_Dashed(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: dashed;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_DashedPhase5(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: dashed phase 5;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_DashedCentered(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: dashed centered;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_DashedInside(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: dashed inside;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_DashedOutside(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: dashed outside;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_DasheddLineJoinBevel(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: dashed line-join bevel;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_DashedLineJoinRound(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: dashed line-join round;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_DashedLineJoinMiter5(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: dashed line-join miter 5;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_DashedLineCapSquare(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: dashed line-cap square;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_DashedLineCapButt(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: dashed line-cap butt;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_DashedLineCapRound(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: dashed line-cap round;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_Dotted(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: dotted;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_DottedPhase5(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: dotted phase 5;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_DottedCentered(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: dotted centered;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_DottedInside(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: dotted inside;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_DottedOutside(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: dotted outside;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_DotteddLineJoinBevel(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: dotted line-join bevel;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_DottedLineJoinRound(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: dotted line-join round;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_DottedLineJoinMiter5(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: dotted line-join miter 5;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_DottedLineCapSquare(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: dotted line-cap square;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_DottedLineCapButt(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: dotted line-cap butt;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_Style_DottedLineCapRound(Region region) { // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-border-style: dotted line-cap round;" + // "-fx-border-width: 5;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');"); +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');"); // } // // public void image_MultipleInsetBorders(Region region) { @@ -647,7 +648,7 @@ // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-background-radius: 15;" + // "-fx-border-style: solid;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');" + +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');" + // "-fx-border-width: 5;" + // "-fx-border-radius: 15;"); // } @@ -656,7 +657,7 @@ // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-background-radius: 25 20 25 30;" + // "-fx-border-style: solid;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');" + +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');" + // "-fx-border-width: 5;" + // "-fx-border-radius: 15 20 25 30;"); // } @@ -665,7 +666,7 @@ // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-background-radius: 15;" + // "-fx-border-style: solid;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');" + +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');" + // "-fx-border-width: 5 10 15 20;" + // "-fx-border-radius: 15;"); // } @@ -674,7 +675,7 @@ // region.setStyle("-fx-background-color: lightgrey;" + // "-fx-background-radius: 15 20 25 30;" + // "-fx-border-style: solid;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');" + +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');" + // "-fx-border-width: 5 10 15 20;" + // "-fx-border-radius: 15 20 25 30;"); // } diff --git a/tests/system/src/test/java/javafx/scene/layout/RegionShapeUITest.java b/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionShapeUITest.java rename from tests/system/src/test/java/javafx/scene/layout/RegionShapeUITest.java rename to tests/system/src/test/java/test/robot/javafx/scene/layout/RegionShapeUITest.java --- a/tests/system/src/test/java/javafx/scene/layout/RegionShapeUITest.java +++ b/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionShapeUITest.java @@ -22,8 +22,9 @@ * questions. */ -package javafx.scene.layout; +package test.robot.javafx.scene.layout; +import test.robot.javafx.scene.layout.RegionUITestBase; import org.junit.Test; /** @@ -155,38 +156,38 @@ // } // // public void imageFill(Region region) { -// region.setStyle("-fx-background-image: url('region/test20x20.png');" + +// region.setStyle("-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + // "-fx-shape: " + ARROW + ";"); // } // // public void imageFill_NotScaled(Region region) { -// region.setStyle("-fx-background-image: url('region/test20x20.png');" + +// region.setStyle("-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + // "-fx-scale-shape: false;" + // "-fx-shape: " + ARROW + ";"); // } // // public void imageFill_NotScaledAndNotCentered(Region region) { -// region.setStyle("-fx-background-image: url('region/test20x20.png');" + +// region.setStyle("-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + // "-fx-position-shape: false;" + // "-fx-scale-shape: false;" + // "-fx-shape: " + ARROW + ";"); // } // // public void imageFill_cover(Region region) { -// region.setStyle("-fx-background-image: url('region/test20x20.png');" + +// region.setStyle("-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + // "-fx-background-size: cover;" + // "-fx-shape: " + ARROW + ";"); // } // // public void imageFill_cover_NotScaled(Region region) { -// region.setStyle("-fx-background-image: url('region/test20x20.png');" + +// region.setStyle("-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + // "-fx-background-size: cover;" + // "-fx-scale-shape: false;" + // "-fx-shape: " + ARROW + ";"); // } // // public void imageFill_cover_NotScaledAndNotCentered(Region region) { -// region.setStyle("-fx-background-image: url('region/test20x20.png');" + +// region.setStyle("-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + // "-fx-background-size: cover;" + // "-fx-position-shape: false;" + // "-fx-scale-shape: false;" + @@ -194,20 +195,20 @@ // } // // public void multipleFills(Region region) { -// region.setStyle("-fx-background-color: red, repeating-image-pattern('region/test20x20.png'), blue;" + +// region.setStyle("-fx-background-color: red, repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png'), blue;" + // "-fx-background-insets: 0, 20, 40;" + // "-fx-shape: " + ARROW + ";"); // } // // public void multipleFills_NotScaled(Region region) { -// region.setStyle("-fx-background-color: red, repeating-image-pattern('region/test20x20.png'), blue;" + +// region.setStyle("-fx-background-color: red, repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png'), blue;" + // "-fx-background-insets: 0, 20, 40;" + // "-fx-scale-shape: false;" + // "-fx-shape: " + ARROW + ";"); // } // // public void multipleFills_NotScaledAndNotCentered(Region region) { -// region.setStyle("-fx-background-color: red, repeating-image-pattern('region/test20x20.png'), blue;" + +// region.setStyle("-fx-background-color: red, repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png'), blue;" + // "-fx-background-insets: 0, 20, 40;" + // "-fx-position-shape: false;" + // "-fx-scale-shape: false;" + @@ -464,7 +465,7 @@ // public void solidImageStroke_5(Region region) { // region.setStyle("-fx-border-style: solid;" + // "-fx-background-color: lightgray;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');" + +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');" + // "-fx-border-width: 5;" + // "-fx-shape: " + ARROW + ";"); // } @@ -472,7 +473,7 @@ // public void solidImageStroke_5_NotScaled(Region region) { // region.setStyle("-fx-border-style: solid;" + // "-fx-background-color: lightgray;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');" + +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');" + // "-fx-border-width: 5;" + // "-fx-scale-shape: false;" + // "-fx-shape: " + ARROW + ";"); @@ -481,7 +482,7 @@ // public void solidImageStroke_5_NotScaledAndNotCentered(Region region) { // region.setStyle("-fx-border-style: solid;" + // "-fx-background-color: lightgray;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');" + +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');" + // "-fx-border-width: 5;" + // "-fx-position-shape: false;" + // "-fx-scale-shape: false;" + @@ -626,7 +627,7 @@ // public void dashedImageStroke_5(Region region) { // region.setStyle("-fx-border-style: dashed;" + // "-fx-background-color: lightgray;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');" + +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');" + // "-fx-border-width: 5;" + // "-fx-shape: " + ARROW + ";"); // } @@ -634,7 +635,7 @@ // public void dashedImageStroke_5_NotScaled(Region region) { // region.setStyle("-fx-border-style: dashed;" + // "-fx-background-color: lightgray;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');" + +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');" + // "-fx-border-width: 5;" + // "-fx-scale-shape: false;" + // "-fx-shape: " + ARROW + ";"); @@ -643,7 +644,7 @@ // public void dashedImageStroke_5_NotScaledAndNotCentered(Region region) { // region.setStyle("-fx-border-style: dashed;" + // "-fx-background-color: lightgray;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');" + +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');" + // "-fx-border-width: 5;" + // "-fx-position-shape: false;" + // "-fx-scale-shape: false;" + @@ -788,7 +789,7 @@ // public void dottedImageStroke_5(Region region) { // region.setStyle("-fx-border-style: dotted;" + // "-fx-background-color: lightgray;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');" + +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');" + // "-fx-border-width: 5;" + // "-fx-shape: " + ARROW + ";"); // } @@ -796,7 +797,7 @@ // public void dottedImageStroke_5_NotScaled(Region region) { // region.setStyle("-fx-border-style: dotted;" + // "-fx-background-color: lightgray;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');" + +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');" + // "-fx-border-width: 5;" + // "-fx-scale-shape: false;" + // "-fx-shape: " + ARROW + ";"); @@ -805,7 +806,7 @@ // public void dottedImageStroke_5_NotScaledAndNotCentered(Region region) { // region.setStyle("-fx-border-style: dotted;" + // "-fx-background-color: lightgray;" + -// "-fx-border-color: repeating-image-pattern('region/test20x20.png');" + +// "-fx-border-color: repeating-image-pattern('test/robot/javafx/scene/layout/test20x20.png');" + // "-fx-border-width: 5;" + // "-fx-position-shape: false;" + // "-fx-scale-shape: false;" + @@ -832,7 +833,7 @@ // // // This is a test case that should have no effect //// public void shape_arrow_imageFill_repeatX(Region region) { -//// region.setStyle("-fx-background-image: url('region/test20x20.png');" + +//// region.setStyle("-fx-background-image: url('test/robot/javafx/scene/layout/test20x20.png');" + //// "-fx-background-repeat: repeat-x;" + //// "-fx-shape: " + ARROW + ";"); //// } diff --git a/tests/system/src/test/java/javafx/scene/layout/RegionUITestBase.java b/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionUITestBase.java rename from tests/system/src/test/java/javafx/scene/layout/RegionUITestBase.java rename to tests/system/src/test/java/test/robot/javafx/scene/layout/RegionUITestBase.java --- a/tests/system/src/test/java/javafx/scene/layout/RegionUITestBase.java +++ b/tests/system/src/test/java/test/robot/javafx/scene/layout/RegionUITestBase.java @@ -22,7 +22,7 @@ * questions. */ -package javafx.scene.layout; +package test.robot.javafx.scene.layout; import javafx.scene.Group; import javafx.scene.Scene; @@ -33,7 +33,12 @@ import java.util.LinkedList; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import testharness.VisualTestBase; +import javafx.scene.layout.Background; +import javafx.scene.layout.BackgroundFill; +import javafx.scene.layout.Border; +import javafx.scene.layout.CornerRadii; +import javafx.scene.layout.Region; +import test.robot.testharness.VisualTestBase; /** */ diff --git a/tests/system/src/test/java/painttest/ImagePaintTest.java b/tests/system/src/test/java/test/robot/painttest/ImagePaintTest.java rename from tests/system/src/test/java/painttest/ImagePaintTest.java rename to tests/system/src/test/java/test/robot/painttest/ImagePaintTest.java --- a/tests/system/src/test/java/painttest/ImagePaintTest.java +++ b/tests/system/src/test/java/test/robot/painttest/ImagePaintTest.java @@ -23,7 +23,7 @@ * questions. */ -package painttest; +package test.robot.painttest; import javafx.scene.Group; import javafx.scene.Scene; @@ -35,7 +35,7 @@ import javafx.scene.shape.Rectangle; import javafx.stage.Stage; import org.junit.Test; -import testharness.VisualTestBase; +import test.robot.testharness.VisualTestBase; /** * ImagePaint tests diff --git a/tests/system/src/test/java/scenegraph/JDK8130122Test.java b/tests/system/src/test/java/test/robot/scenegraph/JDK8130122Test.java rename from tests/system/src/test/java/scenegraph/JDK8130122Test.java rename to tests/system/src/test/java/test/robot/scenegraph/JDK8130122Test.java --- a/tests/system/src/test/java/scenegraph/JDK8130122Test.java +++ b/tests/system/src/test/java/test/robot/scenegraph/JDK8130122Test.java @@ -23,7 +23,7 @@ * questions. */ -package scenegraph; +package test.robot.scenegraph; import javafx.collections.FXCollections; import javafx.collections.ObservableList; @@ -38,7 +38,7 @@ import javafx.scene.shape.Rectangle; import javafx.stage.Stage; import org.junit.Test; -import testharness.VisualTestBase; +import test.robot.testharness.VisualTestBase; /** * Test bounds update of invisible node in the scene graph. diff --git a/tests/system/src/test/java/test3d/MeshCompareTest.java b/tests/system/src/test/java/test/robot/test3d/MeshCompareTest.java rename from tests/system/src/test/java/test3d/MeshCompareTest.java rename to tests/system/src/test/java/test/robot/test3d/MeshCompareTest.java --- a/tests/system/src/test/java/test3d/MeshCompareTest.java +++ b/tests/system/src/test/java/test/robot/test3d/MeshCompareTest.java @@ -23,7 +23,7 @@ * questions. */ -package test3d; +package test.robot.test3d; import com.sun.javafx.geom.Vec3f; import java.util.ArrayList; @@ -49,7 +49,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import testharness.VisualTestBase; +import test.robot.testharness.VisualTestBase; /** * 3D Snapshot validation tests. diff --git a/tests/system/src/test/java/test3d/NearAndFarClipTest.java b/tests/system/src/test/java/test/robot/test3d/NearAndFarClipTest.java rename from tests/system/src/test/java/test3d/NearAndFarClipTest.java rename to tests/system/src/test/java/test/robot/test3d/NearAndFarClipTest.java --- a/tests/system/src/test/java/test3d/NearAndFarClipTest.java +++ b/tests/system/src/test/java/test/robot/test3d/NearAndFarClipTest.java @@ -23,7 +23,7 @@ * questions. */ -package test3d; +package test.robot.test3d; import javafx.application.ConditionalFeature; import javafx.application.Platform; @@ -34,7 +34,7 @@ import javafx.scene.shape.Rectangle; import javafx.stage.Stage; import org.junit.Test; -import testharness.VisualTestBase; +import test.robot.testharness.VisualTestBase; /** * Basic visual near and far clipping tests using glass Robot to sample pixels. diff --git a/tests/system/src/test/java/test3d/RT35019Test.java b/tests/system/src/test/java/test/robot/test3d/RT35019Test.java rename from tests/system/src/test/java/test3d/RT35019Test.java rename to tests/system/src/test/java/test/robot/test3d/RT35019Test.java --- a/tests/system/src/test/java/test3d/RT35019Test.java +++ b/tests/system/src/test/java/test/robot/test3d/RT35019Test.java @@ -23,7 +23,7 @@ * questions. */ -package test3d; +package test.robot.test3d; import javafx.scene.Group; import javafx.scene.PerspectiveCamera; @@ -34,7 +34,7 @@ import javafx.scene.transform.Rotate; import javafx.stage.Stage; import org.junit.Test; -import testharness.VisualTestBase; +import test.robot.testharness.VisualTestBase; /** * Test 2D shapes rendered with a 3D transform where some of the shapes diff --git a/tests/system/src/test/java/test3d/Snapshot3DTest.java b/tests/system/src/test/java/test/robot/test3d/Snapshot3DTest.java rename from tests/system/src/test/java/test3d/Snapshot3DTest.java rename to tests/system/src/test/java/test/robot/test3d/Snapshot3DTest.java --- a/tests/system/src/test/java/test3d/Snapshot3DTest.java +++ b/tests/system/src/test/java/test/robot/test3d/Snapshot3DTest.java @@ -23,7 +23,7 @@ * questions. */ -package test3d; +package test.robot.test3d; import java.util.ArrayList; import java.util.Collection; @@ -45,7 +45,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import testharness.VisualTestBase; +import test.robot.testharness.VisualTestBase; /** * 3D Snapshot validation tests. diff --git a/tests/system/src/test/java/test3d/TriangleMeshPNTValidationTest.java b/tests/system/src/test/java/test/robot/test3d/TriangleMeshPNTValidationTest.java rename from tests/system/src/test/java/test3d/TriangleMeshPNTValidationTest.java rename to tests/system/src/test/java/test/robot/test3d/TriangleMeshPNTValidationTest.java --- a/tests/system/src/test/java/test3d/TriangleMeshPNTValidationTest.java +++ b/tests/system/src/test/java/test/robot/test3d/TriangleMeshPNTValidationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package test3d; +package test.robot.test3d; import javafx.application.ConditionalFeature; import javafx.application.Platform; @@ -36,7 +36,7 @@ import javafx.scene.shape.VertexFormat; import javafx.stage.Stage; import org.junit.Test; -import testharness.VisualTestBase; +import test.robot.testharness.VisualTestBase; /** * Basic TriangleMesh validation tests. diff --git a/tests/system/src/test/java/test3d/TriangleMeshValidationTest.java b/tests/system/src/test/java/test/robot/test3d/TriangleMeshValidationTest.java rename from tests/system/src/test/java/test3d/TriangleMeshValidationTest.java rename to tests/system/src/test/java/test/robot/test3d/TriangleMeshValidationTest.java --- a/tests/system/src/test/java/test3d/TriangleMeshValidationTest.java +++ b/tests/system/src/test/java/test/robot/test3d/TriangleMeshValidationTest.java @@ -23,7 +23,7 @@ * questions. */ -package test3d; +package test.robot.test3d; import javafx.application.ConditionalFeature; import javafx.application.Platform; @@ -37,7 +37,7 @@ import javafx.scene.shape.TriangleMesh; import javafx.stage.Stage; import org.junit.Test; -import testharness.VisualTestBase; +import test.robot.testharness.VisualTestBase; /** * Basic TriangleMesh validation tests. diff --git a/tests/system/src/test/java/testharness/VisualTestBase.java b/tests/system/src/test/java/test/robot/testharness/VisualTestBase.java rename from tests/system/src/test/java/testharness/VisualTestBase.java rename to tests/system/src/test/java/test/robot/testharness/VisualTestBase.java --- a/tests/system/src/test/java/testharness/VisualTestBase.java +++ b/tests/system/src/test/java/test/robot/testharness/VisualTestBase.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package testharness; +package test.robot.testharness; import javafx.animation.AnimationTimer; import javafx.application.Application; @@ -41,11 +41,11 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; -import util.Util; +import test.util.Util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static util.Util.TIMEOUT; +import static test.util.Util.TIMEOUT; /** * Common base class for testing snapshot. diff --git a/tests/system/src/test/java/sandbox/Constants.java b/tests/system/src/test/java/test/sandbox/Constants.java rename from tests/system/src/test/java/sandbox/Constants.java rename to tests/system/src/test/java/test/sandbox/Constants.java --- a/tests/system/src/test/java/sandbox/Constants.java +++ b/tests/system/src/test/java/test/sandbox/Constants.java @@ -23,7 +23,7 @@ * questions. */ -package sandbox; +package test.sandbox; /** * Global constants for sandbox tests. diff --git a/tests/system/src/test/java/sandbox/SandboxAppTest.java b/tests/system/src/test/java/test/sandbox/SandboxAppTest.java rename from tests/system/src/test/java/sandbox/SandboxAppTest.java rename to tests/system/src/test/java/test/sandbox/SandboxAppTest.java --- a/tests/system/src/test/java/sandbox/SandboxAppTest.java +++ b/tests/system/src/test/java/test/sandbox/SandboxAppTest.java @@ -23,7 +23,7 @@ * questions. */ -package sandbox; +package test.sandbox; import com.sun.javafx.PlatformUtil; import java.io.File; @@ -32,7 +32,7 @@ import static org.junit.Assert.*; import static org.junit.Assume.*; -import static sandbox.Constants.*; +import static test.sandbox.Constants.*; /** * Unit test for running JavaFX apps in a sandbox with a restrictive diff --git a/tests/system/src/test/java/sandbox/app/FXApp.java b/tests/system/src/test/java/test/sandbox/app/FXApp.java rename from tests/system/src/test/java/sandbox/app/FXApp.java rename to tests/system/src/test/java/test/sandbox/app/FXApp.java --- a/tests/system/src/test/java/sandbox/app/FXApp.java +++ b/tests/system/src/test/java/test/sandbox/app/FXApp.java @@ -23,7 +23,7 @@ * questions. */ -package sandbox.app; +package test.sandbox.app; import javafx.animation.KeyFrame; import javafx.animation.Timeline; @@ -32,7 +32,7 @@ import javafx.stage.Stage; import javafx.util.Duration; -import static sandbox.Constants.*; +import static test.sandbox.Constants.*; /** * FX application to test running with a security manager installed. Note that diff --git a/tests/system/src/test/java/sandbox/app/FXNonApp.java b/tests/system/src/test/java/test/sandbox/app/FXNonApp.java rename from tests/system/src/test/java/sandbox/app/FXNonApp.java rename to tests/system/src/test/java/test/sandbox/app/FXNonApp.java --- a/tests/system/src/test/java/sandbox/app/FXNonApp.java +++ b/tests/system/src/test/java/test/sandbox/app/FXNonApp.java @@ -23,7 +23,7 @@ * questions. */ -package sandbox.app; +package test.sandbox.app; /** * FX application to test running with a security manager installed. Note that diff --git a/tests/system/src/test/java/sandbox/app/JFXPanelApp.java b/tests/system/src/test/java/test/sandbox/app/JFXPanelApp.java rename from tests/system/src/test/java/sandbox/app/JFXPanelApp.java rename to tests/system/src/test/java/test/sandbox/app/JFXPanelApp.java --- a/tests/system/src/test/java/sandbox/app/JFXPanelApp.java +++ b/tests/system/src/test/java/test/sandbox/app/JFXPanelApp.java @@ -23,7 +23,7 @@ * questions. */ -package sandbox.app; +package test.sandbox.app; import java.awt.BorderLayout; import java.awt.Dimension; @@ -39,7 +39,7 @@ import javax.swing.SwingUtilities; import javax.swing.Timer; -import static sandbox.Constants.*; +import static test.sandbox.Constants.*; /** * JFXPanel application to test running with a security manager installed. diff --git a/tests/system/src/test/java/sandbox/app/JFXPanelImplicitExitApp.java b/tests/system/src/test/java/test/sandbox/app/JFXPanelImplicitExitApp.java rename from tests/system/src/test/java/sandbox/app/JFXPanelImplicitExitApp.java rename to tests/system/src/test/java/test/sandbox/app/JFXPanelImplicitExitApp.java --- a/tests/system/src/test/java/sandbox/app/JFXPanelImplicitExitApp.java +++ b/tests/system/src/test/java/test/sandbox/app/JFXPanelImplicitExitApp.java @@ -23,7 +23,7 @@ * questions. */ -package sandbox.app; +package test.sandbox.app; /** * JFXPanel application to test running with a security manager installed. diff --git a/tests/system/src/test/java/sandbox/app/Util.java b/tests/system/src/test/java/test/sandbox/app/Util.java rename from tests/system/src/test/java/sandbox/app/Util.java rename to tests/system/src/test/java/test/sandbox/app/Util.java --- a/tests/system/src/test/java/sandbox/app/Util.java +++ b/tests/system/src/test/java/test/sandbox/app/Util.java @@ -23,7 +23,7 @@ * questions. */ -package sandbox.app; +package test.sandbox.app; import java.io.InputStream; import java.net.URL; @@ -37,7 +37,7 @@ import javafx.scene.web.WebEngine; import javafx.scene.web.WebView; -import static sandbox.Constants.*; +import static test.sandbox.Constants.*; /** * diff --git a/tests/system/src/test/java/shutdowntest/Constants.java b/tests/system/src/test/java/test/shutdowntest/Constants.java rename from tests/system/src/test/java/shutdowntest/Constants.java rename to tests/system/src/test/java/test/shutdowntest/Constants.java --- a/tests/system/src/test/java/shutdowntest/Constants.java +++ b/tests/system/src/test/java/test/shutdowntest/Constants.java @@ -23,7 +23,7 @@ * questions. */ -package shutdowntest; +package test.shutdowntest; public class Constants { diff --git a/tests/system/src/test/java/shutdowntest/ShutdownHookApp.java b/tests/system/src/test/java/test/shutdowntest/ShutdownHookApp.java rename from tests/system/src/test/java/shutdowntest/ShutdownHookApp.java rename to tests/system/src/test/java/test/shutdowntest/ShutdownHookApp.java --- a/tests/system/src/test/java/shutdowntest/ShutdownHookApp.java +++ b/tests/system/src/test/java/test/shutdowntest/ShutdownHookApp.java @@ -23,7 +23,7 @@ * questions. */ -package shutdowntest; +package test.shutdowntest; import java.io.IOException; import java.io.OutputStream; @@ -37,9 +37,9 @@ import javafx.scene.Scene; import javafx.stage.Stage; import javafx.util.Duration; -import util.Util; +import test.util.Util; -import static shutdowntest.Constants.*; +import static test.shutdowntest.Constants.*; /** * Test application launched by ShutdownHookTest. The FX application adds a diff --git a/tests/system/src/test/java/shutdowntest/ShutdownHookTest.java b/tests/system/src/test/java/test/shutdowntest/ShutdownHookTest.java rename from tests/system/src/test/java/shutdowntest/ShutdownHookTest.java rename to tests/system/src/test/java/test/shutdowntest/ShutdownHookTest.java --- a/tests/system/src/test/java/shutdowntest/ShutdownHookTest.java +++ b/tests/system/src/test/java/test/shutdowntest/ShutdownHookTest.java @@ -23,7 +23,7 @@ * questions. */ -package shutdowntest; +package test.shutdowntest; import java.io.InputStream; import java.net.ServerSocket; @@ -31,7 +31,7 @@ import org.junit.Test; import static org.junit.Assert.*; -import static shutdowntest.Constants.*; +import static test.shutdowntest.Constants.*; /** * Unit test for calling Platform runLater from a ShutdownHook. diff --git a/tests/system/src/test/java/util/Util.java b/tests/system/src/test/java/test/util/Util.java rename from tests/system/src/test/java/util/Util.java rename to tests/system/src/test/java/test/util/Util.java --- a/tests/system/src/test/java/util/Util.java +++ b/tests/system/src/test/java/test/util/Util.java @@ -23,7 +23,7 @@ * questions. */ -package util; +package test.util; import java.util.ArrayList; import java.util.Iterator; diff --git a/tests/system/src/test/resources/com/sun/javafx/css/StylesheetTest.css b/tests/system/src/test/resources/test/com/sun/javafx/css/StylesheetTest.css rename from tests/system/src/test/resources/com/sun/javafx/css/StylesheetTest.css rename to tests/system/src/test/resources/test/com/sun/javafx/css/StylesheetTest.css diff --git a/tests/system/src/test/resources/javafx/scene/layout/RegionBackgroundImageUITest.html b/tests/system/src/test/resources/test/robot/javafx/scene/layout/RegionBackgroundImageUITest.html rename from tests/system/src/test/resources/javafx/scene/layout/RegionBackgroundImageUITest.html rename to tests/system/src/test/resources/test/robot/javafx/scene/layout/RegionBackgroundImageUITest.html diff --git a/tests/system/src/test/resources/javafx/scene/layout/border-stretch.png b/tests/system/src/test/resources/test/robot/javafx/scene/layout/border-stretch.png rename from tests/system/src/test/resources/javafx/scene/layout/border-stretch.png rename to tests/system/src/test/resources/test/robot/javafx/scene/layout/border-stretch.png diff --git a/tests/system/src/test/resources/javafx/scene/layout/border-uneven.png b/tests/system/src/test/resources/test/robot/javafx/scene/layout/border-uneven.png rename from tests/system/src/test/resources/javafx/scene/layout/border-uneven.png rename to tests/system/src/test/resources/test/robot/javafx/scene/layout/border-uneven.png diff --git a/tests/system/src/test/resources/javafx/scene/layout/border.png b/tests/system/src/test/resources/test/robot/javafx/scene/layout/border.png rename from tests/system/src/test/resources/javafx/scene/layout/border.png rename to tests/system/src/test/resources/test/robot/javafx/scene/layout/border.png diff --git a/tests/system/src/test/resources/javafx/scene/layout/test20x20.png b/tests/system/src/test/resources/test/robot/javafx/scene/layout/test20x20.png rename from tests/system/src/test/resources/javafx/scene/layout/test20x20.png rename to tests/system/src/test/resources/test/robot/javafx/scene/layout/test20x20.png diff --git a/tests/system/src/test/resources/javafx/scene/layout/test20x20@2x.png b/tests/system/src/test/resources/test/robot/javafx/scene/layout/test20x20@2x.png rename from tests/system/src/test/resources/javafx/scene/layout/test20x20@2x.png rename to tests/system/src/test/resources/test/robot/javafx/scene/layout/test20x20@2x.png diff --git a/tests/system/src/test/resources/javafx/scene/layout/test48x48.png b/tests/system/src/test/resources/test/robot/javafx/scene/layout/test48x48.png rename from tests/system/src/test/resources/javafx/scene/layout/test48x48.png rename to tests/system/src/test/resources/test/robot/javafx/scene/layout/test48x48.png diff --git a/tests/system/src/test/resources/javafx/scene/layout/test48x48@2x.png b/tests/system/src/test/resources/test/robot/javafx/scene/layout/test48x48@2x.png rename from tests/system/src/test/resources/javafx/scene/layout/test48x48@2x.png rename to tests/system/src/test/resources/test/robot/javafx/scene/layout/test48x48@2x.png diff --git a/tests/system/src/test/resources/sandbox/app/test.css b/tests/system/src/test/resources/test/sandbox/app/test.css rename from tests/system/src/test/resources/sandbox/app/test.css rename to tests/system/src/test/resources/test/sandbox/app/test.css diff --git a/tests/system/src/test/resources/sandbox/app/test.fxml b/tests/system/src/test/resources/test/sandbox/app/test.fxml rename from tests/system/src/test/resources/sandbox/app/test.fxml rename to tests/system/src/test/resources/test/sandbox/app/test.fxml diff --git a/tests/system/src/test/resources/sandbox/app/test.html b/tests/system/src/test/resources/test/sandbox/app/test.html rename from tests/system/src/test/resources/sandbox/app/test.html rename to tests/system/src/test/resources/test/sandbox/app/test.html diff --git a/tests/system/src/test/resources/sandbox/test.policy b/tests/system/src/test/resources/test/sandbox/test.policy rename from tests/system/src/test/resources/sandbox/test.policy rename to tests/system/src/test/resources/test/sandbox/test.policy