[Releng] fixed testsHEADmaster

Change-Id: I0000000000000000000000000000000000000000
Signed-off-by: Leif Geiger <leif.geiger@yatta.de>

3 files changed, 11 insertions, 12 deletions

diff --git a/org.eclipse.epp.mpc.tests/src/org/eclipse/epp/mpc/tests/service/DefaultMarketplaceServiceTest.java b/org.eclipse.epp.mpc.tests/src/org/eclipse/epp/mpc/tests/service/DefaultMarketplaceServiceTest.java
index a624ec9e..664e0117 100644
--- a/org.eclipse.epp.mpc.tests/src/org/eclipse/epp/mpc/tests/service/DefaultMarketplaceServiceTest.java
+++ b/org.eclipse.epp.mpc.tests/src/org/eclipse/epp/mpc/tests/service/DefaultMarketplaceServiceTest.java
@@ -206,7 +206,7 @@ public class DefaultMarketplaceServiceTest {
 	@Test
 	@org.junit.experimental.categories.Category(RemoteTests.class)
 	public void search() throws CoreException {
-		ISearchResult result = search("Tools", "Editor", "snipmatch");
+		ISearchResult result = search("Tools", "Editor", "jaspersoft");
 		assertNotNull(result);
 		assertNotNull(result.getNodes());
 		assertEquals(Integer.valueOf(1), result.getMatchCount());
@@ -214,8 +214,8 @@ public class DefaultMarketplaceServiceTest {
 
 		INode node = result.getNodes().get(0);
 
-		assertTrue(node.getName().startsWith("Snipmatch"));
-		assertEquals("1743547", node.getId());
+		assertTrue(node.getName().startsWith("Jaspersoft"));
+		assertEquals("8068", node.getId());
 	}
 
 	@Test
@@ -379,9 +379,8 @@ public class DefaultMarketplaceServiceTest {
 
 		List<INode> result = marketplaceService.getNodes(query, new NullProgressMonitor());
 		assertEquals(query.size(), result.size());
-		for (int i = 0; i < query.size(); i++) {
-			INode queryNode = query.get(i);
-			INode resultNode = query.get(i);
+		for (INode queryNode : query) {
+			INode resultNode = queryNode;
 			if (queryNode.getId() != null) {
 				assertEquals(queryNode.getId(), resultNode.getId());
 			}
diff --git a/org.eclipse.epp.mpc.tests/src/org/eclipse/epp/mpc/tests/ui/wizard/MarketplaceClientServiceTest.java b/org.eclipse.epp.mpc.tests/src/org/eclipse/epp/mpc/tests/ui/wizard/MarketplaceClientServiceTest.java
index cd02de46..f1f36a93 100644
--- a/org.eclipse.epp.mpc.tests/src/org/eclipse/epp/mpc/tests/ui/wizard/MarketplaceClientServiceTest.java
+++ b/org.eclipse.epp.mpc.tests/src/org/eclipse/epp/mpc/tests/ui/wizard/MarketplaceClientServiceTest.java
@@ -44,7 +44,7 @@ import org.junit.experimental.categories.Category;
 @Category({ RemoteTests.class, UITests.class })
 public class MarketplaceClientServiceTest extends AbstractMarketplaceWizardBotTest {
 
-	private static final String ITEM_ID = "1743547";
+	private static final String ITEM_ID = "8068";
 
 	private Display display;
 
@@ -103,7 +103,7 @@ public class MarketplaceClientServiceTest extends AbstractMarketplaceWizardBotTe
 		final IMarket toolsMarket = QueryHelper.marketByName("Tools");
 		final ICategory mylynCategory = QueryHelper.categoryByName("Editor");
 
-		display.asyncExec(() -> service.openSearch(config, toolsMarket, mylynCategory, "snipmatch"));
+		display.asyncExec(() -> service.openSearch(config, toolsMarket, mylynCategory, "jaspersoft"));
 
 		initWizardBot();
 		checkSelectedTab("Search");
@@ -114,9 +114,9 @@ public class MarketplaceClientServiceTest extends AbstractMarketplaceWizardBotTe
 		assertEquals("Editor", categoryCombo.getText());
 
 		SWTBotText searchText = bot.text(0);
-		assertEquals("snipmatch", searchText.getText());
+		assertEquals("jaspersoft", searchText.getText());
 
-		itemBot(NodeMatcher.withNameRegex(".*Snipmatch.*"));
+		itemBot(NodeMatcher.withNameRegex(".*Jaspersoft.*"));
 
 	}
 
diff --git a/org.eclipse.epp.mpc.tests/src/org/eclipse/epp/mpc/tests/ui/wizard/MarketplaceWizardTest.java b/org.eclipse.epp.mpc.tests/src/org/eclipse/epp/mpc/tests/ui/wizard/MarketplaceWizardTest.java
index 85303443..44a6375d 100644
--- a/org.eclipse.epp.mpc.tests/src/org/eclipse/epp/mpc/tests/ui/wizard/MarketplaceWizardTest.java
+++ b/org.eclipse.epp.mpc.tests/src/org/eclipse/epp/mpc/tests/ui/wizard/MarketplaceWizardTest.java
@@ -67,8 +67,8 @@ public class MarketplaceWizardTest extends AbstractMarketplaceWizardBotTest {
 
 	@Test
 	public void testSearch() {
-		search("Snipmatch");
-		itemBot(NodeMatcher.withNameRegex(".*Snipmatch.*"));
+		search("Jaspersoft");
+		itemBot(NodeMatcher.withNameRegex(".*Jaspersoft.*"));
 	}
 
 	@Ignore //Tags are currently disabled in the REST API