Merge pull request #98 from DenisKnoepfle/master

Add plug-in fragment as test plug-in for the UI (#68)

org.spotter.client/test/org/spotter/client/SpotterServiceClientTest.java

@@ -78,8 +78,6 @@ public static void cleanUp() throws IOException {
 		if (tempDir.exists()) {
 			LpeFileUtils.removeDir(tempDir.getAbsolutePath());
 		}
-
-		shutdownServer();
 	}
 
 	@Before
@@ -92,16 +90,6 @@ private static void startServer() {
 		ServerLauncher.main(argsStartCustomized);
 	}
 
-	private static void shutdownServer() {
-		String[] argsShutdownCustomized = {"shutdown", "port=" + port };
-		ServerLauncher.main(argsShutdownCustomized);
-		try {
-			Thread.sleep(SHUTDOWN_WAIT_DELAY);
-		} catch (InterruptedException e) {
-			LOGGER.warn("interrupted sleep delay after shutdown!");
-		}
-	}
-
 	@Test
 	public void testSpotterServiceClient() {
 		ssc.updateUrl(host, "");
@@ -183,9 +171,10 @@ private static void createTempDir() throws IOException {
 
 	private static void initGlobalConfigs(String baseDir) {
 		Properties properties = new Properties();
-		properties.setProperty("org.lpe.common.extension.appRootDir", tempDir.getAbsolutePath());
+		properties.setProperty(ExtensionRegistry.APP_ROOT_DIR_PROPERTY_KEY, tempDir.getAbsolutePath());
+		properties.setProperty(ExtensionRegistry.PLUGINS_FOLDER_PROPERTY_KEY, "plugins");
 		properties.setProperty("org.spotter.conf.pluginDirNames", "plugins");
-		properties.setProperty(ConfigKeys.RESULT_DIR, baseDir + System.getProperty("file.separator"));
+		properties.setProperty(ConfigKeys.RESULT_DIR, baseDir + System.getProperty("file.separator") + "results");
 		properties.setProperty(ConfigKeys.EXPERIMENT_DURATION, "1");
 		properties.setProperty(ConfigKeys.EXPERIMENT_COOL_DOWN_INTERVAL_LENGTH, "1");
 		properties.setProperty(ConfigKeys.EXPERIMENT_COOL_DOWN_NUM_USERS_PER_INTERVAL, "1");

org.spotter.eclipse.ui.test/.gitignore

@@ -0,0 +1,9 @@
+/bin
+/target
+/.classpath
+/.settings
+/.project
+.DS_Store
+/.prefs
+/src/META-INF/MANIFEST.MF
+/lib

org.spotter.eclipse.ui.test/META-INF/MANIFEST.MF

@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: DynamicSpotter Eclipse UI Test
+Bundle-SymbolicName: org.spotter.eclipse.ui.test
+Bundle-Version: 0.0.1.qualifier
+Bundle-Vendor: SAP AG
+Fragment-Host: org.spotter.eclipse.ui;bundle-version="0.0.1"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-ClassPath: .,
+ ../org.spotter.eclipse.ui

org.spotter.eclipse.ui.test/build.properties

@@ -0,0 +1,19 @@
+#
+# Copyright 2014 SAP AG
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+source.. = src/
+bin.includes = META-INF/,\
+               .

org.spotter.eclipse.ui.test/pom.xml

@@ -0,0 +1,106 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.spotter</groupId>
+		<artifactId>org.spotter.parent</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>../org.spotter.parent</relativePath>
+	</parent>
+
+	<artifactId>org.spotter.eclipse.ui.test</artifactId>
+	<name>DynamicSpotter Eclipse UI Test</name>
+
+	<packaging>eclipse-test-plugin</packaging>
+
+	<properties>
+		<tycho-version>0.20.0</tycho-version>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<repositories>
+		<repository>
+			<id>kepler</id>
+			<layout>p2</layout>
+			<url>http://download.eclipse.org/releases/kepler</url>
+		</repository>
+	</repositories>
+
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-maven-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<extensions>true</extensions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<configuration>
+					<pomDependencies>consider</pomDependencies>
+					<environments>
+						<environment>
+							<os>linux</os>
+							<ws>gtk</ws>
+							<arch>x86</arch>
+						</environment>
+						<environment>
+							<os>linux</os>
+							<ws>gtk</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86</arch>
+						</environment>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>macosx</os>
+							<ws>cocoa</ws>
+							<arch>x86_64</arch>
+						</environment>
+					</environments>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<useUIHarness>true</useUIHarness>
+					<useUIThread>true</useUIThread>
+					<providerHint>junit4</providerHint>
+					<dependencies>
+						<dependency>
+							<groupId>junit</groupId>
+							<artifactId>junit</artifactId>
+							<version>4.10</version>
+						</dependency>
+					</dependencies>
+				</configuration>
+			</plugin>
+		</plugins>
+
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.spotter</groupId>
+			<artifactId>org.spotter.eclipse.ui</artifactId>
+			<version>0.0.1-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.10</version>
+		</dependency>
+	</dependencies>
+</project>

org.spotter.eclipse.ui.test/src/org/spotter/eclipse/ui/ActivatorTest.java

@@ -0,0 +1,75 @@
+package org.spotter.eclipse.ui;
+
+import junit.framework.Assert;
+
+import org.junit.Test;
+
+public class ActivatorTest {
+
+	@Test
+	public void testActivator() {
+		Assert.assertEquals("org.spotter.eclipse.ui", Activator.PLUGIN_ID);
+	}
+
+	/*@Test
+	public void testStartBundleContext() {
+		fail("Not yet implemented");
+	}
+
+	@Test
+	public void testStopBundleContext() {
+		fail("Not yet implemented");
+	}*/
+
+	@Test
+	public void testGetDefault() {
+		Activator activator = Activator.getDefault();
+		Assert.assertNotNull(activator);
+	}
+
+	/*@Test
+	public void testGetClient() {
+		fail("Not yet implemented");
+	}
+
+	@Test
+	public void testTestServiceStatus() {
+		fail("Not yet implemented");
+	}
+
+	@Test
+	public void testGetNavigatorViewer() {
+		fail("Not yet implemented");
+	}
+
+	@Test
+	public void testSetNavigatorViewer() {
+		fail("Not yet implemented");
+	}
+
+	@Test
+	public void testGetProjectHistoryElements() {
+		fail("Not yet implemented");
+	}
+
+	@Test
+	public void testSetProjectHistoryElements() {
+		fail("Not yet implemented");
+	}
+
+	@Test
+	public void testGetSelectedProjects() {
+		fail("Not yet implemented");
+	}
+
+	@Test
+	public void testSetSelectedProjects() {
+		fail("Not yet implemented");
+	}
+
+	@Test
+	public void testGetImage() {
+		fail("Not yet implemented");
+	}*/
+
+}

org.spotter.eclipse.ui/META-INF/MANIFEST.MF

@@ -9,7 +9,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.105.0",
  org.eclipse.ui.ide;bundle-version="3.9.1",
  org.eclipse.core.runtime;bundle-version="3.9.0",
  org.eclipse.ui.navigator;bundle-version="3.5.300",
- org.eclipse.ui.navigator.resources;bundle-version="3.4.500"
+ org.eclipse.ui.navigator.resources;bundle-version="3.4.500",
+ org.eclipse.equinox.ds;bundle-version="1.4.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ClassPath: .,

org.spotter.eclipse.ui/src/org/spotter/eclipse/ui/model/ExtensionMetaobject.java

@@ -42,8 +42,6 @@ public class ExtensionMetaobject {
 	 *            The project the extension is associated with
 	 * @param extensionName
 	 *            The name of the extension
-	 * @param configParams
-	 *            The parameters of the extension
 	 */
 	public ExtensionMetaobject(String projectName, String extensionName) {
 		this.projectName = projectName;

org.spotter.parent/pom.xml

@@ -18,6 +18,7 @@
 		<module>../org.spotter.service</module>
 		<module>../org.spotter.client</module>
 		<module>../org.spotter.eclipse.ui</module>
+		<!-- <module>../org.spotter.eclipse.ui.test</module> -->
 
 
 	</modules>