diff options
6 files changed, 83 insertions, 3 deletions
diff --git a/assembly/features/org.eclipse.jpt.tests.assembly.feature/feature.xml b/assembly/features/org.eclipse.jpt.tests.assembly.feature/feature.xml index 9bbdf953d2..3894af980d 100644 --- a/assembly/features/org.eclipse.jpt.tests.assembly.feature/feature.xml +++ b/assembly/features/org.eclipse.jpt.tests.assembly.feature/feature.xml @@ -40,6 +40,10 @@ version="0.0.0"/> <includes + id="org.eclipse.jpt.jaxb.eclipselink.tests.feature" + version="0.0.0"/> + + <includes id="org.eclipse.jpt.jpadiagrameditor.tests.feature" version="0.0.0"/> diff --git a/jaxb/features/org.eclipse.jpt.jaxb.eclipselink.tests.feature/feature.properties b/jaxb/features/org.eclipse.jpt.jaxb.eclipselink.tests.feature/feature.properties index 147cc747be..b0e15e413e 100644 --- a/jaxb/features/org.eclipse.jpt.jaxb.eclipselink.tests.feature/feature.properties +++ b/jaxb/features/org.eclipse.jpt.jaxb.eclipselink.tests.feature/feature.properties @@ -15,7 +15,7 @@ # This file should be translated. # "featureName" property - name of the feature -featureName=Dali Java Persistence Tools - EclipseLink JPA Core JUnit Tests +featureName=Dali Java Persistence Tools - EclipseLink JAXB Core JUnit Tests # "providerName" property - name of the company that provides the feature providerName=Eclipse Web Tools Platform @@ -25,7 +25,7 @@ providerName=Eclipse Web Tools Platform updateSiteName=Web Tools Platform (WTP) Updates # "description" property - description of the feature -description=Dali Java Persistence Tools EclipseLink JPA Core JUnit Tests +description=Dali Java Persistence Tools EclipseLink JAXB Core JUnit Tests # "copyright" property - text of the "Feature Update Copyright" copyright=\ diff --git a/jaxb/features/org.eclipse.jpt.jaxb.eclipselink.tests.feature/feature.xml b/jaxb/features/org.eclipse.jpt.jaxb.eclipselink.tests.feature/feature.xml index 18b9101dc4..cf1675411a 100644 --- a/jaxb/features/org.eclipse.jpt.jaxb.eclipselink.tests.feature/feature.xml +++ b/jaxb/features/org.eclipse.jpt.jaxb.eclipselink.tests.feature/feature.xml @@ -23,5 +23,10 @@ <import feature="org.eclipse.jpt.common.tests.feature" version="1.0.0"/> </requires> + <plugin + id="org.eclipse.jpt.jaxb.eclipselink.core.tests" + download-size="0" + install-size="0" + version="0.0.0"/> </feature> diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/build.properties b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/build.properties index 38c93513e7..9cd29bcb38 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/build.properties +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/build.properties @@ -10,6 +10,7 @@ bin.includes = .,\ META-INF/,\ about.html,\ + test.xml,\ plugin.properties source.. = src/ output.. = bin/ diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/plugin.properties b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/plugin.properties index 583cd43a66..8861cc4302 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/plugin.properties +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/plugin.properties @@ -19,5 +19,5 @@ # %%% END OF TRANSLATED PROPERTIES %%% # ==================================================================== -pluginName=Dali Java Persistence Tools - JAXB EclipseLink Core Tests +pluginName=Dali Java Persistence Tools - EclipseLink JAXB Core Tests providerName=Eclipse Web Tools Platform diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/test.xml b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/test.xml new file mode 100644 index 0000000000..09430226e2 --- /dev/null +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/test.xml @@ -0,0 +1,70 @@ +<?xml version="1.0"?> +<!-- + Copyright (c) 2011 Oracle. All rights reserved. + This program and the accompanying materials are made available under the + terms of the Eclipse Public License v1.0, which accompanies this distribution + and is available at http://www.eclipse.org/legal/epl-v10.html. + + Contributors: + Oracle - initial API and implementation + --> + +<project name="testsuite" default="run" basedir="."> + <!-- The property ${eclipse-home} should be passed into this script --> + <!-- Set a meaningful default value for when it is not. --> + <echo message="basedir ${basedir}" /> + <echo message="eclipse place ${eclipse-home}" /> + <!-- sets the properties plugin-name --> + <property name="plugin-name" value="org.eclipse.jpt.jaxb.eclipselink.core.tests"/> + <echo level="debug" message="testRoot: ${testRoot}" /> + <fail message="testRoot must be set" unless="testRoot" /> + + <!-- This target holds all initialization code that needs to be done for --> + <!-- all tests that are to be run. Initialization for individual tests --> + <!-- should be done within the body of the suite target. --> + <target name="init"> + <tstamp/> + <delete> + <fileset dir="${eclipse-home}" includes="org*.xml"/> + </delete> + </target> + + <!-- This target defines the tests that need to be run. --> + <target name="suite1"> + <property file="${testRoot}/testServer.properties"/> + <property name="jpt-folder" value="${eclipse-home}/jpt_folder"/> + <delete dir="${jpt-folder}" quiet="true"/> + + <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}"> + <property name="data-dir" value="${jpt-folder}"/> + <property name="plugin-name" value="${plugin-name}"/> + <property name="classname" value="org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource.ELJaxbCoreResourceModelTests"/> + <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/> + <property name="extraVMargs" value="-Dorg.eclipse.jpt.jaxb.jar=${testDir}/${jpt-javax-xml-bind-jar} -Dorg.eclipse.jpt.eclipselink.jar=${testDir}/${jpt-eclipselink-jar}"/> + </ant> + </target> + <target name="suite2"> + <property file="${testRoot}/testServer.properties"/> + <property name="jpt-folder" value="${eclipse-home}/jpt_folder"/> + <delete dir="${jpt-folder}" quiet="true"/> + + <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}"> + <property name="data-dir" value="${jpt-folder}"/> + <property name="plugin-name" value="${plugin-name}"/> + <property name="classname" value="org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.ELJaxbCoreContextModelTests"/> + <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/> + <property name="extraVMargs" value="-Dorg.eclipse.jpt.jaxb.jar=${testDir}/${jpt-javax-xml-bind-jar} -Dorg.eclipse.jpt.eclipselink.jar=${testDir}/${jpt-eclipselink-jar}"/> + </ant> + </target> + + <!-- This target holds code to cleanup the testing environment after --> + <!-- after all of the tests have been run. You can use this target to --> + <!-- delete temporary files that have been created. --> + <target name="cleanup"> + </target> + + <!-- This target runs the test suite. Any actions that need to happen --> + <!-- after all the tests have been run should go here. --> + <target name="run" depends="init, suite1, suite2, cleanup"> + </target> +</project>
\ No newline at end of file |