Merge pull request #89 from travis1111/build-test-bundles

Build openapi eclipse plugin junit test bundles

Author: keithchong

dev/Dockerfile

@@ -0,0 +1,20 @@
+FROM sgrio/java:jre_8_ubuntu 
+WORKDIR /home
+RUN apt-get update
+RUN apt-get install -y net-tools
+RUN apt-get install -y telnet
+RUN apt-get install -y wget xvfb unzip libgtk-3-dev
+# Set locale
+RUN apt-get clean && apt-get update && apt-get install -y locales
+RUN locale-gen en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+RUN wget http://www.eclipse.org/external/technology/epp/downloads/release/2019-09/R/eclipse-jee-2019-09-R-linux-gtk-x86_64.tar.gz
+RUN tar xzf eclipse-jee-2019-09-R-linux-gtk-x86_64.tar.gz
+ADD run.sh /home
+ADD runTest.sh /home
+RUN chmod 755 /home/run.sh
+RUN chmod 755 /home/runTest.sh
+
+CMD ./run.sh

dev/ant_build/build-cw.xml

@@ -60,7 +60,7 @@
         <antcall target="cw_imports.generateCWSuppliersUpdateSiteRestore"/>
 
         <antcall target="cw_imports.generateCWUpdateSite"/>
-        
+        <antcall target="cw_test_imports.generateCWTestUpdateSite"/>
         <echo message="Delete tools.image"/>
         <delete dir="${cw_build.basedir}/tools.image" failonerror="false"/>
     </target>

dev/ant_build/cw_test_imports.xml

@@ -73,31 +73,36 @@
 	  	</copy>
 
 		<!-- Copy build result content -->
+    <echo message="Copy to ${sourceDir}" />
 		<copy todir="${sourceDir}/features" overwrite="true" verbose="true">
-			<fileset dir="${local.workspace}/tools.image/test/features">
+			<fileset dir="${local.workspace}/tools.image/update_testplugins/features">
 				<include name="**/*.jar"/>
 			</fileset>
 		</copy>
 
 		<copy todir="${sourceDir}/plugins" overwrite="true" verbose="true">
-			<fileset dir="${local.workspace}/tools.image/test/plugins">
+			<fileset dir="${local.workspace}/tools.image/update_testplugins/plugins">
 				<include name="**/*.jar"/>
 			</fileset>
 		</copy>
 
 		<!-- Step 1 -->
+    <echo message="sourceDir: ${sourceDir}" />
+    <echo message="tempDir: ${tempDir}" />
+    <echo message="updateSiteDir: ${updateSiteDir}" />
+    <echo message="updateSiteDirFull: ${updateSiteDirFull}" />
 		<!-- Create site.xml with top level feature(s) -->
 		<generateUpdateSite
 			tempDir="${tempDir}"
 			sourceDir="${sourceDir}"
 			outputDir="${updateSiteDir}"
-			addIncludedFeatures="false">
+			addIncludedFeatures="true">
 
 		<!-- Add Main feature here -->
-			<category name="OpenAPI Tools"
+			<category name="OpenAPI Tools Test"
 				label="Codewind V${version} Unit Tests"
 				description="Codewind V${version} Unit Tests">
-				<feature id="org.eclipse.codewind.openapi.test" />
+				<feature id="org.eclipse.codewind.openapi.feature.test" />
 		  	</category>
 		</generateUpdateSite>
 
@@ -110,7 +115,7 @@
 			addIncludedFeatures="true">
 
 		<!-- Add Main feature here -->
-			<feature id="org.eclipse.codewind.openapi.test" />
+			<feature id="org.eclipse.codewind.openapi.feature.test" />
 	  	</generateUpdateSite>
 
 	  	<!-- Step 3 -->

dev/buildAll.gradle

