2011-01-28 Severin Gehwolf <sgehwolf@redhat.com>

	* Close Subclipse's usage reporting tool before SWTBot tests
	  start to run and should Subclipse be installed.

6 files changed, 28 insertions, 0 deletions

diff --git a/changelog/org.eclipse.linuxtools.changelog.ui.tests/ChangeLog b/changelog/org.eclipse.linuxtools.changelog.ui.tests/ChangeLog
index c9bb73ea07..fc830b0ce1 100644
--- a/changelog/org.eclipse.linuxtools.changelog.ui.tests/ChangeLog
+++ b/changelog/org.eclipse.linuxtools.changelog.ui.tests/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-28  Severin Gehwolf  <sgehwolf@redhat.com>
+
+	* src/org/eclipse/linuxtools/changelog/ui/tests/swtbot/AddChangelogEntrySWTBotTest.java (beforeClass):
+	Close subclipse's usage reporting pop-up.
+	* src/org/eclipse/linuxtools/changelog/ui/tests/swtbot/CreateChangeLogFromHistorySWTBotTest.java (beforeClass):
+	Ditto.
+	* src/org/eclipse/linuxtools/changelog/ui/tests/swtbot/DisabledPrepareChangelogSWTBotTest.java (beforeClass):
+	Ditto.
+	* src/org/eclipse/linuxtools/changelog/ui/tests/swtbot/FormatChangeLogSWTBotTest.java (beforeClass):
+	Ditto.
+	* src/org/eclipse/linuxtools/changelog/ui/tests/swtbot/PrepareChangelogSWTBotTest.java (beforeClass):
+	Ditto.
+
 2011-01-17  Jeff Johnston  <jjohnstn@redhat.com>
 
 	* src/org/eclipse/linuxtools/changelog/ui/tests/utils/ProjectExplorerTreeItemAppearsCondition.java (test): 
