You are viewing a plain text version of this content. The canonical link for it is here.
Posted to nuvem-commits@incubator.apache.org by jo...@apache.org on 2011/05/02 23:30:34 UTC
svn commit: r1098857 - in /incubator/nuvem/trunk/nuvem-google: pom.xml
src/test/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPEndPointTestCase.java
Author: johnp
Date: Mon May 2 23:30:34 2011
New Revision: 1098857
URL: http://svn.apache.org/viewvc?rev=1098857&view=rev
Log:
upgraded GAE API to the latest one which provides the new Presence management support, also modified a test case to reflect the package structure reorganization
Modified:
incubator/nuvem/trunk/nuvem-google/pom.xml
incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPEndPointTestCase.java
Modified: incubator/nuvem/trunk/nuvem-google/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google/pom.xml?rev=1098857&r1=1098856&r2=1098857&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-google/pom.xml (original)
+++ incubator/nuvem/trunk/nuvem-google/pom.xml Mon May 2 23:30:34 2011
@@ -47,8 +47,8 @@
<dependency>
<groupId>com.google.appengine</groupId>
- <artifactId>appengine-api</artifactId>
- <version>1.3.7</version>
+ <artifactId>appengine-api-1.0-sdk</artifactId>
+ <version>1.4.2</version>
<scope>provided</scope>
</dependency>
@@ -73,12 +73,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.google.appengine</groupId>
- <artifactId>appengine-api-stubs</artifactId>
- <version>1.3.7</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>com.google.appengine</groupId>
@@ -107,6 +101,12 @@
<version>2.5</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.appengine</groupId>
+ <artifactId>appengine-api-stubs</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPEndPointTestCase.java
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPEndPointTestCase.java?rev=1098857&r1=1098856&r2=1098857&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPEndPointTestCase.java (original)
+++ incubator/nuvem/trunk/nuvem-google/src/test/java/org/apache/nuvem/cloud/xmpp/impl/GoogleXMPPEndPointTestCase.java Mon May 2 23:30:34 2011
@@ -22,11 +22,11 @@ package org.apache.nuvem.cloud.xmpp.impl
import junit.framework.Assert;
import org.apache.nuvem.cloud.xmpp.api.ErrorCode;
-import org.apache.nuvem.cloud.xmpp.api.Message;
-import org.apache.nuvem.cloud.xmpp.api.MessageBuilder;
-import org.apache.nuvem.cloud.xmpp.api.MessageListener;
import org.apache.nuvem.cloud.xmpp.api.Status;
import org.apache.nuvem.cloud.xmpp.api.XMPPConnector;
+import org.apache.nuvem.cloud.xmpp.api.message.Message;
+import org.apache.nuvem.cloud.xmpp.api.message.MessageBuilder;
+import org.apache.nuvem.cloud.xmpp.api.message.MessageListener;
import org.easymock.EasyMock;
import org.easymock.IArgumentMatcher;
import org.junit.Before;
@@ -34,6 +34,8 @@ import org.junit.Test;
import com.google.appengine.api.xmpp.JID;
import com.google.appengine.api.xmpp.Presence;
+import com.google.appengine.api.xmpp.PresenceBuilder;
+import com.google.appengine.api.xmpp.PresenceType;
import com.google.appengine.api.xmpp.SendResponse;
import com.google.appengine.api.xmpp.XMPPService;
@@ -52,7 +54,8 @@ public class GoogleXMPPEndPointTestCase
public void setUp() throws IllegalArgumentException, IllegalAccessException {
mockedConnector = EasyMock.createMock(XMPPConnector.class);
mockXMPPService = EasyMock.createMock(XMPPService.class);
- EasyMock.expect(mockedConnector.getConnection()).andReturn(mockXMPPService);
+ EasyMock.expect(mockedConnector.getConnection()).andReturn(
+ mockXMPPService);
endPoint = new GoogleXMPPEndPoint(mockedConnector);
}
@@ -63,7 +66,8 @@ public class GoogleXMPPEndPointTestCase
@Test
public void testWithValidMessageButToOfflineRecipient() {
- Presence presence = new Presence(false);
+ Presence presence = new PresenceBuilder().withPresenceType(
+ PresenceType.UNAVAILABLE).build();
JID jid = new JID("test@test.com");
Message message = new MessageBuilder().containing("content")
.toRecipient("test@test.com").from("from@test.com").build();
@@ -81,7 +85,8 @@ public class GoogleXMPPEndPointTestCase
@Test
public void testWithValidMessageAndForOnlineRecipient() {
- Presence presence = new Presence(true);
+ Presence presence = new PresenceBuilder().withPresenceType(
+ PresenceType.AVAILABLE).build();
JID jid = new JID("test@test.com");
Message message = new MessageBuilder().containing("content")
.toRecipient("test@test.com").from("from@test.com").build();
@@ -180,7 +185,7 @@ public class GoogleXMPPEndPointTestCase
"test@domain.com"));
Assert.assertNotNull(registeredListener);
Assert.assertTrue(endPoint.clearListenersFor(jid));
- Assert.assertEquals(MessageListener.LOGGING_LISTENER,
- endPoint.getListenerFor(jid));
+ Assert.assertEquals(MessageListener.LOGGING_LISTENER, endPoint
+ .getListenerFor(jid));
}
}