@@ -78,8 +78,14 @@ def openApiCliFile = file(projDir + project.properties['codewind.core.prereqlib.
 
 def filePrefix = "codewind-openapi-eclipse"
 
+def swtBotEclipseFinderFile = file(projDir + project.properties['eclipse.target.platform.ies.folder'] + '/eclipse/dropins/plugins/org.eclipse.swtbot.eclipse.finder_2.8.0.201906121535.jar')
+def swtBotJunitFile = file(projDir + project.properties['eclipse.target.platform.ies.folder'] + '/eclipse/dropins/plugins/org.eclipse.swtbot.junit4_x_2.8.0.201906121535.jar')
+def swtBotSwtFile = file(projDir + project.properties['eclipse.target.platform.ies.folder'] + '/eclipse/dropins/plugins/org.eclipse.swtbot.swt.finder_2.8.0.201906121535.jar')
 
-// Download dependent plugins from maven repository for 'org.eclipse.codewind.core'
+
+
+
+// Download dependent plugins from maven repository for 'org.eclipse.codewind.openapi.core'
 task getCoreDependencies(type: Copy) {
 
     if (!corelibFolder.exists()) {
@@ -107,6 +113,26 @@ task downloadOpenApiCli(type: Download) {
     target = openApiCliFile
 }
 
+task downloadSWTBotEclipseFinderJar(type: Download) {
+    println("Downloading SWTBot Eclipse Finder jar")
+    sourceUrl='http://download.eclipse.org/technology/swtbot/releases/latest/plugins/org.eclipse.swtbot.eclipse.finder_2.8.0.201906121535.jar'
+    target=swtBotEclipseFinderFile
+}
+
+task downloadSWTBotJunitJar(type: Download) {
+    println("Downloading SWTBot Junit jar")
+    sourceUrl='http://download.eclipse.org/technology/swtbot/releases/latest/plugins/org.eclipse.swtbot.junit4_x_2.8.0.201906121535.jar'
+    target=swtBotJunitFile
+}
+
+task downloadSWTBotSwtJar(type: Download) {
+    println("Downloading SWTBot SWT jar")
+    sourceUrl='http://download.eclipse.org/technology/swtbot/releases/latest/plugins/org.eclipse.swtbot.swt.finder_2.8.0.201906121535.jar'
+    target=swtBotSwtFile
+}
+
+
+
 class Download extends DefaultTask {
     @Input
     String sourceUrl
@@ -220,6 +246,11 @@ preparePrereqsIvy.dependsOn importAnt
 compile.dependsOn preparePrereqsIvy
 compile.dependsOn downloadEclipseSDK
 compile.dependsOn downloadEclipseTargetPlatform
+compile.dependsOn downloadSWTBotEclipseFinderJar
+compile.dependsOn downloadSWTBotJunitJar
+compile.dependsOn downloadSWTBotSwtJar
+
+
 
 //// build version from the artifacts to avoid version mismatch
 import static groovy.io.FileType.FILES

dev/org.eclipse.codewind.openapi.feature.test/build.properties

@@ -0,0 +1,4 @@
+bin.includes = feature.xml,\
+               category.xml,\
+               feature.properties, \
+               license.html

dev/org.eclipse.codewind.openapi.feature.test/build.xml

@@ -0,0 +1,15 @@
+<!--
+    Copyright (c) 2019 IBM Corporation and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v20.html
+
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+
+<project name="org.eclipse.codewind.openapi.feature.test" default="build">
+	<property name="image.write.dir" value="update_testplugins/features"/>
+	<import file="../ant_build/public_imports/internal_imports/feature_build.xml"/>
+</project>

dev/org.eclipse.codewind.openapi.feature.test/category.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <feature url="features/org.eclipse.codewind.openapi.feature.test_0.7.0.qualifier.jar" id="org.eclipse.codewind.openapi.feature.test" version="0.5.0.qualifier">
+      <category name="org.eclipse.codewind.openapi.category.test"/>
+   </feature>
+   <category-def name="org.eclipse.codewind.openapi.category.test" label="OpenAPI Tools Test"/>
+</site>