Working on tests

diff --git a/.gitattributes b/.gitattributes
index cc8c8fd5fed728c7d189a22d81e32b2240a685ca..7e17bb1200f2cdf231921590811806b099ccd9b4 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1322,6 +1322,7 @@ eu.etaxonomy.taxeditor.test/.settings/org.eclipse.jdt.core.prefs -text
 eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF -text
 eu.etaxonomy.taxeditor.test/build.properties -text
 eu.etaxonomy.taxeditor.test/ide/eclipse/EDITor[!!-~]Tests.launch -text
+eu.etaxonomy.taxeditor.test/pom.xml -text
 eu.etaxonomy.taxeditor.test/src/main/resources/log4j.xml -text
 eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/application/menu/general/NewMenuTest.java -text
 eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/navigation/navigator/contextmenu/ClassificationTest.java -text

diff --git a/.gitignore b/.gitignore
index 4042679d72517316e9d09373f7e95bbc9f6d0708..a6d296165a0dd60b43042f13427d792c16d182cd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ eu.etaxonomy.taxeditor.store/.settings
 eu.etaxonomy.taxeditor.store/hibernate.log
 eu.etaxonomy.taxeditor.store/target
 eu.etaxonomy.taxeditor.test/screenshots/*.jpeg
+eu.etaxonomy.taxeditor.test/target
 eu.etaxonomy.taxeditor/.settings
 eu.etaxonomy.taxeditor/target
 /runtime-taxeditor.product

diff --git a/eu.etaxonomy.taxeditor.test/.classpath b/eu.etaxonomy.taxeditor.test/.classpath
index c5d344b0e488c1d59c92c4cbc81803ef7fc2b4af..c45eced959697eb26c7cb9551e17a277b407fb1d 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/.classpath
+++ b/eu.etaxonomy.taxeditor.test/.classpath
@@ -4,6 +4,5 @@
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
        <classpathentry kind="src" path="src/test/java"/>\r
        <classpathentry kind="src" path="src/main/resources"/>\r
-       <classpathentry kind="src" path="src_/"/>\r
-       <classpathentry kind="output" path="bin"/>\r
+       <classpathentry kind="output" path="target"/>\r
 </classpath>\r

diff --git a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
index 998796316fce075ec22522ec00caa05432ac854d..37c5526edecc007053cd340582eb6d94f6289127 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: eu.etaxonomy.taxeditor.test
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.test;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 3.0.6.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: EDIT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/eu.etaxonomy.taxeditor.test/build.properties b/eu.etaxonomy.taxeditor.test/build.properties
index dbd5f74b823e90447121ebe2fdd097c8d0cb9990..137d6a59ccc7ed4073b31469643cef499bfe3f0a 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/build.properties
+++ b/eu.etaxonomy.taxeditor.test/build.properties
@@ -1,4 +1,3 @@
-source.. = src_/
-output.. = bin/
+source.. = src/test/java/
 bin.includes = META-INF/,\
                .

diff --git a/eu.etaxonomy.taxeditor.test/pom.xml b/eu.etaxonomy.taxeditor.test/pom.xml
new file mode 100644 (file)
index 0000000..8d5d814
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.test/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<project>\r
+\r
+       <parent>\r
+               <groupId>eu.etaxonomy</groupId>\r
+               <artifactId>taxeditor-parent</artifactId>\r
+               <version>3.0.6-SNAPSHOT</version>\r
+       </parent>\r
+\r
+       <modelVersion>4.0.0</modelVersion>\r
+       <artifactId>eu.etaxonomy.taxeditor.test</artifactId>\r
+       <packaging>eclipse-test-plugin</packaging>\r
+\r
+       <name>UI Test Bundle</name>\r
+       <description>Holds all UI tests for the Taxonomic Editor</description>\r
+\r
+       <!-- <repositories> -->\r
+       <!-- <repository> -->\r
+       <!-- <id>ganymede</id> -->\r
+       <!-- <layout>p2</layout> -->\r
+       <!-- <url>http://download.eclipse.org/releases/galileo</url> -->\r
+       <!-- </repository> -->\r
+       <!-- <repository> -->\r
+       <!-- <id>swtbot</id> -->\r
+       <!-- <layout>p2</layout> -->\r
+       <!-- <url>http://download.eclipse.org/technology/swtbot/galileo/dev-build/update-site</url> -->\r
+       <!-- </repository> -->\r
+       <!-- </repositories> -->\r
+\r
+       <build>\r
+               <plugins>\r
+                       <plugin>\r
+                               <groupId>org.eclipse.tycho</groupId>\r
+                               <artifactId>tycho-maven-plugin</artifactId>\r
+                               <version>${tycho.version}</version>\r
+                               <extensions>true</extensions>\r
+                       </plugin>\r
+                       <plugin>\r
+                               <groupId>org.eclipse.tycho</groupId>\r
+                               <artifactId>target-platform-configuration</artifactId>\r
+                               <version>${tycho.version}</version>\r
+                               <configuration>\r
+                                       <resolver>p2</resolver>\r
+                               </configuration>\r
+                       </plugin>\r
+                       <plugin>\r
+                               <groupId>org.eclipse.tycho</groupId>\r
+                               <artifactId>maven-osgi-test-plugin</artifactId>\r
+                               <version>${tycho.version}</version>\r
+                               <configuration>\r
+                                       <useUIHarness>true</useUIHarness>\r
+                                       <useUIThread>false</useUIThread>\r
+                                       <product>eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product</product>\r
+                                       <!-- <application>org.eclipse.ui.ide.workbench</application> -->\r
+                                       <dependencies>\r
+                                               <dependency>\r
+                                                       <type>p2-installable-unit</type>\r
+                                                       <artifactId>eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product</artifactId>\r
+                                                       <version>0.0.0</version>\r
+                                               </dependency>\r
+                                       </dependencies>\r
+                               </configuration>\r
+                       </plugin>\r
+               </plugins>\r
+       </build>\r
+</project>
\ No newline at end of file