From 1c7af7c3598123f7a70cc73b0e8f0bb81e0bfd58 Mon Sep 17 00:00:00 2001 From: Pawel Piech Date: Tue, 27 Jan 2009 20:31:41 +0000 Subject: [PATCH] Bug 260292 - Moved the PDA unit tests from the examples plugin and into the DSF tests plugin. --- dsf/org.eclipse.cdt.examples.dsf.pda/META-INF/MANIFEST.MF | 1 - dsf/org.eclipse.cdt.tests.dsf/META-INF/MANIFEST.MF | 3 ++- .../cdt/tests/dsf/pda/service/command/BasicTests.java | 6 +++++- .../dsf/pda/service/command/CommandControlTestsBase.java | 0 .../cdt/tests/dsf/pda/service/command/PDATestCommand.java | 0 .../cdt/tests/dsf/pda/service/command/PDATestEvent.java | 0 .../eclipse/cdt/tests/dsf/pda/service/command/Test1.java | 0 .../eclipse/cdt/tests/dsf/pda/service/command/Test10.java | 0 .../eclipse/cdt/tests/dsf/pda/service/command/Test2.java | 0 .../eclipse/cdt/tests/dsf/pda/service/command/Test3.java | 0 .../eclipse/cdt/tests/dsf/pda/service/command/Test6.java | 0 .../eclipse/cdt/tests/dsf/pda/service/command/Test8.java | 0 .../eclipse/cdt/tests/dsf/pda/service/command/Test9.java | 0 .../src/org/eclipse/cdt/tests/dsf/pda/util/Launching.java | 0 14 files changed, 7 insertions(+), 3 deletions(-) rename dsf/{org.eclipse.cdt.examples.dsf.pda => org.eclipse.cdt.tests.dsf}/src/org/eclipse/cdt/tests/dsf/pda/service/command/BasicTests.java (96%) rename dsf/{org.eclipse.cdt.examples.dsf.pda => org.eclipse.cdt.tests.dsf}/src/org/eclipse/cdt/tests/dsf/pda/service/command/CommandControlTestsBase.java (100%) rename dsf/{org.eclipse.cdt.examples.dsf.pda => org.eclipse.cdt.tests.dsf}/src/org/eclipse/cdt/tests/dsf/pda/service/command/PDATestCommand.java (100%) rename dsf/{org.eclipse.cdt.examples.dsf.pda => org.eclipse.cdt.tests.dsf}/src/org/eclipse/cdt/tests/dsf/pda/service/command/PDATestEvent.java (100%) rename dsf/{org.eclipse.cdt.examples.dsf.pda => org.eclipse.cdt.tests.dsf}/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test1.java (100%) rename dsf/{org.eclipse.cdt.examples.dsf.pda => org.eclipse.cdt.tests.dsf}/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test10.java (100%) rename dsf/{org.eclipse.cdt.examples.dsf.pda => org.eclipse.cdt.tests.dsf}/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test2.java (100%) rename dsf/{org.eclipse.cdt.examples.dsf.pda => org.eclipse.cdt.tests.dsf}/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test3.java (100%) rename dsf/{org.eclipse.cdt.examples.dsf.pda => org.eclipse.cdt.tests.dsf}/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test6.java (100%) rename dsf/{org.eclipse.cdt.examples.dsf.pda => org.eclipse.cdt.tests.dsf}/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test8.java (100%) rename dsf/{org.eclipse.cdt.examples.dsf.pda => org.eclipse.cdt.tests.dsf}/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test9.java (100%) rename dsf/{org.eclipse.cdt.examples.dsf.pda => org.eclipse.cdt.tests.dsf}/src/org/eclipse/cdt/tests/dsf/pda/util/Launching.java (100%) diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/META-INF/MANIFEST.MF b/dsf/org.eclipse.cdt.examples.dsf.pda/META-INF/MANIFEST.MF index 076c5b661d1..38cf3d91d9e 100644 --- a/dsf/org.eclipse.cdt.examples.dsf.pda/META-INF/MANIFEST.MF +++ b/dsf/org.eclipse.cdt.examples.dsf.pda/META-INF/MANIFEST.MF @@ -9,7 +9,6 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.variables, org.eclipse.debug.core, org.eclipse.cdt.dsf, - org.junit4;bundle-version="4.3.1", org.eclipse.cdt.core;bundle-version="5.0.0" Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.cdt.examples.dsf.pda, diff --git a/dsf/org.eclipse.cdt.tests.dsf/META-INF/MANIFEST.MF b/dsf/org.eclipse.cdt.tests.dsf/META-INF/MANIFEST.MF index bbf5a59a186..e8dd36596b7 100644 --- a/dsf/org.eclipse.cdt.tests.dsf/META-INF/MANIFEST.MF +++ b/dsf/org.eclipse.cdt.tests.dsf/META-INF/MANIFEST.MF @@ -13,5 +13,6 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.cdt.dsf, org.junit4, org.eclipse.ui, - org.eclipse.cdt.dsf.ui + org.eclipse.cdt.dsf.ui, + org.eclipse.cdt.examples.dsf.pda;bundle-version="2.0.0" Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/tests/dsf/pda/service/command/BasicTests.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/BasicTests.java similarity index 96% rename from dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/tests/dsf/pda/service/command/BasicTests.java rename to dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/BasicTests.java index 51557bbe9e5..f0391cf2789 100644 --- a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/tests/dsf/pda/service/command/BasicTests.java +++ b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/BasicTests.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.tests.dsf.pda.service.command; +import java.io.File; import java.util.LinkedList; import java.util.List; import java.util.concurrent.ExecutionException; @@ -23,8 +24,10 @@ import org.eclipse.cdt.dsf.debug.service.command.ICommand; import org.eclipse.cdt.dsf.debug.service.command.ICommandListener; import org.eclipse.cdt.dsf.debug.service.command.ICommandResult; import org.eclipse.cdt.dsf.debug.service.command.ICommandToken; +import org.eclipse.cdt.examples.dsf.pda.PDAPlugin; import org.eclipse.cdt.examples.dsf.pda.service.commands.PDACommandResult; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.Path; import org.junit.BeforeClass; import org.junit.Test; @@ -35,7 +38,8 @@ public class BasicTests extends CommandControlTestsBase { @BeforeClass public static void setProgram() { - fProgram = "samples/example.pda"; + File programFile = PDAPlugin.getFileInPlugin(new Path("samples/example.pda")); + fProgram = programFile.getPath(); } @Test diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/tests/dsf/pda/service/command/CommandControlTestsBase.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/CommandControlTestsBase.java similarity index 100% rename from dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/tests/dsf/pda/service/command/CommandControlTestsBase.java rename to dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/CommandControlTestsBase.java diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/tests/dsf/pda/service/command/PDATestCommand.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/PDATestCommand.java similarity index 100% rename from dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/tests/dsf/pda/service/command/PDATestCommand.java rename to dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/PDATestCommand.java diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/tests/dsf/pda/service/command/PDATestEvent.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/PDATestEvent.java similarity index 100% rename from dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/tests/dsf/pda/service/command/PDATestEvent.java rename to dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/PDATestEvent.java diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test1.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test1.java similarity index 100% rename from dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test1.java rename to dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test1.java diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test10.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test10.java similarity index 100% rename from dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test10.java rename to dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test10.java diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test2.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test2.java similarity index 100% rename from dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test2.java rename to dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test2.java diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test3.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test3.java similarity index 100% rename from dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test3.java rename to dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test3.java diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test6.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test6.java similarity index 100% rename from dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test6.java rename to dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test6.java diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test8.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test8.java similarity index 100% rename from dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test8.java rename to dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test8.java diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test9.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test9.java similarity index 100% rename from dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test9.java rename to dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/service/command/Test9.java diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/tests/dsf/pda/util/Launching.java b/dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/util/Launching.java similarity index 100% rename from dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/tests/dsf/pda/util/Launching.java rename to dsf/org.eclipse.cdt.tests.dsf/src/org/eclipse/cdt/tests/dsf/pda/util/Launching.java