[330125] Split up the org.eclipse.jst.j2ee.tests.bvt.AutomatedBVT into several test suites
diff --git a/tests/org.eclipse.jst.j2ee.tests/bvt.properties b/tests/org.eclipse.jst.j2ee.tests/bvt.properties new file mode 100644 index 0000000..2857d59 --- /dev/null +++ b/tests/org.eclipse.jst.j2ee.tests/bvt.properties
@@ -0,0 +1,23 @@ +############################################################################### +# Copyright (c) 2010 IBM Corporation and others. +# 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: +# IBM Corporation - initial API and implementation +############################################################################### + +# To run all the buckets in the BVT, uncomment org.eclipse.jst.j2ee.tests.bvt.ALL (the rest of the +# properties will be ignored). +# To run individual buckets, comment out org.eclipse.jst.j2ee.tests.bvt.ALL and +# uncomment the corresponding properties. + +org.eclipse.jst.j2ee.tests.bvt.ALL = true +#org.eclipse.jst.j2ee.tests.bvt.EnterpriseBVT = true +#org.eclipse.jst.j2ee.tests.bvt.EJBBVT = true +#org.eclipse.jst.j2ee.tests.bvt.WebBVT = true +#org.eclipse.jst.j2ee.tests.bvt.CoreInfrastructureBVT = true +#org.eclipse.jst.j2ee.tests.bvt.ModelProviderBVT = true +#org.eclipse.jst.j2ee.tests.bvt.ExtendedModelProviderBVT = true
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/bvt/CoreInfrastructureBVT.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/bvt/CoreInfrastructureBVT.java new file mode 100644 index 0000000..50b1e26 --- /dev/null +++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/bvt/CoreInfrastructureBVT.java
@@ -0,0 +1,33 @@ +/******************************************************************************* + * Copyright (c) 2010 IBM Corporation and others. + * 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: + * IBM Corporation - initial API and implementation + *******************************************************************************/ + +package org.eclipse.jst.j2ee.tests.bvt; + +import junit.framework.Test; +import junit.framework.TestSuite; + +public class CoreInfrastructureBVT extends TestSuite { + + public CoreInfrastructureBVT(){ + super(); + addTest(org.eclipse.wtp.j2ee.headless.tests.j2ee.operations.SourceFolderUpdateTest.suite()); + addTest(org.eclipse.jst.j2ee.tests.modulecore.AllTests.suite()); + addTest(org.eclipse.jst.j2ee.dependency.tests.AllTests.suite()); + addTest(org.eclipse.jst.j2ee.classpath.tests.AllTests.suite()); + addTest(org.eclipse.wtp.j2ee.headless.tests.web.container.WebAppLibrariesContainerTests.suite()); + addTest(org.eclipse.jst.j2ee.defect.tests.DefectVerificationTestsSuite.suite()); + addTest(org.eclipse.wtp.j2ee.headless.tests.j2ee.operations.HeaderParserTests.suite()); + } + + public static Test suite(){ + return new CoreInfrastructureBVT(); + } +}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/bvt/EJBBVT.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/bvt/EJBBVT.java new file mode 100644 index 0000000..cf50059 --- /dev/null +++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/bvt/EJBBVT.java
@@ -0,0 +1,28 @@ +/******************************************************************************* + * Copyright (c) 2010 IBM Corporation and others. + * 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: + * IBM Corporation - initial API and implementation + *******************************************************************************/ + +package org.eclipse.jst.j2ee.tests.bvt; + +import junit.framework.Test; +import junit.framework.TestSuite; + +public class EJBBVT extends TestSuite { + + public EJBBVT() { + super(); + addTest(org.eclipse.wtp.j2ee.headless.tests.ejb.operations.AllTests.suite()); + } + + public static Test suite(){ + return new EJBBVT(); + } + +}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/bvt/EnterpriseBVT.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/bvt/EnterpriseBVT.java new file mode 100644 index 0000000..297d8c0 --- /dev/null +++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/bvt/EnterpriseBVT.java
@@ -0,0 +1,30 @@ +/******************************************************************************* + * Copyright (c) 2010 IBM Corporation and others. + * 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: + * IBM Corporation - initial API and implementation + *******************************************************************************/ + +package org.eclipse.jst.j2ee.tests.bvt; + +import junit.framework.Test; +import junit.framework.TestSuite; + +public class EnterpriseBVT extends TestSuite { + + public EnterpriseBVT(){ + super(); + addTest(org.eclipse.wtp.j2ee.headless.tests.jca.operations.AllTests.suite()); + addTest(org.eclipse.wtp.j2ee.headless.tests.ear.operations.AllTests.suite()); + addTest(org.eclipse.wtp.j2ee.headless.tests.appclient.operations.AllTests.suite()); + addTest(org.eclipse.wtp.j2ee.headless.tests.utility.operations.AllTests.suite()); + } + + public static Test suite(){ + return new EnterpriseBVT(); + } +}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/bvt/ExtendedModelProviderBVT.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/bvt/ExtendedModelProviderBVT.java new file mode 100644 index 0000000..06a9fe9 --- /dev/null +++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/bvt/ExtendedModelProviderBVT.java
@@ -0,0 +1,29 @@ +/******************************************************************************* + * Copyright (c) 2010 IBM Corporation and others. + * 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: + * IBM Corporation - initial API and implementation + *******************************************************************************/ + +package org.eclipse.jst.j2ee.tests.bvt; + +import junit.framework.Test; +import junit.framework.TestSuite; + +public class ExtendedModelProviderBVT extends TestSuite { + + public ExtendedModelProviderBVT() { + super(); + addTest(org.eclipse.jst.common.annotations.tests.AnnotationProviderTest.suite()); + addTest(org.eclipse.jst.jee.model.tests.AllAnnotationModelTests.suite()); + addTest(org.eclipse.jst.jee.model.mergers.tests.MergersTestSuite.suite()); + } + + public static Test suite(){ + return new ExtendedModelProviderBVT(); + } +}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/bvt/ModelProviderBVT.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/bvt/ModelProviderBVT.java new file mode 100644 index 0000000..f5651b9 --- /dev/null +++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/bvt/ModelProviderBVT.java
@@ -0,0 +1,29 @@ +/******************************************************************************* + * Copyright (c) 2010 IBM Corporation and others. + * 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: + * IBM Corporation - initial API and implementation + *******************************************************************************/ + +package org.eclipse.jst.j2ee.tests.bvt; + +import junit.framework.Test; +import junit.framework.TestSuite; + +public class ModelProviderBVT extends TestSuite { + + public ModelProviderBVT(){ + super(); + addTest(org.eclipse.jst.jee.model.tests.JEE5ModelTest.suite()); + addTest(org.eclipse.jst.jee.model.tests.JEE6ModelTest.suite()); + addTest(org.eclipse.jst.jee.model.tests.ModelProviderTest.suite()); + } + + public static Test suite(){ + return new ModelProviderBVT(); + } +}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/bvt/WebBVT.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/bvt/WebBVT.java new file mode 100644 index 0000000..029df53 --- /dev/null +++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/bvt/WebBVT.java
@@ -0,0 +1,26 @@ +/******************************************************************************* + * Copyright (c) 2010 IBM Corporation and others. + * 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: + * IBM Corporation - initial API and implementation + *******************************************************************************/ + +package org.eclipse.jst.j2ee.tests.bvt; + +import junit.framework.Test; +import junit.framework.TestSuite; + +public class WebBVT extends TestSuite { + + public WebBVT() { + super(); + addTest(org.eclipse.wtp.j2ee.headless.tests.web.operations.AllTests.suite()); + } + public static Test suite(){ + return new WebBVT(); + } +}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/plugin/AllPluginTests.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/plugin/AllPluginTests.java index 01e903c..840cd5d 100644 --- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/plugin/AllPluginTests.java +++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/plugin/AllPluginTests.java
@@ -20,19 +20,10 @@ import junit.framework.TestSuite; import org.eclipse.core.runtime.Path; -import org.eclipse.jst.common.annotations.tests.AnnotationProviderTest; -import org.eclipse.jst.j2ee.defect.tests.DefectVerificationTestsSuite; -import org.eclipse.jst.jee.model.mergers.tests.MergersTestSuite; -import org.eclipse.jst.jee.model.tests.AllAnnotationModelTests; -import org.eclipse.jst.jee.model.tests.JEE5ModelTest; -import org.eclipse.jst.jee.model.tests.JEE6ModelTest; -import org.eclipse.jst.jee.model.tests.ModelProviderTest; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IRuntimeType; import org.eclipse.wst.server.core.IRuntimeWorkingCopy; import org.eclipse.wst.server.core.ServerCore; -import org.eclipse.wtp.j2ee.headless.tests.j2ee.operations.HeaderParserTests; -import org.eclipse.wtp.j2ee.headless.tests.web.container.WebAppLibrariesContainerTests; /** * @author jsholl @@ -48,29 +39,15 @@ return new AllPluginTests(); } - public AllPluginTests() { - super(); - addTest(org.eclipse.wtp.j2ee.headless.tests.ejb.operations.AllTests.suite()); - addTest(org.eclipse.wtp.j2ee.headless.tests.web.operations.AllTests.suite()); - addTest(org.eclipse.wtp.j2ee.headless.tests.jca.operations.AllTests.suite()); - addTest(org.eclipse.wtp.j2ee.headless.tests.ear.operations.AllTests.suite()); - addTest(org.eclipse.wtp.j2ee.headless.tests.appclient.operations.AllTests.suite()); - addTest(org.eclipse.wtp.j2ee.headless.tests.utility.operations.AllTests.suite()); - addTest(org.eclipse.wtp.j2ee.headless.tests.j2ee.operations.SourceFolderUpdateTest.suite()); - addTest(org.eclipse.jst.j2ee.tests.modulecore.AllTests.suite()); - addTest(JEE5ModelTest.suite()); - addTest(JEE6ModelTest.suite()); - // model provider - addTest(ModelProviderTest.suite()); - addTest(AnnotationProviderTest.suite()); - addTest(org.eclipse.jst.j2ee.dependency.tests.AllTests.suite()); - addTest(org.eclipse.jst.j2ee.classpath.tests.AllTests.suite()); - addTest(WebAppLibrariesContainerTests.suite()); - addTest(DefectVerificationTestsSuite.suite()); - addTest(HeaderParserTests.suite()); - addTest(AllAnnotationModelTests.suite()); - addTest(MergersTestSuite.suite()); - } + public AllPluginTests() { + super(); + addTest(org.eclipse.jst.j2ee.tests.bvt.EnterpriseBVT.suite()); + addTest(org.eclipse.jst.j2ee.tests.bvt.EJBBVT.suite()); + addTest(org.eclipse.jst.j2ee.tests.bvt.WebBVT.suite()); + addTest(org.eclipse.jst.j2ee.tests.bvt.CoreInfrastructureBVT.suite()); + addTest(org.eclipse.jst.j2ee.tests.bvt.ModelProviderBVT.suite()); + addTest(org.eclipse.jst.j2ee.tests.bvt.ExtendedModelProviderBVT.suite()); + } public static IRuntime createJONASRuntime() { String s = System.getProperty("org.eclipse.jst.server.jonas.432");
diff --git a/tests/org.eclipse.jst.j2ee.tests/testHOLD.xml b/tests/org.eclipse.jst.j2ee.tests/testHOLD.xml index 6ecf0eb..c7d6413 100644 --- a/tests/org.eclipse.jst.j2ee.tests/testHOLD.xml +++ b/tests/org.eclipse.jst.j2ee.tests/testHOLD.xml
@@ -1,54 +1,113 @@ <?xml version="1.0"?> <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. --> - <property name="eclipse-home" value="${basedir}\..\.."/> + <!-- The property ${eclipse-home} should be passed into this script --> + <!-- Set a meaningful default value for when it is not. --> + <property name="eclipse-home" value="${basedir}\..\.." /> - <!-- sets the properties eclipse-home, and library-file --> - <property name="plugin-name" value="org.eclipse.jst.j2ee.tests"/> - <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/> - <property name="extraVMargs" value="-Dorg.eclipse.jst.server.jonas.432=${jonas432Dir}"/> - - <property name="workspace" value="${basedir}/${plugin-name}"/> + <!-- sets the properties eclipse-home, and library-file --> + <property name="plugin-name" value="org.eclipse.jst.j2ee.tests" /> + <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.3.0/library.xml" /> + <property name="extraVMargs" value="-Dorg.eclipse.jst.server.jonas.432=${jonas432Dir}" /> - <!-- 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> + <property name="workspace" value="${basedir}/${plugin-name}" /> - <!-- This target defines the tests that need to be run. --> - <target name="suite"> - <delete dir="${workspace}" quiet="true"/> - - <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${workspace}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.jst.j2ee.tests.bvt.AutomatedBVT"/> - <property name="extraVMargs" value="${extraVMargs}"/> - </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"> - <delete dir="${workspace}" quiet="true"/> - </target> + <!-- Read the properties that will enable/disable the different targets below. --> + <property file="bvt.properties" /> - <!-- 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,suite,cleanup"> - <ant target="collect" antfile="${library-file}" dir="${eclipse-home}"> - <property name="includes" value="org*.xml"/> - <property name="output-file" value="${plugin-name}.xml"/> - </ant> - </target> + <!-- 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> + <delete dir="${workspace}" quiet="true" /> + </target> + + <target name="AutomatedBVTSuite" if="org.eclipse.jst.j2ee.tests.bvt.ALL"> + <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}"> + <property name="data-dir" value="${workspace}" /> + <property name="plugin-name" value="${plugin-name}" /> + <property name="classname" value="org.eclipse.jst.j2ee.tests.bvt.AutomatedBVT" /> + <property name="extraVMargs" value="${extraVMargs}" /> + </ant> + </target> + + <target name="EnterpriseBVTSuite" if="org.eclipse.jst.j2ee.tests.bvt.EnterpriseBVT" unless="org.eclipse.jst.j2ee.tests.bvt.ALL"> + <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}"> + <property name="data-dir" value="${workspace}" /> + <property name="plugin-name" value="${plugin-name}" /> + <property name="classname" value="org.eclipse.jst.j2ee.tests.bvt.EnterpriseBVT" /> + <property name="extraVMargs" value="${extraVMargs}" /> + </ant> + </target> + + <target name="WebBVTSuite" if="org.eclipse.jst.j2ee.tests.bvt.WebBVT" unless="org.eclipse.jst.j2ee.tests.bvt.ALL"> + <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}"> + <property name="data-dir" value="${workspace}" /> + <property name="plugin-name" value="${plugin-name}" /> + <property name="classname" value="org.eclipse.jst.j2ee.tests.bvt.WebBVT" /> + <property name="extraVMargs" value="${extraVMargs}" /> + </ant> + </target> + + <target name="EJBBVTSuite" if="org.eclipse.jst.j2ee.tests.bvt.EJBBVT" unless="org.eclipse.jst.j2ee.tests.bvt.ALL"> + <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}"> + <property name="data-dir" value="${workspace}" /> + <property name="plugin-name" value="${plugin-name}" /> + <property name="classname" value="org.eclipse.jst.j2ee.tests.bvt.EJBBVT" /> + <property name="extraVMargs" value="${extraVMargs}" /> + </ant> + </target> + + <target name="CoreBVTSuite" if="org.eclipse.jst.j2ee.tests.bvt.CoreInfrastructureBVT" unless="org.eclipse.jst.j2ee.tests.bvt.ALL"> + <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}"> + <property name="data-dir" value="${workspace}" /> + <property name="plugin-name" value="${plugin-name}" /> + <property name="classname" value="org.eclipse.jst.j2ee.tests.bvt.CoreInfrastructureBVT" /> + <property name="extraVMargs" value="${extraVMargs}" /> + </ant> + </target> + + <target name="ModelProviderBVTSuite" if="org.eclipse.jst.j2ee.tests.bvt.ModelProviderBVT" unless="org.eclipse.jst.j2ee.tests.bvt.ALL"> + <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}"> + <property name="data-dir" value="${workspace}" /> + <property name="plugin-name" value="${plugin-name}" /> + <property name="classname" value="org.eclipse.jst.j2ee.tests.bvt.ModelProviderBVT" /> + <property name="extraVMargs" value="${extraVMargs}" /> + </ant> + </target> + + <target name="ExtendedModelProviderBVTSuite" if="org.eclipse.jst.j2ee.tests.bvt.ExtendedModelProviderBVT" unless="org.eclipse.jst.j2ee.tests.bvt.ALL"> + <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}"> + <property name="data-dir" value="${workspace}" /> + <property name="plugin-name" value="${plugin-name}" /> + <property name="classname" value="org.eclipse.jst.j2ee.tests.bvt.ExtendedModelProviderBVT" /> + <property name="extraVMargs" value="${extraVMargs}" /> + </ant> + </target> + + <!-- This target defines the tests that need to be run. --> + <target name="suite" depends="AutomatedBVTSuite, EnterpriseBVTSuite, WebBVTSuite, EJBBVTSuite, CoreBVTSuite, ModelProviderBVTSuite, ExtendedModelProviderBVTSuite"> + </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"> + <delete dir="${workspace}" quiet="true" /> + </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,suite,cleanup"> + <ant target="collect" antfile="${library-file}" dir="${eclipse-home}"> + <property name="includes" value="org*.xml" /> + <property name="output-file" value="${plugin-name}.xml" /> + </ant> + </target> </project>