diff --git a/site/category.xml b/site/category.xml index 1568307151..01f733efa6 100644 --- a/site/category.xml +++ b/site/category.xml @@ -113,8 +113,8 @@ - - + + diff --git a/tests/org.eclipse.reddeer.eclipse.test/pom.xml b/tests/org.eclipse.reddeer.eclipse.test/pom.xml index 1f0100cf77..6f7fe0ccd4 100755 --- a/tests/org.eclipse.reddeer.eclipse.test/pom.xml +++ b/tests/org.eclipse.reddeer.eclipse.test/pom.xml @@ -178,12 +178,12 @@ datatools p2 - http://download.eclipse.org/datatools/updates/1.14.100-SNAPSHOT/repository + https://download.eclipse.org/datatools/updates/1.14.100-SNAPSHOT/repository rse p2 - http://download.eclipse.org/tm/updates/3.7.100-SNAPSHOT/repository/ + https://download.eclipse.org/tm/updates/3.7.100-SNAPSHOT/repository/ diff --git a/tests/org.eclipse.reddeer.eclipse.test/src/org/eclipse/reddeer/eclipse/test/condition/ConsoleHasLabelTest.java b/tests/org.eclipse.reddeer.eclipse.test/src/org/eclipse/reddeer/eclipse/test/condition/ConsoleHasLabelTest.java new file mode 100644 index 0000000000..782f43c0eb --- /dev/null +++ b/tests/org.eclipse.reddeer.eclipse.test/src/org/eclipse/reddeer/eclipse/test/condition/ConsoleHasLabelTest.java @@ -0,0 +1,41 @@ +package org.eclipse.reddeer.eclipse.test.condition; + +import org.eclipse.reddeer.common.wait.WaitUntil; +import org.eclipse.reddeer.eclipse.condition.ConsoleHasLabel; +import org.eclipse.reddeer.eclipse.ui.console.ConsoleView; +import org.eclipse.reddeer.junit.runner.RedDeerSuite; +import org.eclipse.reddeer.swt.impl.menu.ToolItemMenuItem; +import org.eclipse.reddeer.swt.impl.toolbar.DefaultToolItem; +import org.hamcrest.Matcher; +import org.hamcrest.core.StringEndsWith; +import org.junit.Test; +import org.junit.runner.RunWith; + +@RunWith(RedDeerSuite.class) +public class ConsoleHasLabelTest { + + @Test + public void testReinitiatingCondition() { + Matcher textMatcher = StringEndsWith.endsWith("Java Stack Trace Console"); + + Matcher textMatcher2 = StringEndsWith.endsWith("CVS"); + + + ConsoleHasLabel condition = new ConsoleHasLabel(textMatcher); + // First run + ConsoleView console1 = new ConsoleView(); + console1.open(); + var menu = new ToolItemMenuItem(new DefaultToolItem(console1.getCTabItem().getFolder(), "Open Console"), textMatcher); + menu.select(); + new WaitUntil(condition); + console1.close(); + + // Second run + ConsoleView console2 = new ConsoleView(); + console2.open(); + var menu2 = new ToolItemMenuItem(new DefaultToolItem(console2.getCTabItem().getFolder(), "Open Console"), textMatcher2); + menu2.select(); + new WaitUntil(new ConsoleHasLabel(textMatcher2)); // Will fail because ConsoleHasLabel still refers to console1 + } + +} diff --git a/tests/org.eclipse.reddeer.gef.test/pom.xml b/tests/org.eclipse.reddeer.gef.test/pom.xml index ca60a3020e..a60f828b22 100755 --- a/tests/org.eclipse.reddeer.gef.test/pom.xml +++ b/tests/org.eclipse.reddeer.gef.test/pom.xml @@ -26,7 +26,7 @@ gef-legacy-examples - http://download.eclipse.org/tools/gef/updates/legacy/releases/ + https://download.eclipse.org/tools/gef/updates/legacy/releases/ p2