diff --git a/changelog/org.eclipse.linuxtools.changelog.ui.tests/src/org/eclipse/linuxtools/changelog/ui/tests/swtbot/AddChangelogEntrySWTBotTest.java b/changelog/org.eclipse.linuxtools.changelog.ui.tests/src/org/eclipse/linuxtools/changelog/ui/tests/swtbot/AddChangelogEntrySWTBotTest.java
index ba82f0c838..67b551116d 100644
--- a/changelog/org.eclipse.linuxtools.changelog.ui.tests/src/org/eclipse/linuxtools/changelog/ui/tests/swtbot/AddChangelogEntrySWTBotTest.java
+++ b/changelog/org.eclipse.linuxtools.changelog.ui.tests/src/org/eclipse/linuxtools/changelog/ui/tests/swtbot/AddChangelogEntrySWTBotTest.java
@@ -61,6 +61,9 @@ public class AddChangelogEntrySWTBotTest {
 		bot = new SWTWorkbenchBot();
 		try {
 			bot.viewByTitle("Welcome").close();
+			// hide Subclipse Usage stats popup if present/installed
+			bot.shell("Subclipse Usage").activate();
+			bot.button("Cancel").click();
 		} catch (WidgetNotFoundException e) {
 			// ignore
 		}
diff --git a/changelog/org.eclipse.linuxtools.changelog.ui.tests/src/org/eclipse/linuxtools/changelog/ui/tests/swtbot/CreateChangeLogFromHistorySWTBotTest.java b/changelog/org.eclipse.linuxtools.changelog.ui.tests/src/org/eclipse/linuxtools/changelog/ui/tests/swtbot/CreateChangeLogFromHistorySWTBotTest.java
index 9c84e9a9c1..231d6143a3 100644
--- a/changelog/org.eclipse.linuxtools.changelog.ui.tests/src/org/eclipse/linuxtools/changelog/ui/tests/swtbot/CreateChangeLogFromHistorySWTBotTest.java
+++ b/changelog/org.eclipse.linuxtools.changelog.ui.tests/src/org/eclipse/linuxtools/changelog/ui/tests/swtbot/CreateChangeLogFromHistorySWTBotTest.java
@@ -72,6 +72,9 @@ public class CreateChangeLogFromHistorySWTBotTest {
 		bot = new SWTWorkbenchBot();
 		try {
 			bot.viewByTitle("Welcome").close();
+			// hide Subclipse Usage stats popup if present/installed
+			bot.shell("Subclipse Usage").activate();
+			bot.button("Cancel").click();
 		} catch (WidgetNotFoundException e) {
 			// ignore
 		}
diff --git a/changelog/org.eclipse.linuxtools.changelog.ui.tests/src/org/eclipse/linuxtools/changelog/ui/tests/swtbot/DisabledPrepareChangelogSWTBotTest.java b/changelog/org.eclipse.linuxtools.changelog.ui.tests/src/org/eclipse/linuxtools/changelog/ui/tests/swtbot/DisabledPrepareChangelogSWTBotTest.java
index 972f050396..93f320fea4 100644
--- a/changelog/org.eclipse.linuxtools.changelog.ui.tests/src/org/eclipse/linuxtools/changelog/ui/tests/swtbot/DisabledPrepareChangelogSWTBotTest.java
+++ b/changelog/org.eclipse.linuxtools.changelog.ui.tests/src/org/eclipse/linuxtools/changelog/ui/tests/swtbot/DisabledPrepareChangelogSWTBotTest.java
@@ -51,6 +51,9 @@ public class DisabledPrepareChangelogSWTBotTest {
 		bot = new SWTWorkbenchBot();
 		try {
 			bot.viewByTitle("Welcome").close();
+			// hide Subclipse Usage stats popup if present/installed
+			bot.shell("Subclipse Usage").activate();
+			bot.button("Cancel").click();
 		} catch (WidgetNotFoundException e) {
 			// ignore
 		}
diff --git a/changelog/org.eclipse.linuxtools.changelog.ui.tests/src/org/eclipse/linuxtools/changelog/ui/tests/swtbot/FormatChangeLogSWTBotTest.java b/changelog/org.eclipse.linuxtools.changelog.ui.tests/src/org/eclipse/linuxtools/changelog/ui/tests/swtbot/FormatChangeLogSWTBotTest.java
index 54b44fc8dd..e97647949a 100644
--- a/changelog/org.eclipse.linuxtools.changelog.ui.tests/src/org/eclipse/linuxtools/changelog/ui/tests/swtbot/FormatChangeLogSWTBotTest.java
+++ b/changelog/org.eclipse.linuxtools.changelog.ui.tests/src/org/eclipse/linuxtools/changelog/ui/tests/swtbot/FormatChangeLogSWTBotTest.java
@@ -60,6 +60,9 @@ public class FormatChangeLogSWTBotTest {
 		bot = new SWTWorkbenchBot();
 		try {
 			bot.viewByTitle("Welcome").close();
+			// hide Subclipse Usage stats popup if present/installed
+			bot.shell("Subclipse Usage").activate();
+			bot.button("Cancel").click();
 		} catch (WidgetNotFoundException e) {
 			// ignore
 		}
diff --git a/changelog/org.eclipse.linuxtools.changelog.ui.tests/src/org/eclipse/linuxtools/changelog/ui/tests/swtbot/PrepareChangelogSWTBotTest.java b/changelog/org.eclipse.linuxtools.changelog.ui.tests/src/org/eclipse/linuxtools/changelog/ui/tests/swtbot/PrepareChangelogSWTBotTest.java
index 8d252d093f..d7ccaddd4c 100644
--- a/changelog/org.eclipse.linuxtools.changelog.ui.tests/src/org/eclipse/linuxtools/changelog/ui/tests/swtbot/PrepareChangelogSWTBotTest.java
+++ b/changelog/org.eclipse.linuxtools.changelog.ui.tests/src/org/eclipse/linuxtools/changelog/ui/tests/swtbot/PrepareChangelogSWTBotTest.java
@@ -70,6 +70,9 @@ public class PrepareChangelogSWTBotTest {
 		bot = new SWTWorkbenchBot();
 		try {
 			bot.viewByTitle("Welcome").close();
+			// hide Subclipse Usage stats popup if present/installed
+			bot.shell("Subclipse Usage").activate();
+			bot.button("Cancel").click();
 		} catch (WidgetNotFoundException e) {
 			// ignore
 		}