From 4ee5c436a94eb44d36b1970cc469d2007616f9a3 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Sat, 14 May 2022 16:38:59 +0200
Subject: [PATCH] Unify and simplify test-projects (#152)

- check-in the .classpath/.project file into git
- use "bin" as output-folder
- remove unnecessary plugin_customization.ini, pom.xml and launch files.
---
 .gitignore                                    |  8 +++
 .project                                      | 17 ++++++
 org.eclipse.m2e.editor.tests/.classpath       | 15 ++++++
 org.eclipse.m2e.editor.tests/.gitignore       |  5 --
 org.eclipse.m2e.editor.tests/.project         | 28 ++++++++++
 org.eclipse.m2e.editor.tests/build.properties |  2 +-
 .../m2e.editor.tests.launch                   | 43 ---------------
 .../plugin_customization.ini                  | 11 ----
 org.eclipse.m2e.editor.tests/pom.xml          | 54 -------------------
 org.eclipse.m2e.tests/.classpath              | 15 ++++++
 org.eclipse.m2e.tests/.gitignore              |  5 --
 org.eclipse.m2e.tests/.project                | 28 ++++++++++
 org.eclipse.m2e.tests/build.properties        |  2 +-
 .../plugin_customization.ini                  | 11 ----
 org.eclipse.m2e.tests/pom.xml                 | 44 ---------------
 15 files changed, 113 insertions(+), 175 deletions(-)
 create mode 100644 .project
 create mode 100644 org.eclipse.m2e.editor.tests/.classpath
 delete mode 100644 org.eclipse.m2e.editor.tests/.gitignore
 create mode 100644 org.eclipse.m2e.editor.tests/.project
 delete mode 100644 org.eclipse.m2e.editor.tests/m2e.editor.tests.launch
 delete mode 100644 org.eclipse.m2e.editor.tests/plugin_customization.ini
 delete mode 100644 org.eclipse.m2e.editor.tests/pom.xml
 create mode 100644 org.eclipse.m2e.tests/.classpath
 delete mode 100644 org.eclipse.m2e.tests/.gitignore
 create mode 100644 org.eclipse.m2e.tests/.project
 delete mode 100644 org.eclipse.m2e.tests/plugin_customization.ini
 delete mode 100644 org.eclipse.m2e.tests/pom.xml

diff --git a/.gitignore b/.gitignore
index be6a6a3b5..b893b6323 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,15 @@
 .classpath
 .project
+# Keep .classpath/.project files for this and direct child projects
+!/.project
+!/*/.classpath
+!/*/.project
+
 .settings/
 target/
 bin/
 
 .DS_Store
+
+.polyglot*
+.tycho-consumer-pom.xml
diff --git a/.project b/.project
new file mode 100644
index 000000000..e79beb5a2
--- /dev/null
+++ b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>m2e-core-tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.eclipse.m2e.editor.tests/.classpath b/org.eclipse.m2e.editor.tests/.classpath
new file mode 100644
index 000000000..73d6894a6
--- /dev/null
+++ b/org.eclipse.m2e.editor.tests/.classpath
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.eclipse.m2e.editor.tests/.gitignore b/org.eclipse.m2e.editor.tests/.gitignore
deleted file mode 100644
index b3e07c21f..000000000
--- a/org.eclipse.m2e.editor.tests/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/target
-/wintest
-/screenshots
-/.project
-/.classpath
diff --git a/org.eclipse.m2e.editor.tests/.project b/org.eclipse.m2e.editor.tests/.project
new file mode 100644
index 000000000..fc70a95d1
--- /dev/null
+++ b/org.eclipse.m2e.editor.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.m2e.editor.tests-2</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.eclipse.m2e.editor.tests/build.properties b/org.eclipse.m2e.editor.tests/build.properties
index 1fcd87482..17daa5b49 100644
--- a/org.eclipse.m2e.editor.tests/build.properties
+++ b/org.eclipse.m2e.editor.tests/build.properties
@@ -1,5 +1,5 @@
 source.. = src/
-output.. = target/classes/
+output.. = bin/
 bin.includes = META-INF/,\
                .,\
                about.html
diff --git a/org.eclipse.m2e.editor.tests/m2e.editor.tests.launch b/org.eclipse.m2e.editor.tests/m2e.editor.tests.launch
deleted file mode 100644
index 37cdee5b4..000000000
--- a/org.eclipse.m2e.editor.tests/m2e.editor.tests.launch
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.swtbot.eclipse.ui.launcher.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.m2e.editor.tests"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="GDK_NATIVE_WINDOWS" value="1"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.m2e.editor.tests"/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -pluginCustomization plugin_customization.ini"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.m2e.editor.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx800m -XX:MaxPermSize=256m"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
-<booleanAttribute key="run_in_ui_thread" value="false"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="true"/>
-</launchConfiguration>
diff --git a/org.eclipse.m2e.editor.tests/plugin_customization.ini b/org.eclipse.m2e.editor.tests/plugin_customization.ini
deleted file mode 100644
index acc085f2a..000000000
--- a/org.eclipse.m2e.editor.tests/plugin_customization.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (c) 2010-2011 Sonatype, Inc.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Add "-pluginCustomization plugin_customization.ini" to your Eclipse command line to apply these settings
-#
-org.eclipse.m2e.core/eclipse.m2.updateIndexes=false
diff --git a/org.eclipse.m2e.editor.tests/pom.xml b/org.eclipse.m2e.editor.tests/pom.xml
deleted file mode 100644
index 078c34367..000000000
--- a/org.eclipse.m2e.editor.tests/pom.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2008 Sonatype, Inc.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License 2.0
-  which accompanies this distribution, and is available at
-  https://www.eclipse.org/legal/epl-2.0/
-
-  SPDX-License-Identifier: EPL-2.0
--->
-<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.eclipse.m2e</groupId>
-    <artifactId>m2e-core-tests</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>org.eclipse.m2e.editor.tests</artifactId>
-  <packaging>eclipse-test-plugin</packaging>
-
-  <name>Maven Integration for Eclipse POM Editor tests</name>
-
-  <build>
-    <sourceDirectory>src</sourceDirectory>
-    
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-surefire-plugin</artifactId>
-        <configuration>
-          <appArgLine>-pluginCustomization ${project.basedir}/plugin_customization.ini</appArgLine>
-        </configuration>
-      </plugin>
-      
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <configuration>
-          <filesets>
-            <fileset>
-              <directory>wintest</directory>
-              <followSymlinks>false</followSymlinks>
-              <includes>
-                <include>**/*.png</include>
-              </includes>
-            </fileset>
-          </filesets>
-        </configuration>
-      </plugin>
-      
-    </plugins>    
-  </build>
-</project>
diff --git a/org.eclipse.m2e.tests/.classpath b/org.eclipse.m2e.tests/.classpath
new file mode 100644
index 000000000..73d6894a6
--- /dev/null
+++ b/org.eclipse.m2e.tests/.classpath
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.eclipse.m2e.tests/.gitignore b/org.eclipse.m2e.tests/.gitignore
deleted file mode 100644
index 70d71f143..000000000
--- a/org.eclipse.m2e.tests/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/target
-/workspaceState.ser
-/bin
-/.project
-/.classpath
diff --git a/org.eclipse.m2e.tests/.project b/org.eclipse.m2e.tests/.project
new file mode 100644
index 000000000..26750e361
--- /dev/null
+++ b/org.eclipse.m2e.tests/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.m2e.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.eclipse.m2e.tests/build.properties b/org.eclipse.m2e.tests/build.properties
index 0ae198fab..43fc2781b 100644
--- a/org.eclipse.m2e.tests/build.properties
+++ b/org.eclipse.m2e.tests/build.properties
@@ -11,7 +11,7 @@
 #
 
 source.. = src/
-output.. = target/classes/
+output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
diff --git a/org.eclipse.m2e.tests/plugin_customization.ini b/org.eclipse.m2e.tests/plugin_customization.ini
deleted file mode 100644
index acc085f2a..000000000
--- a/org.eclipse.m2e.tests/plugin_customization.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (c) 2010-2011 Sonatype, Inc.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Add "-pluginCustomization plugin_customization.ini" to your Eclipse command line to apply these settings
-#
-org.eclipse.m2e.core/eclipse.m2.updateIndexes=false
diff --git a/org.eclipse.m2e.tests/pom.xml b/org.eclipse.m2e.tests/pom.xml
deleted file mode 100644
index f5bd831eb..000000000
--- a/org.eclipse.m2e.tests/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2008 Sonatype, Inc.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License 2.0
-  which accompanies this distribution, and is available at
-  https://www.eclipse.org/legal/epl-2.0/
-
-  SPDX-License-Identifier: EPL-2.0
--->
-<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.eclipse.m2e</groupId>
-    <artifactId>m2e-core-tests</artifactId>
-    <version>1.16.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>org.eclipse.m2e.tests</artifactId>
-  <packaging>eclipse-test-plugin</packaging>
-  <version>1.17.2-SNAPSHOT</version>
-
-  <name>Maven Integration for Eclipse tests</name>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-surefire-plugin</artifactId>
-          <configuration>
-            <appArgLine>-pluginCustomization ${basedir}/plugin_customization.ini</appArgLine>
-            <environmentVariables>
-              <TEMP>${java.io.tmpdir}</TEMP>
-            </environmentVariables>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-</project>