Fixed the junit tests. They now work through the ant script as well as when run directly.
The fix required adding all the build/* folders to the "compile tests" libraries listing as well as moving the junit.jar in that listing to the top of the list. git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10644 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
parent
9b6bd1fdc4
commit
1f111c11ce
@ -1,134 +1,170 @@
|
|||||||
annotation.processing.enabled=false
|
annotation.processing.enabled=false
|
||||||
annotation.processing.enabled.in.editor=false
|
annotation.processing.enabled.in.editor=false
|
||||||
annotation.processing.processors.list=
|
annotation.processing.processors.list=
|
||||||
annotation.processing.run.all.processors=true
|
annotation.processing.run.all.processors=true
|
||||||
ant.customtasks.libs=JWSAntTasks
|
ant.customtasks.libs=JWSAntTasks
|
||||||
application.homepage=http://www.jmonkeyengine.com/
|
application.homepage=http://www.jmonkeyengine.com/
|
||||||
application.title=jMonkeyEngine 3.0
|
application.title=jMonkeyEngine 3.0
|
||||||
application.vendor=jMonkeyEngine
|
application.vendor=jMonkeyEngine
|
||||||
build.classes.dir=${build.dir}/classes
|
build.classes.dir=${build.dir}/classes
|
||||||
build.classes.excludes=**/*.java,**/*.form,**/*.m
|
build.classes.excludes=**/*.java,**/*.form,**/*.m
|
||||||
# This directory is removed when the project is cleaned:
|
# This directory is removed when the project is cleaned:
|
||||||
build.dir=build
|
build.dir=build
|
||||||
build.generated.dir=${build.dir}/generated
|
build.generated.dir=${build.dir}/generated
|
||||||
build.generated.sources.dir=${build.dir}/generated-sources
|
build.generated.sources.dir=${build.dir}/generated-sources
|
||||||
# Only compile against the classpath explicitly listed here:
|
# Only compile against the classpath explicitly listed here:
|
||||||
build.sysclasspath=ignore
|
build.sysclasspath=ignore
|
||||||
build.test.classes.dir=${build.dir}/test/classes
|
build.test.classes.dir=${build.dir}/test/classes
|
||||||
build.test.results.dir=${build.dir}/test/results
|
build.test.results.dir=${build.dir}/test/results
|
||||||
# Uncomment to specify the preferred debugger connection transport:
|
# Uncomment to specify the preferred debugger connection transport:
|
||||||
#debug.transport=dt_socket
|
#debug.transport=dt_socket
|
||||||
debug.classpath=\
|
debug.classpath=\
|
||||||
${run.classpath}
|
${run.classpath}
|
||||||
debug.test.classpath=\
|
debug.test.classpath=\
|
||||||
${run.test.classpath}
|
${run.test.classpath}
|
||||||
# This directory is removed when the project is cleaned:
|
# This directory is removed when the project is cleaned:
|
||||||
dist.dir=dist
|
dist.dir=dist
|
||||||
dist.jar=${dist.dir}/jMonkeyEngine3.jar
|
dist.jar=${dist.dir}/jMonkeyEngine3.jar
|
||||||
dist.javadoc.dir=${dist.dir}/javadoc
|
dist.javadoc.dir=${dist.dir}/javadoc
|
||||||
endorsed.classpath=
|
endorsed.classpath=
|
||||||
excludes=
|
excludes=
|
||||||
file.reference.src-test-data=src/test-data
|
file.reference.build-android=build/android
|
||||||
includes=**
|
file.reference.build-blender=build/blender
|
||||||
jar.archive.disabled=${jnlp.enabled}
|
file.reference.build-bullet=build/bullet
|
||||||
jar.compress=true
|
file.reference.build-classes=build/classes
|
||||||
jar.index=${jnlp.enabled}
|
file.reference.build-core=build/core
|
||||||
javac.classpath=\
|
file.reference.build-desktop=build/desktop
|
||||||
${libs.jogg.classpath}:\
|
file.reference.build-effects=build/effects
|
||||||
${libs.jbullet.classpath}:\
|
file.reference.build-empty=build/empty
|
||||||
${libs.lwjgl.classpath}:\
|
file.reference.build-ios=build/ios
|
||||||
${libs.niftygui1.3.classpath}:\
|
file.reference.build-jbullet=build/jbullet
|
||||||
${libs.jme3-test-data.classpath}:\
|
file.reference.build-jogg=build/jogg
|
||||||
${libs.android.classpath}:\
|
file.reference.build-jogl=build/jogl
|
||||||
${libs.bullet.classpath}:\
|
file.reference.build-lwjgl=build/lwjgl
|
||||||
${libs.jogl2.classpath}:\
|
file.reference.build-networking=build/networking
|
||||||
${libs.openalsoft.classpath}
|
file.reference.build-niftygui=build/niftygui
|
||||||
# Space-separated list of extra javac options
|
file.reference.build-plugins=build/plugins
|
||||||
javac.compilerargs=
|
file.reference.build-terrain=build/terrain
|
||||||
javac.deprecation=false
|
file.reference.build-test=build/test
|
||||||
javac.processorpath=\
|
file.reference.src-test-data=src/test-data
|
||||||
${javac.classpath}
|
includes=**
|
||||||
javac.source=1.5
|
jar.archive.disabled=${jnlp.enabled}
|
||||||
javac.target=1.5
|
jar.compress=true
|
||||||
javac.test.classpath=\
|
jar.index=${jnlp.enabled}
|
||||||
${javac.classpath}:\
|
javac.classpath=\
|
||||||
${build.classes.dir}:\
|
${libs.jogg.classpath}:\
|
||||||
${libs.junit_4.classpath}
|
${libs.jbullet.classpath}:\
|
||||||
javadoc.additionalparam=-protected
|
${libs.lwjgl.classpath}:\
|
||||||
javadoc.author=false
|
${libs.niftygui1.3.classpath}:\
|
||||||
javadoc.encoding=${source.encoding}
|
${libs.jme3-test-data.classpath}:\
|
||||||
javadoc.noindex=false
|
${libs.android.classpath}:\
|
||||||
javadoc.nonavbar=false
|
${libs.bullet.classpath}:\
|
||||||
javadoc.notree=false
|
${libs.jogl2.classpath}:\
|
||||||
javadoc.private=false
|
${libs.openalsoft.classpath}
|
||||||
javadoc.splitindex=true
|
# Space-separated list of extra javac options
|
||||||
javadoc.use=true
|
javac.compilerargs=
|
||||||
javadoc.version=false
|
javac.deprecation=false
|
||||||
javadoc.windowtitle=jMonkeyEngine3
|
javac.processorpath=\
|
||||||
jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
|
${javac.classpath}
|
||||||
jnlp.applet.class=jme3test.awt.AppHarness
|
javac.source=1.5
|
||||||
jnlp.applet.height=300
|
javac.target=1.5
|
||||||
jnlp.applet.width=300
|
javac.test.classpath=\
|
||||||
jnlp.codebase.type=user
|
${libs.junit_4.classpath}:\
|
||||||
jnlp.codebase.user=http://jmonkeyengine.com/javawebstart/
|
${javac.classpath}:\
|
||||||
jnlp.descriptor=application
|
${build.classes.dir}:\
|
||||||
jnlp.enabled=false
|
${file.reference.build-core}:\
|
||||||
jnlp.icon=/Users/normenhansen/Pictures/jme/icons/jme-logo48.png
|
${file.reference.build-android}:\
|
||||||
jnlp.mixed.code=default
|
${file.reference.build-blender}:\
|
||||||
jnlp.offline-allowed=true
|
${file.reference.build-bullet}:\
|
||||||
jnlp.signed=true
|
${file.reference.build-classes}:\
|
||||||
jnlp.signing=generated
|
${file.reference.build-desktop}:\
|
||||||
jnlp.signing.alias=engine
|
${file.reference.build-effects}:\
|
||||||
jnlp.signing.keystore=
|
${file.reference.build-empty}:\
|
||||||
main.class=jme3test.TestChooser
|
${file.reference.build-ios}:\
|
||||||
manifest.file=MANIFEST.MF
|
${file.reference.build-jbullet}:\
|
||||||
meta.inf.dir=${src.dir}/META-INF
|
${file.reference.build-jogg}:\
|
||||||
mkdist.disabled=false
|
${file.reference.build-jogl}:\
|
||||||
platform.active=default_platform
|
${file.reference.build-lwjgl}:\
|
||||||
run.classpath=\
|
${file.reference.build-networking}:\
|
||||||
${javac.classpath}:\
|
${file.reference.build-niftygui}:\
|
||||||
${build.classes.dir}:\
|
${file.reference.build-plugins}:\
|
||||||
${build.dir}/core:\
|
${file.reference.build-terrain}:\
|
||||||
${build.dir}/effects:\
|
${file.reference.build-test}
|
||||||
${build.dir}/networking:\
|
javadoc.additionalparam=-protected
|
||||||
${build.dir}/plugins:\
|
javadoc.author=false
|
||||||
${build.dir}/jogg:\
|
javadoc.encoding=${source.encoding}
|
||||||
${build.dir}/desktop:\
|
javadoc.noindex=false
|
||||||
${build.dir}/blender:\
|
javadoc.nonavbar=false
|
||||||
${build.dir}/terrain:\
|
javadoc.notree=false
|
||||||
${build.dir}/jbullet:\
|
javadoc.private=false
|
||||||
${build.dir}/bullet:\
|
javadoc.splitindex=true
|
||||||
${build.dir}/niftygui:\
|
javadoc.use=true
|
||||||
${build.dir}/lwjgl:\
|
javadoc.version=false
|
||||||
${build.dir}/jogl:\
|
javadoc.windowtitle=jMonkeyEngine3
|
||||||
${build.dir}/android:\
|
jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
|
||||||
${build.dir}/ios
|
jnlp.applet.class=jme3test.awt.AppHarness
|
||||||
run.jvmargs=-Xms128m -Xmx128m -XX:MaxDirectMemorySize=256M
|
jnlp.applet.height=300
|
||||||
run.test.classpath=\
|
jnlp.applet.width=300
|
||||||
${javac.test.classpath}:\
|
jnlp.codebase.type=user
|
||||||
${build.test.classes.dir}
|
jnlp.codebase.user=http://jmonkeyengine.com/javawebstart/
|
||||||
source.encoding=UTF-8
|
jnlp.descriptor=application
|
||||||
src.android.dir=src/android
|
jnlp.enabled=false
|
||||||
src.blender.dir=src/blender
|
jnlp.icon=/Users/normenhansen/Pictures/jme/icons/jme-logo48.png
|
||||||
src.bullet-common.dir=src/bullet-common
|
jnlp.mixed.code=default
|
||||||
src.bullet-native.dir=src/bullet-native
|
jnlp.offline-allowed=true
|
||||||
src.bullet.dir=src/bullet
|
jnlp.signed=true
|
||||||
src.core-data.dir=src/core-data
|
jnlp.signing=generated
|
||||||
src.core-effects.dir=src/core-effects
|
jnlp.signing.alias=engine
|
||||||
src.core-plugins.dir=src/core-plugins
|
jnlp.signing.keystore=
|
||||||
src.core.dir=src/core
|
main.class=jme3test.TestChooser
|
||||||
src.desktop.dir=src/desktop
|
manifest.file=MANIFEST.MF
|
||||||
src.ios.dir=src/ios
|
meta.inf.dir=${src.dir}/META-INF
|
||||||
src.jbullet.dir=src/jbullet
|
mkdist.disabled=false
|
||||||
src.jogg.dir=src/jogg
|
platform.active=default_platform
|
||||||
src.jogl.dir=src/jogl
|
run.classpath=\
|
||||||
src.lwjgl.dir=src/lwjgl
|
${javac.classpath}:\
|
||||||
src.networking.dir=src/networking
|
${build.classes.dir}:\
|
||||||
src.niftygui.dir=src/niftygui
|
${build.dir}/core:\
|
||||||
src.ogre.dir=src/ogre
|
${build.dir}/effects:\
|
||||||
src.openal-soft-native.dir=src\\openal-soft-native
|
${build.dir}/networking:\
|
||||||
src.terrain.dir=src/terrain
|
${build.dir}/plugins:\
|
||||||
src.test.dir=src/test
|
${build.dir}/jogg:\
|
||||||
src.tools.dir=src/tools
|
${build.dir}/desktop:\
|
||||||
src.xml.dir=src/xml
|
${build.dir}/blender:\
|
||||||
test.test.dir=test
|
${build.dir}/terrain:\
|
||||||
|
${build.dir}/jbullet:\
|
||||||
|
${build.dir}/bullet:\
|
||||||
|
${build.dir}/niftygui:\
|
||||||
|
${build.dir}/lwjgl:\
|
||||||
|
${build.dir}/jogl:\
|
||||||
|
${build.dir}/android:\
|
||||||
|
${build.dir}/ios
|
||||||
|
run.jvmargs=-Xms128m -Xmx128m -XX:MaxDirectMemorySize=256M
|
||||||
|
run.test.classpath=\
|
||||||
|
${javac.test.classpath}:\
|
||||||
|
${build.test.classes.dir}
|
||||||
|
source.encoding=UTF-8
|
||||||
|
src.android.dir=src/android
|
||||||
|
src.blender.dir=src/blender
|
||||||
|
src.bullet-common.dir=src/bullet-common
|
||||||
|
src.bullet-native.dir=src/bullet-native
|
||||||
|
src.bullet.dir=src/bullet
|
||||||
|
src.core-data.dir=src/core-data
|
||||||
|
src.core-effects.dir=src/core-effects
|
||||||
|
src.core-plugins.dir=src/core-plugins
|
||||||
|
src.core.dir=src/core
|
||||||
|
src.desktop.dir=src/desktop
|
||||||
|
src.ios.dir=src/ios
|
||||||
|
src.jbullet.dir=src/jbullet
|
||||||
|
src.jogg.dir=src/jogg
|
||||||
|
src.jogl.dir=src/jogl
|
||||||
|
src.lwjgl.dir=src/lwjgl
|
||||||
|
src.networking.dir=src/networking
|
||||||
|
src.niftygui.dir=src/niftygui
|
||||||
|
src.ogre.dir=src/ogre
|
||||||
|
src.openal-soft-native.dir=src\\openal-soft-native
|
||||||
|
src.terrain.dir=src/terrain
|
||||||
|
src.test.dir=src/test
|
||||||
|
src.tools.dir=src/tools
|
||||||
|
src.xml.dir=src/xml
|
||||||
|
test.test.dir=test
|
||||||
|
Loading…
x
Reference in New Issue
Block a user