diff options
Diffstat (limited to 'tests')
4 files changed, 141 insertions, 130 deletions
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/TextMergeViewerTest.java b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/TextMergeViewerTest.java index 7097ae60c..9cd4cfd39 100644 --- a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/TextMergeViewerTest.java +++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/TextMergeViewerTest.java @@ -421,21 +421,21 @@ public class TextMergeViewerTest extends TestCase { Object otherContributor = lineComparison .get(OTHER_CONTRIBUTOR); - if (thisContributor.equals(new Character('L'))) { + if (thisContributor.equals(Character.valueOf('L'))) { assertEquals(thisLine, leftString); assertEquals(otherContributor, new Character( 'R')); assertEquals(otherLine, rightString); } else { assertEquals(thisContributor, - new Character('R')); + Character.valueOf('R')); assertEquals(thisLine, rightString); assertEquals(otherContributor, new Character( 'L')); assertEquals(otherLine, leftString); } - if (thisContributor.equals(new Character('L'))) + if (thisContributor.equals(Character.valueOf('L'))) return new IRegion[] { new Region(0, 1), new Region(1, 1) }; diff --git a/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/Performance - All Tests.launch b/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/Performance - All Tests.launch index c37a0184f..ac89dc257 100644 --- a/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/Performance - All Tests.launch +++ b/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/Performance - All Tests.launch @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> <booleanAttribute key="askclear" value="false"/> <booleanAttribute key="automaticAdd" value="true"/> @@ -25,6 +25,8 @@ <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.junit3"/> +<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.team.tests.ccvs.ui.benchmark.AllBenchmarkTests"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os win32 -ws win32 -arch x86 -nl en_US -clean"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.team.tests.cvs.core"/> @@ -32,7 +34,10 @@ <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.cvs.properties=c:\eclipse\repository.properties -DInternalPrintPerformanceResults -Declipse.cvs.recordProtocolTraffic=false"/> <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="org.eclipse.platform.ide"/> +<booleanAttribute key="run_in_ui_thread" value="true"/> +<booleanAttribute key="show_selected_only" value="false"/> <booleanAttribute key="tracing" value="false"/> +<booleanAttribute key="useCustomFeatures" value="false"/> <booleanAttribute key="useDefaultConfig" value="true"/> <booleanAttribute key="useDefaultConfigArea" value="true"/> <booleanAttribute key="useProduct" value="false"/> diff --git a/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/Test using Ant application.launch b/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/Test using Ant application.launch index c60a86259..697068a4d 100644 --- a/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/Test using Ant application.launch +++ b/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/Test using Ant application.launch @@ -1,151 +1,157 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench"> -<stringAttribute key="product" value="org.eclipse.platform.ide"/> -<booleanAttribute key="usefeatures" value="false"/> +<stringAttribute key="application" value="org.eclipse.ant.core.antRunner"/> +<booleanAttribute key="askclear" value="true"/> +<booleanAttribute key="automaticAdd" value="true"/> +<booleanAttribute key="automaticValidate" value="false"/> <stringAttribute key="bootstrap" value=""/> -<booleanAttribute key="useProduct" value="false"/> -<booleanAttribute key="tracing" value="false"/> -<stringAttribute key="vminstall" value="ibm1.4.2"/> +<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/Test using Ant application"/> +<booleanAttribute key="default" value="true"/> +<booleanAttribute key="includeOptional" value="true"/> +<stringAttribute key="location" value="C:\eclipse\test-workspace"/> +<stringAttribute key="location1" value="C:\eclipse\test-workspace"/> <stringAttribute key="location2" value="D:\dev\test-workspace-3"/> -<booleanAttribute key="automaticValidate" value="false"/> +<stringAttribute key="location3" value="D:\dev\test-workspace-2"/> +<stringAttribute key="location4" value="D:\dev\runtime-workspace"/> +<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> +<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.debug.ui.javaSourceLocator"/> +<stringAttribute key="org.eclipse.debug.ui.target_debug_perspective" value="perspective_default"/> +<stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_default"/> +<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os win32 -ws win32 -arch x86 -nl en_US -className org.eclipse.team.tests.ccvs.core.provider.AllTestProvider -testPluginName org.eclipse.team.tests.cvs.core -noupdate formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,cvstest.xml"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.cvs.propertiesC:\eclipse\repository.properties"/> +<stringAttribute key="pde.version" value="3.3"/> +<stringAttribute key="product" value="org.eclipse.platform.ide"/> +<booleanAttribute key="showSplash" value="true"/> +<booleanAttribute key="show_selected_only" value="false"/> +<booleanAttribute key="tracing" value="false"/> <mapAttribute key="tracingOptions"> +<mapEntry key="org.eclipse.ant.core/buildfile/timing" value="false"/> +<mapEntry key="org.eclipse.ant.core/debug" value="true"/> +<mapEntry key="org.eclipse.core.boot/monitor/bundles" value="false"/> <mapEntry key="org.eclipse.core.boot/monitor/classes" value="false"/> -<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/> -<mapEntry key="org.eclipse.core.boot/trace/filters" value="trace.properties"/> -<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/> -<mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/> -<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/> -<mapEntry key="org.eclipse.core.resources/save/snapshots" value="false"/> -<mapEntry key="org.eclipse.help/debug/context" value="false"/> -<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/loader" value="*"/> -<mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/> -<mapEntry key="org.eclipse.core.runtime/loader/debug/actions" value="false"/> -<mapEntry key="org.eclipse.core.runtime/timing/shutdown" value="false"/> -<mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/> -<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/> -<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/resource" value="*"/> -<mapEntry key="org.eclipse.team.ftp/debug" value="false"/> -<mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/> +<mapEntry key="org.eclipse.core.boot/monitor/plugins" value="false"/> +<mapEntry key="org.eclipse.core.boot/trace/classLoading" value="false"/> <mapEntry key="org.eclipse.core.boot/trace/filename" value="runtime.traces"/> +<mapEntry key="org.eclipse.core.boot/trace/filters" value="trace.properties"/> +<mapEntry key="org.eclipse.core.boot/trace/pluginActivation" value="false"/> +<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/> +<mapEntry key="org.eclipse.core.resources/build/failure" value="false"/> +<mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/> <mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/> -<mapEntry key="org.eclipse.team.ftp/list" value="true"/> -<mapEntry key="org.eclipse.core.runtime/loader/debug/activateplugin" value="false"/> -<mapEntry key="org.eclipse.ui/trace/graphics" value="false"/> +<mapEntry key="org.eclipse.core.resources/debug" value="false"/> +<mapEntry key="org.eclipse.core.resources/history" value="false"/> <mapEntry key="org.eclipse.core.resources/monitor/builders" value="false"/> -<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/> -<mapEntry key="org.eclipse.help/debug/search" value="false"/> -<mapEntry key="org.eclipse.core.runtime/registry/debug" value="false"/> -<mapEntry key="org.eclipse.team.ftp/requests" value="true"/> -<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/> -<mapEntry key="org.eclipse.core.runtime/loader/debug" value="false"/> -<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/> -<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/> -<mapEntry key="org.eclipse.ui/trace/workbench.restore" value="false"/> <mapEntry key="org.eclipse.core.resources/monitor/listeners" value="false"/> -<mapEntry key="org.eclipse.ui/trace/part.create" value="false"/> -<mapEntry key="org.eclipse.ant.core/debug" value="true"/> -<mapEntry key="org.eclipse.help/debug/protocols" value="false"/> -<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes" value="false"/> -<mapEntry key="org.eclipse.core.boot/trace/pluginActivation" value="false"/> -<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/> <mapEntry key="org.eclipse.core.resources/natures" value="false"/> -<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/> +<mapEntry key="org.eclipse.core.resources/restore" value="false"/> +<mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/> +<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/> +<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/> +<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/> +<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/> +<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/> +<mapEntry key="org.eclipse.core.resources/save" value="false"/> +<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/> +<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/> +<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/> +<mapEntry key="org.eclipse.core.resources/save/snapshots" value="false"/> +<mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/> +<mapEntry key="org.eclipse.core.resources/save/tree" value="false"/> +<mapEntry key="org.eclipse.core.runtime/config/debug" value="false"/> +<mapEntry key="org.eclipse.core.runtime/debug" value="false"/> +<mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/> +<mapEntry key="org.eclipse.core.runtime/loader/debug" value="false"/> +<mapEntry key="org.eclipse.core.runtime/loader/debug/actions" value="false"/> +<mapEntry key="org.eclipse.core.runtime/loader/debug/activateplugin" value="false"/> +<mapEntry key="org.eclipse.core.runtime/loader/debug/create" value="false"/> +<mapEntry key="org.eclipse.core.runtime/loader/debug/failure" value="false"/> +<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/class" value="*"/> +<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/loader" value="*"/> <mapEntry key="org.eclipse.core.runtime/loader/debug/filter/native" value="*"/> -<mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/> -<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/> +<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/resource" value="*"/> +<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes" value="false"/> +<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes/failure" value="false"/> +<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes/success" value="false"/> <mapEntry key="org.eclipse.core.runtime/loader/debug/properties" value="false"/> +<mapEntry key="org.eclipse.core.runtime/loader/debug/success" value="false"/> +<mapEntry key="org.eclipse.core.runtime/preferences/debug" value="false"/> +<mapEntry key="org.eclipse.core.runtime/registry/debug" value="false"/> +<mapEntry key="org.eclipse.core.runtime/registry/debug/dump" value=""/> +<mapEntry key="org.eclipse.core.runtime/registry/debug/resolve" value="false"/> +<mapEntry key="org.eclipse.core.runtime/timing/shutdown" value="false"/> +<mapEntry key="org.eclipse.core.runtime/timing/startup" value="false"/> +<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/> <mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/> -<mapEntry key="org.eclipse.core.runtime/loader/debug/create" value="false"/> -<mapEntry key="org.eclipse.update.core/debug" value="true"/> -<mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/> -<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/> +<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/> +<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/> +<mapEntry key="org.eclipse.debug.core/debug" value="true"/> +<mapEntry key="org.eclipse.debug.ui/debug" value="true"/> +<mapEntry key="org.eclipse.help.ui/debug" value="true"/> <mapEntry key="org.eclipse.help.ui/debug/ieadapter" value="false"/> -<mapEntry key="org.eclipse.team.core/debug" value="false"/> -<mapEntry key="org.eclipse.team.ftp/responses" value="true"/> -<mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/> -<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes/success" value="false"/> -<mapEntry key="org.eclipse.team.core/streams" value="false"/> -<mapEntry key="org.eclipse.core.boot/trace/classLoading" value="false"/> -<mapEntry key="org.eclipse.core.boot/monitor/plugins" value="false"/> -<mapEntry key="org.eclipse.ui/trace/workbench.start" value="false"/> -<mapEntry key="org.eclipse.core.runtime/registry/debug/dump" value=""/> +<mapEntry key="org.eclipse.help.ui/debug/ieadapter/inprocess" value="false"/> +<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/> +<mapEntry key="org.eclipse.help/debug" value="true"/> +<mapEntry key="org.eclipse.help/debug/context" value="false"/> +<mapEntry key="org.eclipse.help/debug/protocols" value="false"/> +<mapEntry key="org.eclipse.help/debug/search" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug" value="true"/> -<mapEntry key="org.eclipse.core.resources/restore" value="false"/> -<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/web" value="false"/> -<mapEntry key="org.eclipse.core.runtime/timing/startup" value="false"/> -<mapEntry key="org.eclipse.core.runtime/registry/debug/resolve" value="false"/> -<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/> -<mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/> -<mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/> -<mapEntry key="org.eclipse.core.runtime/loader/debug/failure" value="false"/> -<mapEntry key="org.eclipse.core.boot/monitor/bundles" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/type" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/> -<mapEntry key="org.eclipse.jdt.core/debug/sharedworkingcopy" value="false"/> -<mapEntry key="org.eclipse.core.resources/history" value="false"/> -<mapEntry key="org.eclipse.ant.core/buildfile/timing" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/> -<mapEntry key="org.eclipse.jdt.debug.ui/debug" value="true"/> -<mapEntry key="org.eclipse.debug.core/debug" value="true"/> -<mapEntry key="org.eclipse.help/debug" value="true"/> -<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/> -<mapEntry key="org.eclipse.ui/trace/perspective" value="false"/> -<mapEntry key="org.eclipse.ui/debug" value="true"/> -<mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/> -<mapEntry key="org.eclipse.ui/trace/part.activate" value="false"/> -<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/> -<mapEntry key="org.eclipse.help.ui/debug/ieadapter/inprocess" value="false"/> -<mapEntry key="org.eclipse.core.resources/build/failure" value="false"/> -<mapEntry key="org.eclipse.jface/trace/actions" value="false"/> -<mapEntry key="org.eclipse.core.resources/save/tree" value="false"/> -<mapEntry key="org.eclipse.core.runtime/config/debug" value="false"/> -<mapEntry key="org.eclipse.help.ui/debug" value="true"/> -<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/> -<mapEntry key="org.eclipse.debug.ui/debug" value="true"/> -<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/> <mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/sharedworkingcopy" value="false"/> +<mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/> +<mapEntry key="org.eclipse.jdt.debug.ui/debug" value="true"/> <mapEntry key="org.eclipse.jdt.debug/debug" value="true"/> +<mapEntry key="org.eclipse.jface/trace/actions" value="false"/> +<mapEntry key="org.eclipse.team.core/debug" value="false"/> +<mapEntry key="org.eclipse.team.core/streams" value="false"/> +<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/> <mapEntry key="org.eclipse.team.cvs.core/debug" value="true"/> -<mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/> -<mapEntry key="org.eclipse.core.runtime/debug" value="false"/> +<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/> +<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/> <mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/> -<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/> -<mapEntry key="org.eclipse.ui/trace/part.listeners" value="false"/> -<mapEntry key="org.eclipse.core.resources/save" value="false"/> -<mapEntry key="org.eclipse.core.runtime/loader/debug/success" value="false"/> -<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/> +<mapEntry key="org.eclipse.team.ftp/debug" value="false"/> +<mapEntry key="org.eclipse.team.ftp/list" value="true"/> +<mapEntry key="org.eclipse.team.ftp/requests" value="true"/> +<mapEntry key="org.eclipse.team.ftp/responses" value="true"/> +<mapEntry key="org.eclipse.ui/debug" value="true"/> <mapEntry key="org.eclipse.ui/debug/internalerror/openDialog" value="false"/> +<mapEntry key="org.eclipse.ui/trace/graphics" value="false"/> +<mapEntry key="org.eclipse.ui/trace/part.activate" value="false"/> +<mapEntry key="org.eclipse.ui/trace/part.create" value="false"/> +<mapEntry key="org.eclipse.ui/trace/part.listeners" value="false"/> +<mapEntry key="org.eclipse.ui/trace/perspective" value="false"/> +<mapEntry key="org.eclipse.ui/trace/workbench.restore" value="false"/> +<mapEntry key="org.eclipse.ui/trace/workbench.start" value="false"/> +<mapEntry key="org.eclipse.update.core/debug" value="true"/> +<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/> <mapEntry key="org.eclipse.update.core/debug/install" value="false"/> -<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/class" value="*"/> -<mapEntry key="org.eclipse.core.resources/debug" value="false"/> -<mapEntry key="org.eclipse.core.runtime/preferences/debug" value="false"/> +<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/> <mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/> -<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes/failure" value="false"/> +<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/> +<mapEntry key="org.eclipse.update.core/debug/type" value="false"/> +<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/> +<mapEntry key="org.eclipse.update.core/debug/web" value="false"/> </mapAttribute> -<stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_default"/> -<stringAttribute key="location3" value="D:\dev\test-workspace-2"/> -<booleanAttribute key="automaticAdd" value="true"/> -<booleanAttribute key="showSplash" value="true"/> -<stringAttribute key="location" value="${workspace_loc}/../runtime-TestusingAntapplication"/> -<stringAttribute key="location4" value="D:\dev\runtime-workspace"/> -<stringAttribute key="configLocation" value=""/> -<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.debug.ui.javaSourceLocator"/> -<stringAttribute key="application" value="org.eclipse.ant.core.antRunner"/> -<booleanAttribute key="clearws" value="true"/> -<stringAttribute key="location1" value="C:\eclipse\test-workspace"/> -<stringAttribute key="vmargs" value="-Declipse.cvs.propertiesC:\eclipse\repository.properties"/> -<booleanAttribute key="default" value="true"/> -<booleanAttribute key="clearConfig" value="true"/> -<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> -<booleanAttribute key="useDefaultConfigArea" value="true"/> -<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> -<stringAttribute key="progargs" value="-os win32 -ws win32 -arch x86 -nl en_US -className org.eclipse.team.tests.ccvs.core.provider.AllTestProvider -testPluginName org.eclipse.team.tests.cvs.core -noupdate formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,cvstest.xml"/> +<booleanAttribute key="useCustomFeatures" value="false"/> <booleanAttribute key="useDefaultConfig" value="true"/> -<booleanAttribute key="askclear" value="true"/> -<stringAttribute key="org.eclipse.debug.ui.target_debug_perspective" value="perspective_default"/> -<booleanAttribute key="includeOptional" value="true"/> -<stringAttribute key="location0" value="C:\eclipse\test-workspace"/> +<booleanAttribute key="useDefaultConfigArea" value="true"/> +<booleanAttribute key="useProduct" value="false"/> +<booleanAttribute key="usefeatures" value="false"/> +<stringAttribute key="vminstall" value="ibm1.4.2"/> </launchConfiguration> diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/PatchWizardRadioButtonGroupTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/PatchWizardRadioButtonGroupTests.java index ebd5b2b04..f79cbcf33 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/PatchWizardRadioButtonGroupTests.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/PatchWizardRadioButtonGroupTests.java @@ -272,7 +272,7 @@ public class PatchWizardRadioButtonGroupTests extends TestCase { Method method = clazz.getMethod("add", partypes); method.setAccessible(true); Object arglist[] = new Object[2]; - arglist[0] = new Integer(buttonCode); + arglist[0] = Integer.valueOf(buttonCode); arglist[1] = button; method.invoke(groupObject, arglist); } catch (SecurityException e) { @@ -344,7 +344,7 @@ public class PatchWizardRadioButtonGroupTests extends TestCase { Object arglist[] = new Object[3]; arglist[0] = Boolean.valueOf(enabled); arglist[1] = buttonsToChange; - arglist[2] = new Integer(defaultSelection); + arglist[2] = Integer.valueOf(defaultSelection); method.invoke(groupObject, arglist); } catch (SecurityException e) { fail(e.getMessage()); |