Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2010-04-22 17:10:31 -0400
committerStephan Herrmann2010-04-22 17:10:31 -0400
commita4413f74291be8afa762f21bcf7e055d8c3512f5 (patch)
tree0f32c501057d076c740d8f0a322fece6f018bcf5 /testplugins/org.eclipse.objectteams.otdt.ui.tests
parent1e5bddce69782b89f39e183b0770548d4a933255 (diff)
downloadorg.eclipse.objectteams-a4413f74291be8afa762f21bcf7e055d8c3512f5.tar.gz
org.eclipse.objectteams-a4413f74291be8afa762f21bcf7e055d8c3512f5.tar.xz
org.eclipse.objectteams-a4413f74291be8afa762f21bcf7e055d8c3512f5.zip
Fix CallinMarkerTest.testMarkers_4() as a witness for bug 303474:
- RoleType.getBaseClass() now supports explicit resolving relative to a value parameter, too
Diffstat (limited to 'testplugins/org.eclipse.objectteams.otdt.ui.tests')
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/callinmarker/CallinMarkerTests.java2
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests/workspace/CallinMarker/src/cycle2/A.java2
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests/workspace/CallinMarker/src/cycle2/B.java2
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.ui.tests/workspace/CallinMarker/src/cycle2/TheTest.java2
4 files changed, 4 insertions, 4 deletions
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/callinmarker/CallinMarkerTests.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/callinmarker/CallinMarkerTests.java
index 8fa197253..4aa66586d 100644
--- a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/callinmarker/CallinMarkerTests.java
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/callinmarker/CallinMarkerTests.java
@@ -334,7 +334,7 @@ public class CallinMarkerTests extends FileBasedUITest
synchronousCreateMarkers(_baseResource);
Set<String> expectedMarkers = new HashSet<String>();
- expectedMarkers.add("=CallinMarker/src<cycle{B.java[B$R[A$Q~run");
+ expectedMarkers.add("=CallinMarker/src<cycle2{B.java[B[R~run");
IMarker[] markers = getCallinMarkers(_baseResource);
assertMarkers(expectedMarkers, markers);
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests/workspace/CallinMarker/src/cycle2/A.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests/workspace/CallinMarker/src/cycle2/A.java
index 8066b2621..95e6a241e 100644
--- a/testplugins/org.eclipse.objectteams.otdt.ui.tests/workspace/CallinMarker/src/cycle2/A.java
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests/workspace/CallinMarker/src/cycle2/A.java
@@ -1,4 +1,4 @@
-package compileorder;
+package cycle2;
public team class A<B b> {
public void run() {
System.out.println("A.run()");
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests/workspace/CallinMarker/src/cycle2/B.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests/workspace/CallinMarker/src/cycle2/B.java
index fda644129..ddbfc2e5c 100644
--- a/testplugins/org.eclipse.objectteams.otdt.ui.tests/workspace/CallinMarker/src/cycle2/B.java
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests/workspace/CallinMarker/src/cycle2/B.java
@@ -1,4 +1,4 @@
-package compileorder;
+package cycle2;
public team class B {
public class R playedBy A {
void run() <- replace void run();
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests/workspace/CallinMarker/src/cycle2/TheTest.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests/workspace/CallinMarker/src/cycle2/TheTest.java
index 2ded14072..fe6710884 100644
--- a/testplugins/org.eclipse.objectteams.otdt.ui.tests/workspace/CallinMarker/src/cycle2/TheTest.java
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests/workspace/CallinMarker/src/cycle2/TheTest.java
@@ -1,4 +1,4 @@
-package compileorder;
+package cycle2;
public class TheTest {
final B b = new B();
final A a = new A<@b>();

Back to the top