Fix test build bug / fix broken tests / make things consistent (#1360)

* Make things consistent
* A few more things
* Fix test in .welcome.test bundle
* Fix facet metadata settings xml filename
* Pull in org.eclipse.ui.intro in .welcome test
* Add "Bundle-ClassPath: ." to MANIFEST.MF's
* Let's not expose constants for testing

eclipse/ide-target-platform/pom.xml

@@ -7,7 +7,7 @@
     <groupId>com.google.cloud.tools.eclipse</groupId>
     <artifactId>trunk</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-    <relativePath>../..</relativePath>
+    <relativePath>../../</relativePath>
   </parent>
   <artifactId>ide-target-platform.repo</artifactId>
   <version>0.1.0-SNAPSHOT</version>

features/com.google.licenses.apache_v2/pom.xml

@@ -1,10 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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>com.google.cloud.tools.eclipse</groupId>
     <artifactId>trunk</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-    <relativePath>../..</relativePath>
+    <relativePath>../../</relativePath>
   </parent>
   <artifactId>com.google.licenses.apache_v2</artifactId>
   <version>0.1.0-SNAPSHOT</version>

plugins/com.google.cloud.tools.eclipse.appengine.compat.test/META-INF/MANIFEST.MF

@@ -1,4 +1,5 @@
 Manifest-Version: 1.0
+Bundle-ClassPath: .
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for Cloud Tools for Eclipse GPE Migration Support for App Engine Project Conversion
 Bundle-SymbolicName: com.google.cloud.tools.eclipse.appengine.compat.test;singleton:=true

plugins/com.google.cloud.tools.eclipse.appengine.compat.test/pom.xml

@@ -10,6 +10,5 @@
   </parent>
   <artifactId>com.google.cloud.tools.eclipse.appengine.compat.test</artifactId>
   <version>0.1.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-
+  <packaging>eclipse-test-plugin</packaging>
 </project>

plugins/com.google.cloud.tools.eclipse.appengine.compat.test/src/com/google/cloud/tools/eclipse/appengine/compat/GpeMigratorTest.java

@@ -99,7 +99,8 @@ public void testRemoveGpeRuntimeAndFacets_runtimeRemoved() throws CoreException
   @Test
   public void testRemoveGpeRuntimeAndFacets_doNotLogIfMetadataFileDoesNotExist()
       throws CoreException {
-    IFile metadataFile = gpeProject.getFile(GpeMigrator.FACETS_METADATA_FILE);
+    IFile metadataFile =
+        gpeProject.getFile(".settings/org.eclipse.wst.common.project.facet.core.xml");
     metadataFile.delete(true, null);
     assertFalse(metadataFile.exists());
 

plugins/com.google.cloud.tools.eclipse.appengine.compat/META-INF/MANIFEST.MF

@@ -1,4 +1,5 @@
 Manifest-Version: 1.0
+Bundle-ClassPath: .
 Bundle-ManifestVersion: 2
 Bundle-Name: Cloud Tools for Eclipse GPE Migration Support for App Engine Project Conversion
 Bundle-SymbolicName: com.google.cloud.tools.eclipse.appengine.compat;singleton:=true

plugins/com.google.cloud.tools.eclipse.appengine.compat/src/com/google/cloud/tools/eclipse/appengine/compat/GpeMigrator.java

@@ -65,8 +65,8 @@ public class GpeMigrator {
   private static final String WTP_METADATA_XSLT = "/xslt/wtpMetadata.xsl";
 
   // FacetedProject.METADATA_FILE = ".settings/" + FacetCorePlugin.PLUGIN_ID + ".xml";
-  @VisibleForTesting
-  static final String FACETS_METADATA_FILE = ".settings/org.eclipse.wst.common.component.xml";
+  private static final String FACETS_METADATA_FILE =
+      ".settings/org.eclipse.wst.common.project.facet.core.xml";
 
   /**
    * Removes various GPE-related remnants: classpath entries, nature, runtime, and facets. Any

plugins/com.google.cloud.tools.eclipse.appengine.deploy.test/pom.xml

@@ -13,7 +13,6 @@
   <packaging>eclipse-test-plugin</packaging>
 
   <build>
-    <sourceDirectory>src</sourceDirectory>
     <plugins>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>

plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui/META-INF/MANIFEST.MF

@@ -1,4 +1,5 @@
 Manifest-Version: 1.0
+Bundle-ClassPath: .
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: com.google.cloud.tools.eclipse.appengine.deploy.ui;singleton:=true

plugins/com.google.cloud.tools.eclipse.appengine.deploy/META-INF/MANIFEST.MF

@@ -1,4 +1,5 @@
 Manifest-Version: 1.0
+Bundle-ClassPath: .
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: com.google.cloud.tools.eclipse.appengine.deploy;singleton:=true

plugins/com.google.cloud.tools.eclipse.appengine.facets.test/pom.xml

@@ -13,7 +13,6 @@
   <packaging>eclipse-test-plugin</packaging>
 
   <build>
-    <sourceDirectory>src</sourceDirectory>
     <plugins>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>

plugins/com.google.cloud.tools.eclipse.appengine.facets/META-INF/MANIFEST.MF

@@ -1,4 +1,5 @@
 Manifest-Version: 1.0
+Bundle-ClassPath: .
 Bundle-ManifestVersion: 2
 Bundle-Name: Cloud Tools for Eclipse App Engine Facets
 Bundle-SymbolicName: com.google.cloud.tools.eclipse.appengine.facets;singleton:=true

plugins/com.google.cloud.tools.eclipse.appengine.libraries.test/pom.xml

@@ -13,7 +13,6 @@
   <packaging>eclipse-test-plugin</packaging>
 
   <build>
-    <sourceDirectory>src</sourceDirectory>
     <plugins>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>

plugins/com.google.cloud.tools.eclipse.appengine.libraries/META-INF/MANIFEST.MF

@@ -1,4 +1,5 @@
 Manifest-Version: 1.0
+Bundle-ClassPath: .
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: com.google.cloud.tools.eclipse.appengine.libraries;singleton:=true

plugins/com.google.cloud.tools.eclipse.appengine.localserver.test/pom.xml

@@ -13,15 +13,15 @@
   <packaging>eclipse-test-plugin</packaging>
 
   <build>
-    <sourceDirectory>src</sourceDirectory>
     <plugins>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>tycho-surefire-plugin</artifactId>
-         <configuration>
-           <useUIHarness>true</useUIHarness>
-           <product>org.eclipse.platform.ide</product>
-         </configuration>
+        <configuration>
+          <useUIHarness>true</useUIHarness>
+          <useUIThread>true</useUIThread>
+          <product>org.eclipse.platform.ide</product>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>

plugins/com.google.cloud.tools.eclipse.appengine.localserver/META-INF/MANIFEST.MF

@@ -1,4 +1,5 @@
 Manifest-Version: 1.0
+Bundle-ClassPath: .
 Bundle-ManifestVersion: 2
 Bundle-Name: Cloud Tools for Eclipse App Engine Local Server
 Bundle-SymbolicName: com.google.cloud.tools.eclipse.appengine.localserver;singleton:=true

plugins/com.google.cloud.tools.eclipse.appengine.newproject.maven.test/pom.xml

@@ -19,6 +19,7 @@
         <artifactId>tycho-surefire-plugin</artifactId>
         <configuration>
           <useUIHarness>true</useUIHarness>
+          <useUIThread>true</useUIThread>
           <product>org.eclipse.platform.ide</product>
         </configuration>
       </plugin>

plugins/com.google.cloud.tools.eclipse.appengine.newproject.maven/META-INF/MANIFEST.MF

@@ -1,4 +1,5 @@
 Manifest-Version: 1.0
+Bundle-ClassPath: .
 Bundle-ManifestVersion: 2
 Bundle-Name: Cloud Tools for Eclipse Maven-based App Engine Standard Project Generation
 Bundle-SymbolicName: com.google.cloud.tools.eclipse.appengine.newproject.maven;singleton:=true

plugins/com.google.cloud.tools.eclipse.appengine.newproject/META-INF/MANIFEST.MF

@@ -1,4 +1,5 @@
 Manifest-Version: 1.0
+Bundle-ClassPath: .
 Bundle-ManifestVersion: 2
 Bundle-Name: Cloud Tools for Eclipse App Engine New Project Generation
 Bundle-SymbolicName: com.google.cloud.tools.eclipse.appengine.newproject;singleton:=true

plugins/com.google.cloud.tools.eclipse.appengine.ui.test/pom.xml

@@ -13,7 +13,6 @@
   <packaging>eclipse-test-plugin</packaging>
 
   <build>
-    <sourceDirectory>src</sourceDirectory>
     <plugins>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
@@ -42,5 +41,3 @@
     </plugins>
   </build>
 </project>
-
-

plugins/com.google.cloud.tools.eclipse.appengine.ui/META-INF/MANIFEST.MF

@@ -1,4 +1,5 @@
 Manifest-Version: 1.0
+Bundle-ClassPath: .
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: com.google.cloud.tools.eclipse.appengine.ui;singleton:=true

plugins/com.google.cloud.tools.eclipse.appengine.validation.test/pom.xml

@@ -13,7 +13,6 @@
   <packaging>eclipse-test-plugin</packaging>
 
   <build>
-    <sourceDirectory>src</sourceDirectory>
     <plugins>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
@@ -22,5 +21,3 @@
     </plugins>
   </build>
 </project>
-
-

plugins/com.google.cloud.tools.eclipse.appengine.validation/META-INF/MANIFEST.MF

@@ -1,4 +1,5 @@
 Manifest-Version: 1.0
+Bundle-ClassPath: .
 Bundle-ManifestVersion: 2
 Bundle-Name: Cloud Tools for Eclipse App Engine JRE Whitelist Checks
 Bundle-SymbolicName: com.google.cloud.tools.eclipse.appengine.validation;singleton:=true

plugins/com.google.cloud.tools.eclipse.integration.appengine/META-INF/MANIFEST.MF

@@ -1,4 +1,5 @@
 Manifest-Version: 1.0
+Bundle-ClassPath: .
 Bundle-ManifestVersion: 2
 Bundle-Name: Integration tests for App Engine functionality
 Bundle-SymbolicName: com.google.cloud.tools.eclipse.integration.appengine

plugins/com.google.cloud.tools.eclipse.integration.appengine/pom.xml

@@ -13,7 +13,6 @@
   <packaging>eclipse-test-plugin</packaging>
 
   <build>
-    <sourceDirectory>src</sourceDirectory>
     <plugins>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>

plugins/com.google.cloud.tools.eclipse.login.test/pom.xml

@@ -13,7 +13,6 @@
   <packaging>eclipse-test-plugin</packaging>
 
   <build>
-    <sourceDirectory>src</sourceDirectory>
     <plugins>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>

plugins/com.google.cloud.tools.eclipse.login/META-INF/MANIFEST.MF

@@ -1,4 +1,5 @@
 Manifest-Version: 1.0
+Bundle-ClassPath: .
 Bundle-ManifestVersion: 2
 Bundle-Name: Cloud Tools for Eclipse Login Support
 Bundle-SymbolicName: com.google.cloud.tools.eclipse.login;singleton:=true

plugins/com.google.cloud.tools.eclipse.preferences.test/META-INF/MANIFEST.MF

@@ -1,4 +1,5 @@
 Manifest-Version: 1.0
+Bundle-ClassPath: .
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for Google Cloud Platform Preferences
 Bundle-SymbolicName: com.google.cloud.tools.eclipse.preferences.test;singleton:=true

plugins/com.google.cloud.tools.eclipse.preferences.test/pom.xml

@@ -1,10 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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>com.google.cloud.tools.eclipse</groupId>
     <artifactId>trunk</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-    <relativePath>../..</relativePath>
+    <relativePath>../../</relativePath>
   </parent>
   <artifactId>com.google.cloud.tools.eclipse.preferences.test</artifactId>
   <version>0.1.0-SNAPSHOT</version>

plugins/com.google.cloud.tools.eclipse.preferences/META-INF/MANIFEST.MF

@@ -1,4 +1,5 @@
 Manifest-Version: 1.0
+Bundle-ClassPath: .
 Bundle-ManifestVersion: 2
 Bundle-Name: Cloud Tools for Eclipse Preferences
 Bundle-SymbolicName: com.google.cloud.tools.eclipse.preferences;singleton:=true

plugins/com.google.cloud.tools.eclipse.preferences/pom.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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>
@@ -9,4 +10,4 @@
   <artifactId>com.google.cloud.tools.eclipse.preferences</artifactId>
   <version>0.1.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
-</project>
+</project>

plugins/com.google.cloud.tools.eclipse.projectselector.test/META-INF/MANIFEST.MF

@@ -1,4 +1,5 @@
 Manifest-Version: 1.0
+Bundle-ClassPath: .
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for Cloud Tools for Eclipse Project Selector Widget
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7

plugins/com.google.cloud.tools.eclipse.projectselector/META-INF/MANIFEST.MF

@@ -1,4 +1,5 @@
 Manifest-Version: 1.0
+Bundle-ClassPath: .
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: com.google.cloud.tools.eclipse.projectselector;singleton:=true

plugins/com.google.cloud.tools.eclipse.sdk.test/META-INF/MANIFEST.MF

@@ -1,4 +1,5 @@
 Manifest-Version: 1.0
+Bundle-ClassPath: .
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for Google Cloud SDK within the Eclipse IDE
 Bundle-SymbolicName: com.google.cloud.tools.eclipse.sdk.test;singleton:=true

plugins/com.google.cloud.tools.eclipse.sdk.test/pom.xml

@@ -1,10 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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>com.google.cloud.tools.eclipse</groupId>
     <artifactId>trunk</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-    <relativePath>../..</relativePath>
+    <relativePath>../../</relativePath>
   </parent>
   <artifactId>com.google.cloud.tools.eclipse.sdk.test</artifactId>
   <version>0.1.0-SNAPSHOT</version>

plugins/com.google.cloud.tools.eclipse.sdk.ui.test/pom.xml

@@ -13,7 +13,6 @@
   <packaging>eclipse-test-plugin</packaging>
 
   <build>
-    <sourceDirectory>src</sourceDirectory>
     <plugins>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>

plugins/com.google.cloud.tools.eclipse.sdk.ui/META-INF/MANIFEST.MF

@@ -1,4 +1,5 @@
 Manifest-Version: 1.0
+Bundle-ClassPath: .
 Bundle-ManifestVersion: 2
 Bundle-Name: Cloud Tools for Eclipse User Interface for the Cloud SDK
 Bundle-SymbolicName: com.google.cloud.tools.eclipse.sdk.ui;singleton:=true

plugins/com.google.cloud.tools.eclipse.sdk.ui/pom.xml

@@ -1,10 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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>com.google.cloud.tools.eclipse</groupId>
     <artifactId>trunk</artifactId>
     <version>0.1.0-SNAPSHOT</version>
-    <relativePath>../..</relativePath>
+    <relativePath>../../</relativePath>
   </parent>
   <artifactId>com.google.cloud.tools.eclipse.sdk.ui</artifactId>
   <version>0.1.0-SNAPSHOT</version>

plugins/com.google.cloud.tools.eclipse.sdk/META-INF/MANIFEST.MF

@@ -1,4 +1,5 @@
 Manifest-Version: 1.0
+Bundle-ClassPath: .
 Bundle-ManifestVersion: 2
 Bundle-Name: Cloud Tools for Eclipse Support for Google Cloud SDK
 Bundle-SymbolicName: com.google.cloud.tools.eclipse.sdk;singleton:=true

plugins/com.google.cloud.tools.eclipse.sdk/pom.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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>

plugins/com.google.cloud.tools.eclipse.swtbot/META-INF/MANIFEST.MF

@@ -1,4 +1,5 @@
 Manifest-Version: 1.0
+Bundle-ClassPath: .
 Bundle-ManifestVersion: 2
 Bundle-Name: Test Helpers for SWTBot
 Bundle-SymbolicName: com.google.cloud.tools.eclipse.swtbot

plugins/com.google.cloud.tools.eclipse.test.logback/META-INF/MANIFEST.MF

@@ -1,4 +1,5 @@
 Manifest-Version: 1.0
+Bundle-ClassPath: .
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: com.google.cloud.tools.eclipse.test.logback;singleton:=true

plugins/com.google.cloud.tools.eclipse.test.util/META-INF/MANIFEST.MF

@@ -1,4 +1,5 @@
 Manifest-Version: 1.0
+Bundle-ClassPath: .
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: com.google.cloud.tools.eclipse.test.util;singleton:=true

plugins/com.google.cloud.tools.eclipse.ui.util.test/pom.xml

@@ -13,7 +13,6 @@
   <packaging>eclipse-test-plugin</packaging>
 
   <build>
-    <sourceDirectory>src</sourceDirectory>
     <plugins>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>

plugins/com.google.cloud.tools.eclipse.ui.util/META-INF/MANIFEST.MF

@@ -1,4 +1,5 @@
 Manifest-Version: 1.0
+Bundle-ClassPath: .
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: com.google.cloud.tools.eclipse.ui.util;singleton:=true

plugins/com.google.cloud.tools.eclipse.usagetracker.test/META-INF/MANIFEST.MF

@@ -1,4 +1,5 @@
 Manifest-Version: 1.0
+Bundle-ClassPath: .
 Bundle-ManifestVersion: 2
 Bundle-Name: Cloud Tools for Eclipse Usage Tracker Tests
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7

plugins/com.google.cloud.tools.eclipse.usagetracker.test/pom.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <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>

plugins/com.google.cloud.tools.eclipse.usagetracker/META-INF/MANIFEST.MF

@@ -1,4 +1,5 @@
 Manifest-Version: 1.0
+Bundle-ClassPath: .
 Bundle-ManifestVersion: 2
 Bundle-Name: Cloud Tools for Eclipse Analytics
 Bundle-SymbolicName: com.google.cloud.tools.eclipse.usagetracker;singleton:=true

plugins/com.google.cloud.tools.eclipse.usagetracker/pom.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>

plugins/com.google.cloud.tools.eclipse.util.test/pom.xml

@@ -13,7 +13,6 @@
   <packaging>eclipse-test-plugin</packaging>
 
   <build>
-    <sourceDirectory>src</sourceDirectory>
     <plugins>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>