# HG changeset patch # Parent 183e964c28f52740ae210942fc73dbe6fd877631 # Parent dbf7eaf503913e3c5f9fe1369891df7ac58161b2 diff --git a/apps/build.xml b/apps/build.xml --- a/apps/build.xml +++ b/apps/build.xml @@ -11,6 +11,7 @@ + @@ -18,6 +19,7 @@ + diff --git a/apps/tests/HelloTest/build.xml b/apps/tests/HelloTest/build.xml new file mode 100644 --- /dev/null +++ b/apps/tests/HelloTest/build.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + Builds, tests, and runs the project HelloTest. + + + diff --git a/apps/tests/HelloTest/manifest.mf b/apps/tests/HelloTest/manifest.mf new file mode 100644 --- /dev/null +++ b/apps/tests/HelloTest/manifest.mf @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +X-COMMENT: Main-Class will be added automatically by build + diff --git a/apps/tests/HelloTest/nbproject/build-impl.xml b/apps/tests/HelloTest/nbproject/build-impl.xml new file mode 100644 --- /dev/null +++ b/apps/tests/HelloTest/nbproject/build-impl.xml @@ -0,0 +1,1396 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set src.dir + Must set build.dir + Must set dist.dir + Must set build.classes.dir + Must set dist.javadoc.dir + Must set build.test.classes.dir + Must set build.test.results.dir + Must set build.classes.excludes + Must set dist.jar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + No tests executed. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set JVM to use for profiling in profiler.info.jvm + Must set profiler agent JVM arguments in profiler.info.jvmargs.agent + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select some files in the IDE or set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + To run this application from the command line without Ant, try: + + java -jar "${dist.jar.resolved}" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set run.class + + + + Must select one file in the IDE or set run.class + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set debug.class + + + + + Must select one file in the IDE or set debug.class + + + + + Must set fix.includes + + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + Must select one file in the IDE or set profile.class + This target only works when run from inside the NetBeans IDE. + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set run.class + + + + + + Must select some files in the IDE or set test.includes + + + + + Must select one file in the IDE or set run.class + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select some files in the IDE or set javac.includes + + + + + + + + + + + + + + + + + + Some tests failed; see details above. + + + + + + + + + Must select some files in the IDE or set test.includes + + + + Some tests failed; see details above. + + + + Must select some files in the IDE or set test.class + Must select some method in the IDE or set test.method + + + + Some tests failed; see details above. + + + + + Must select one file in the IDE or set test.class + + + + Must select one file in the IDE or set test.class + Must select some method in the IDE or set test.method + + + + + + + + + + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/tests/HelloTest/nbproject/genfiles.properties b/apps/tests/HelloTest/nbproject/genfiles.properties new file mode 100644 --- /dev/null +++ b/apps/tests/HelloTest/nbproject/genfiles.properties @@ -0,0 +1,8 @@ +build.xml.data.CRC32=c14db0ba +build.xml.script.CRC32=66307b13 +build.xml.stylesheet.CRC32=8064a381@1.75.2.48 +# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. +# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. +nbproject/build-impl.xml.data.CRC32=c14db0ba +nbproject/build-impl.xml.script.CRC32=4fa80b8d +nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48 diff --git a/apps/tests/HelloTest/nbproject/project.properties b/apps/tests/HelloTest/nbproject/project.properties new file mode 100644 --- /dev/null +++ b/apps/tests/HelloTest/nbproject/project.properties @@ -0,0 +1,77 @@ +annotation.processing.enabled=true +annotation.processing.enabled.in.editor=false +annotation.processing.processors.list= +annotation.processing.run.all.processors=true +annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output +application.title=HelloTest +application.vendor=ekleyman +build.classes.dir=${build.dir}/classes +build.classes.excludes=**/*.java,**/*.form +# This directory is removed when the project is cleaned: +build.dir=build +build.generated.dir=${build.dir}/generated +build.generated.sources.dir=${build.dir}/generated-sources +# Only compile against the classpath explicitly listed here: +build.sysclasspath=ignore +build.test.classes.dir=${build.dir}/test/classes +build.test.results.dir=${build.dir}/test/results +# Uncomment to specify the preferred debugger connection transport: +#debug.transport=dt_socket +debug.classpath=\ + ${run.classpath} +debug.test.classpath=\ + ${run.test.classpath} +# Files in build.classes.dir which should be excluded from distribution jar +dist.archive.excludes= +# This directory is removed when the project is cleaned: +dist.dir=dist +dist.jar=${dist.dir}/HelloTest.jar +dist.javadoc.dir=${dist.dir}/javadoc +endorsed.classpath= +excludes= +file.reference.HelloTest-src=src +file.reference.jfxrt.jar=../../../build/sdk/rt/lib/ext/jfxrt.jar +includes=** +jar.compress=false +javac.classpath=\ + ${file.reference.jfxrt.jar} +# Space-separated list of extra javac options +javac.compilerargs= +javac.deprecation=false +javac.processorpath=\ + ${javac.classpath} +javac.source=1.8 +javac.target=1.8 +javac.test.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir} +javac.test.processorpath=\ + ${javac.test.classpath} +javadoc.additionalparam= +javadoc.author=false +javadoc.encoding=${source.encoding} +javadoc.noindex=false +javadoc.nonavbar=false +javadoc.notree=false +javadoc.private=false +javadoc.splitindex=true +javadoc.use=true +javadoc.version=false +javadoc.windowtitle= +main.class=hellotest.HelloHighContrast +manifest.file=manifest.mf +meta.inf.dir=${src.dir}/META-INF +mkdist.disabled=false +platform.active=JDK_1.8 +run.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir} +# Space-separated list of JVM arguments used when running the project. +# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value. +# To set system properties for unit tests define test-sys-prop.name=value: +run.jvmargs= +run.test.classpath=\ + ${javac.test.classpath}:\ + ${build.test.classes.dir} +source.encoding=UTF-8 +src.dir=${file.reference.HelloTest-src} diff --git a/apps/tests/HelloTest/nbproject/project.xml b/apps/tests/HelloTest/nbproject/project.xml new file mode 100644 --- /dev/null +++ b/apps/tests/HelloTest/nbproject/project.xml @@ -0,0 +1,13 @@ + + + org.netbeans.modules.java.j2seproject + + + HelloTest + + + + + + + diff --git a/apps/toys/Hello/src/main/java/hello/HelloFPS.java b/apps/tests/HelloTest/src/hellotest/HelloFPS.java rename from apps/toys/Hello/src/main/java/hello/HelloFPS.java rename to apps/tests/HelloTest/src/hellotest/HelloFPS.java --- a/apps/toys/Hello/src/main/java/hello/HelloFPS.java +++ b/apps/tests/HelloTest/src/hellotest/HelloFPS.java @@ -23,7 +23,7 @@ * questions. */ -package hello; +package hellotest; import javafx.animation.KeyFrame; import javafx.animation.KeyValue; diff --git a/apps/toys/Hello/src/main/java/hello/HelloHighContrast.java b/apps/tests/HelloTest/src/hellotest/HelloHighContrast.java rename from apps/toys/Hello/src/main/java/hello/HelloHighContrast.java rename to apps/tests/HelloTest/src/hellotest/HelloHighContrast.java --- a/apps/toys/Hello/src/main/java/hello/HelloHighContrast.java +++ b/apps/tests/HelloTest/src/hellotest/HelloHighContrast.java @@ -23,7 +23,7 @@ * questions. */ -package hello; +package hellotest; import javafx.application.Application; import javafx.geometry.Insets; @@ -34,7 +34,6 @@ import javafx.stage.Stage; import com.sun.javafx.application.PlatformImpl; -import com.sun.javafx.css.StyleManager; public class HelloHighContrast extends Application { diff --git a/apps/tests/README.txt b/apps/tests/README.txt new file mode 100644 --- /dev/null +++ b/apps/tests/README.txt @@ -0,0 +1,3 @@ + +The applications in this area are not general purpose, and are generally +designed to be used for functional testing. diff --git a/tests/manual/Robot/build.xml b/apps/tests/Robot/build.xml rename from tests/manual/Robot/build.xml rename to apps/tests/Robot/build.xml diff --git a/tests/manual/Robot/manifest.mf b/apps/tests/Robot/manifest.mf rename from tests/manual/Robot/manifest.mf rename to apps/tests/Robot/manifest.mf diff --git a/tests/manual/Robot/nbproject/build-impl.xml b/apps/tests/Robot/nbproject/build-impl.xml rename from tests/manual/Robot/nbproject/build-impl.xml rename to apps/tests/Robot/nbproject/build-impl.xml diff --git a/tests/manual/Robot/nbproject/genfiles.properties b/apps/tests/Robot/nbproject/genfiles.properties rename from tests/manual/Robot/nbproject/genfiles.properties rename to apps/tests/Robot/nbproject/genfiles.properties diff --git a/tests/manual/Robot/nbproject/project.properties b/apps/tests/Robot/nbproject/project.properties rename from tests/manual/Robot/nbproject/project.properties rename to apps/tests/Robot/nbproject/project.properties --- a/tests/manual/Robot/nbproject/project.properties +++ b/apps/tests/Robot/nbproject/project.properties @@ -29,12 +29,12 @@ dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= -file.reference.jfxrt.jar=../../../build/sdk/rt/lib/ext/jfxrt.jar +jfxbuild.jfxrt.jar=../../../build/sdk/rt/lib/ext/jfxrt.jar file.reference.Robot-src=src includes=** jar.compress=false javac.classpath=\ - ${file.reference.jfxrt.jar} + ${jfxbuild.jfxrt.jar} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false diff --git a/tests/manual/Robot/nbproject/project.xml b/apps/tests/Robot/nbproject/project.xml rename from tests/manual/Robot/nbproject/project.xml rename to apps/tests/Robot/nbproject/project.xml diff --git a/tests/manual/Robot/src/robottest/BMPOutputStream.java b/apps/tests/Robot/src/robottest/BMPOutputStream.java rename from tests/manual/Robot/src/robottest/BMPOutputStream.java rename to apps/tests/Robot/src/robottest/BMPOutputStream.java diff --git a/tests/manual/Robot/src/robottest/RobotBuilder.java b/apps/tests/Robot/src/robottest/RobotBuilder.java rename from tests/manual/Robot/src/robottest/RobotBuilder.java rename to apps/tests/Robot/src/robottest/RobotBuilder.java diff --git a/tests/manual/Robot/src/robottest/RobotTest.java b/apps/tests/Robot/src/robottest/RobotTest.java rename from tests/manual/Robot/src/robottest/RobotTest.java rename to apps/tests/Robot/src/robottest/RobotTest.java diff --git a/tests/manual/Robot/src/robottest/RobotTestStyles.css b/apps/tests/Robot/src/robottest/RobotTestStyles.css rename from tests/manual/Robot/src/robottest/RobotTestStyles.css rename to apps/tests/Robot/src/robottest/RobotTestStyles.css diff --git a/apps/tests/build.xml b/apps/tests/build.xml new file mode 100644 --- /dev/null +++ b/apps/tests/build.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + +