From 36c61fae16e10e8adb64f686eafa729ea1cae685 Mon Sep 17 00:00:00 2001 From: slewis Date: Wed, 30 Apr 2008 05:07:04 +0000 Subject: Execution environment fixes for test plugins as per bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=229545 --- tests/bundles/org.eclipse.ecf.tests.presence/.classpath | 4 ++-- .../.settings/org.eclipse.jdt.core.prefs | 8 ++++---- .../org.eclipse.ecf.tests.presence/META-INF/MANIFEST.MF | 3 ++- .../ecf/tests/presence/AbstractChatRoomInvitationTest.java | 2 +- .../src/org/eclipse/ecf/tests/presence/AbstractChatTest.java | 10 +++++----- 5 files changed, 14 insertions(+), 13 deletions(-) (limited to 'tests') diff --git a/tests/bundles/org.eclipse.ecf.tests.presence/.classpath b/tests/bundles/org.eclipse.ecf.tests.presence/.classpath index 304e86186..c2ce266a6 100755 --- a/tests/bundles/org.eclipse.ecf.tests.presence/.classpath +++ b/tests/bundles/org.eclipse.ecf.tests.presence/.classpath @@ -1,7 +1,7 @@ - - + + diff --git a/tests/bundles/org.eclipse.ecf.tests.presence/.settings/org.eclipse.jdt.core.prefs b/tests/bundles/org.eclipse.ecf.tests.presence/.settings/org.eclipse.jdt.core.prefs index 751b4438a..7f51fa465 100755 --- a/tests/bundles/org.eclipse.ecf.tests.presence/.settings/org.eclipse.jdt.core.prefs +++ b/tests/bundles/org.eclipse.ecf.tests.presence/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,7 @@ -#Sun Apr 06 12:30:42 PDT 2008 +#Tue Apr 29 21:47:42 PDT 2008 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.1 +org.eclipse.jdt.core.compiler.compliance=1.3 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore @@ -57,4 +57,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.3 diff --git a/tests/bundles/org.eclipse.ecf.tests.presence/META-INF/MANIFEST.MF b/tests/bundles/org.eclipse.ecf.tests.presence/META-INF/MANIFEST.MF index 50e1127f2..d369e35fe 100755 --- a/tests/bundles/org.eclipse.ecf.tests.presence/META-INF/MANIFEST.MF +++ b/tests/bundles/org.eclipse.ecf.tests.presence/META-INF/MANIFEST.MF @@ -16,4 +16,5 @@ Eclipse-LazyStart: true Export-Package: org.eclipse.ecf.tests.presence, org.eclipse.ecf.tests.presence.sharedobject Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0, + J2SE-1.3 diff --git a/tests/bundles/org.eclipse.ecf.tests.presence/src/org/eclipse/ecf/tests/presence/AbstractChatRoomInvitationTest.java b/tests/bundles/org.eclipse.ecf.tests.presence/src/org/eclipse/ecf/tests/presence/AbstractChatRoomInvitationTest.java index 065b2c2e2..7731edb58 100755 --- a/tests/bundles/org.eclipse.ecf.tests.presence/src/org/eclipse/ecf/tests/presence/AbstractChatRoomInvitationTest.java +++ b/tests/bundles/org.eclipse.ecf.tests.presence/src/org/eclipse/ecf/tests/presence/AbstractChatRoomInvitationTest.java @@ -30,7 +30,7 @@ public abstract class AbstractChatRoomInvitationTest extends AbstractPresenceTes public static final int WAITTIME = 20000; public static final String CHAT_ROOM_NAME = System.getProperty("chat.room.name"); - List invitationsReceived = new ArrayList(); + List invitationsReceived = new ArrayList(); Object synchObject = new Object(); diff --git a/tests/bundles/org.eclipse.ecf.tests.presence/src/org/eclipse/ecf/tests/presence/AbstractChatTest.java b/tests/bundles/org.eclipse.ecf.tests.presence/src/org/eclipse/ecf/tests/presence/AbstractChatTest.java index f3afc493f..8e462d742 100755 --- a/tests/bundles/org.eclipse.ecf.tests.presence/src/org/eclipse/ecf/tests/presence/AbstractChatTest.java +++ b/tests/bundles/org.eclipse.ecf.tests.presence/src/org/eclipse/ecf/tests/presence/AbstractChatTest.java @@ -32,12 +32,12 @@ public abstract class AbstractChatTest extends AbstractPresenceTestCase { IChatManager chat0, chat1 = null; public static final int WAITTIME = 3000; - List receivedChatMessages = new ArrayList(); + List receivedChatMessages = new ArrayList(); IIMMessageListener listener = new IIMMessageListener() { public void handleMessageEvent(IIMMessageEvent messageEvent) { if (messageEvent instanceof IChatMessageEvent) { - IChatMessage chatmessage = ((IChatMessageEvent) messageEvent).getChatMessage(); + final IChatMessage chatmessage = ((IChatMessageEvent) messageEvent).getChatMessage(); System.out.println("received chat message=" + chatmessage); receivedChatMessages.add(chatmessage); } @@ -74,7 +74,7 @@ public abstract class AbstractChatTest extends AbstractPresenceTestCase { chat0.getChatMessageSender().sendChatMessage(getServerConnectID(1), "abcdef"); sleep(WAITTIME); assertHasEvent(receivedChatMessages, IChatMessage.class); - final IChatMessage message = receivedChatMessages.get(0); + final IChatMessage message = (IChatMessage) receivedChatMessages.get(0); assertTrue(message.getBody().equals("abcdef")); assertTrue(message.getType().equals(IChatMessage.Type.CHAT)); final ID fromID = message.getFromID(); @@ -94,7 +94,7 @@ public abstract class AbstractChatTest extends AbstractPresenceTestCase { sleep(WAITTIME); assertHasEvent(receivedChatMessages, IChatMessage.class); - final IChatMessage message = receivedChatMessages.get(0); + final IChatMessage message = (IChatMessage) receivedChatMessages.get(0); // For some reason, the smack library doesn't seem to get this right. // assertTrue(message.getThreadID().equals(sendthreadid)); assertTrue(message.getSubject().equals("subject1")); @@ -118,7 +118,7 @@ public abstract class AbstractChatTest extends AbstractPresenceTestCase { sleep(WAITTIME); assertHasEvent(receivedChatMessages, IChatMessage.class); - final IChatMessage message = receivedChatMessages.get(0); + final IChatMessage message = (IChatMessage) receivedChatMessages.get(0); assertNull(message.getSubject()); assertTrue(message.getBody().equals("")); assertTrue(message.getType().equals(IChatMessage.Type.CHAT)); -- cgit v1.2.3