From 6141cbb61dacead7bbec1066c6e4038bb4621e8b Mon Sep 17 00:00:00 2001 From: Vivian Kong Date: Fri, 2 Nov 2007 15:22:48 +0000 Subject: [PATCH] Bug 208102 - failures in MBS UI tests, updated Sets to Lists in the JUnit test case --- .../ui/tests/TestCustomPageManager.java | 22 +++++++++---------- .../ui/wizards/MBSCustomPageManager.java | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/TestCustomPageManager.java b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/TestCustomPageManager.java index 2461f28be92..55eeb2b92a3 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/TestCustomPageManager.java +++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/TestCustomPageManager.java @@ -12,8 +12,8 @@ package org.eclipse.cdt.managedbuilder.ui.tests; -import java.util.LinkedHashSet; -import java.util.Set; +import java.util.ArrayList; +import java.util.List; import junit.framework.Test; import junit.framework.TestCase; @@ -69,7 +69,7 @@ public class TestCustomPageManager extends TestCase MBSCustomPageManager.addPageProperty(MBSCustomPageManager.PAGE_ID, MBSCustomPageManager.PROJECT_TYPE, "X"); // set the toolchain to "Y" - Set toolchainSet = new LinkedHashSet(); + List toolchainSet = new ArrayList(); TestToolchain toolchain = new TestToolchain(); toolchain.setID("Y"); toolchainSet.add(toolchain); @@ -145,7 +145,7 @@ public class TestCustomPageManager extends TestCase MBSCustomPageManager.addPageProperty(MBSCustomPageManager.PAGE_ID, MBSCustomPageManager.PROJECT_TYPE, "X"); // set the toolchain to "Y" - Set toolchainSet = new LinkedHashSet(); + List toolchainSet = new ArrayList(); TestToolchain toolchain = new TestToolchain(); toolchain.setID("Y"); toolchainSet.add(toolchain); @@ -232,7 +232,7 @@ public class TestCustomPageManager extends TestCase MBSCustomPageManager.addPageProperty(MBSCustomPageManager.PAGE_ID, MBSCustomPageManager.PROJECT_TYPE, "X"); // set the toolchain to "Y" - Set toolchainSet = new LinkedHashSet(); + List toolchainSet = new ArrayList(); TestToolchain toolchain = new TestToolchain(); toolchain.setID("Y"); toolchainSet.add(toolchain); @@ -319,7 +319,7 @@ public class TestCustomPageManager extends TestCase MBSCustomPageManager.addPageProperty(MBSCustomPageManager.PAGE_ID, MBSCustomPageManager.PROJECT_TYPE, "X"); // set the toolchain to "C" - Set toolchainSet = new LinkedHashSet(); + List toolchainSet = new ArrayList(); TestToolchain toolchain = new TestToolchain(); toolchain.setID("C"); toolchainSet.add(toolchain); @@ -407,7 +407,7 @@ public class TestCustomPageManager extends TestCase MBSCustomPageManager.addPageProperty(MBSCustomPageManager.PAGE_ID, MBSCustomPageManager.PROJECT_TYPE, "X"); // set the toolchain to "C" - Set toolchainSet = new LinkedHashSet(); + List toolchainSet = new ArrayList(); TestToolchain toolchain = new TestToolchain(); toolchain.setID("C_2.0.0"); toolchainSet.add(toolchain); @@ -509,7 +509,7 @@ public class TestCustomPageManager extends TestCase MBSCustomPageManager.addPageProperty(MBSCustomPageManager.PAGE_ID, MBSCustomPageManager.PROJECT_TYPE, "D"); // set the toolchain to "Y" - Set toolchainSet = new LinkedHashSet(); + List toolchainSet = new ArrayList(); TestToolchain toolchain = new TestToolchain(); toolchain.setID("Y"); toolchainSet.add(toolchain); @@ -599,7 +599,7 @@ public class TestCustomPageManager extends TestCase MBSCustomPageManager.addPageProperty(MBSCustomPageManager.PAGE_ID, MBSCustomPageManager.PROJECT_TYPE, "E"); // set the toolchain to "Y" - Set toolchainSet = new LinkedHashSet(); + List toolchainSet = new ArrayList(); TestToolchain toolchain = new TestToolchain(); toolchain.setID("Y"); toolchainSet.add(toolchain); @@ -687,7 +687,7 @@ public class TestCustomPageManager extends TestCase MBSCustomPageManager.addPageProperty(MBSCustomPageManager.PAGE_ID, MBSCustomPageManager.PROJECT_TYPE, "X"); // set the toolchain to "F" - Set toolchainSet = new LinkedHashSet(); + List toolchainSet = new ArrayList(); TestToolchain toolchain = new TestToolchain(); toolchain.setID("F"); toolchainSet.add(toolchain); @@ -775,7 +775,7 @@ public class TestCustomPageManager extends TestCase MBSCustomPageManager.addPageProperty(MBSCustomPageManager.PAGE_ID, MBSCustomPageManager.PROJECT_TYPE, "D"); // set the toolchain to "C" - Set toolchainSet = new LinkedHashSet(); + List toolchainSet = new ArrayList(); TestToolchain toolchain = new TestToolchain(); toolchain.setID("C"); toolchainSet.add(toolchain); diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSCustomPageManager.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSCustomPageManager.java index 055fbc9d01c..dee46c43a37 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSCustomPageManager.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/MBSCustomPageManager.java @@ -345,7 +345,7 @@ public final class MBSCustomPageManager Map pagePropertiesMap = (Map) pageIDtoPagePropertiesMap.get(PAGE_ID); Object projectType = pagePropertiesMap.get(PROJECT_TYPE); - Set toolchainList = (Set) pagePropertiesMap.get(TOOLCHAIN); + List toolchainList = (List) pagePropertiesMap.get(TOOLCHAIN); Object nature = pagePropertiesMap.get(NATURE); // does the page follow nature and project type constraints?