Author: fmoga
Date: Tue Jul 26 09:21:21 2011
New Revision: 1151035
URL: http://svn.apache.org/viewvc?rev=1151035&view=rev
Log:
Add unit tests for the websocket binding.
Added:
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/async/
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/async/NotificationService.java
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/async/NotificationServiceImpl.java
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/sync/
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/sync/HelloService.java
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/sync/HelloServiceImpl.java
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/testcase/
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/testcase/WebsocketBindingTestCase.java
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/resources/async.composite
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/resources/sync.composite
Modified:
tuscany/sca-java-2.x/contrib/modules/binding-websocket/pom.xml
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketServiceBindingProvider.java
Modified: tuscany/sca-java-2.x/contrib/modules/binding-websocket/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/contrib/modules/binding-websocket/pom.xml?rev=1151035&r1=1151034&r2=1151035&view=diff
==============================================================================
--- tuscany/sca-java-2.x/contrib/modules/binding-websocket/pom.xml (original)
+++ tuscany/sca-java-2.x/contrib/modules/binding-websocket/pom.xml Tue Jul 26
09:21:21 2011
@@ -62,6 +62,13 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.26</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
Modified:
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketServiceBindingProvider.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketServiceBindingProvider.java?rev=1151035&r1=1151034&r2=1151035&view=diff
==============================================================================
---
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketServiceBindingProvider.java
(original)
+++
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketServiceBindingProvider.java
Tue Jul 26 09:21:21 2011
@@ -80,7 +80,6 @@ public class WebsocketServiceBindingProv
private void initJavascriptResource() {
if (servletHost.getServletMapping(JAVASCRIPT_RESOURCE_PATH) == null) {
- System.out.println("Adding javascript servlet");
servletHost.addServletMapping(JAVASCRIPT_RESOURCE_PATH, new
JavascriptResourceServlet());
}
}
Added:
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/async/NotificationService.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/async/NotificationService.java?rev=1151035&view=auto
==============================================================================
---
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/async/NotificationService.java
(added)
+++
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/async/NotificationService.java
Tue Jul 26 09:21:21 2011
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package async;
+
+import
org.apache.tuscany.sca.binding.websocket.runtime.WebsocketBindingCallback;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.OneWay;
+import org.oasisopen.sca.annotation.Remotable;
+
+@Remotable
+@Callback(WebsocketBindingCallback.class)
+public interface NotificationService {
+
+ @OneWay
+ void registerForNotifications();
+
+}
Added:
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/async/NotificationServiceImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/async/NotificationServiceImpl.java?rev=1151035&view=auto
==============================================================================
---
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/async/NotificationServiceImpl.java
(added)
+++
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/async/NotificationServiceImpl.java
Tue Jul 26 09:21:21 2011
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package async;
+
+import java.util.Date;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import
org.apache.tuscany.sca.binding.websocket.runtime.WebsocketBindingCallback;
+import org.apache.tuscany.sca.binding.websocket.runtime.WebsocketStatus;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Service;
+
+@Service(NotificationService.class)
+public class NotificationServiceImpl implements NotificationService {
+
+ @Callback
+ protected WebsocketBindingCallback client;
+
+ @Override
+ public void registerForNotifications() {
+ new Timer().scheduleAtFixedRate(new TimerTask() {
+
+ @Override
+ public void run() {
+ WebsocketStatus status = client.sendMessage("Notification @ "
+ new Date());
+ if (status == WebsocketStatus.CLOSED) {
+ this.cancel();
+ }
+ }
+ }, 0L, 1000L);
+ }
+}
Added:
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/sync/HelloService.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/sync/HelloService.java?rev=1151035&view=auto
==============================================================================
---
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/sync/HelloService.java
(added)
+++
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/sync/HelloService.java
Tue Jul 26 09:21:21 2011
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package sync;
+
+import org.oasisopen.sca.annotation.Remotable;
+
+@Remotable
+public interface HelloService {
+
+ String sayHello(String name);
+
+}
Added:
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/sync/HelloServiceImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/sync/HelloServiceImpl.java?rev=1151035&view=auto
==============================================================================
---
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/sync/HelloServiceImpl.java
(added)
+++
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/sync/HelloServiceImpl.java
Tue Jul 26 09:21:21 2011
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package sync;
+
+import org.oasisopen.sca.annotation.Service;
+
+@Service(HelloService.class)
+public class HelloServiceImpl implements HelloService {
+
+ @Override
+ public String sayHello(String name) {
+ return "Hello " + name;
+ }
+}
Added:
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/testcase/WebsocketBindingTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/testcase/WebsocketBindingTestCase.java?rev=1151035&view=auto
==============================================================================
---
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/testcase/WebsocketBindingTestCase.java
(added)
+++
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/testcase/WebsocketBindingTestCase.java
Tue Jul 26 09:21:21 2011
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package testcase;
+
+import junit.framework.Assert;
+
+import org.apache.tuscany.sca.http.jetty.JettyServer;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class WebsocketBindingTestCase {
+
+ @BeforeClass
+ public static void init() {
+ JettyServer.portDefault = 8085;
+ }
+
+ @Test
+ public void testSync() {
+ try {
+ Node node = NodeFactory.newInstance().createNode("sync.composite");
+ node.start();
+ node.stop();
+ } catch (final Exception e) {
+ Assert.fail(e.getMessage());
+ }
+ }
+
+ @Test
+ public void testAsync() {
+ try {
+ Node node =
NodeFactory.newInstance().createNode("async.composite");
+ node.start();
+ node.stop();
+ } catch (final Exception e) {
+ Assert.fail(e.getMessage());
+ }
+ }
+
+}
\ No newline at end of file
Added:
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/resources/async.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/resources/async.composite?rev=1151035&view=auto
==============================================================================
---
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/resources/async.composite
(added)
+++
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/resources/async.composite
Tue Jul 26 09:21:21 2011
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912";
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1";
+ targetNamespace="http://samples";
+ name="Async">
+
+ <component name="NotificationComponent">
+ <implementation.java class="async.NotificationServiceImpl"/>
+ <service name="NotificationService">
+ <interface.java interface="async.NotificationService"
+
callbackInterface="org.apache.tuscany.sca.binding.websocket.runtime.WebsocketBindingCallback"/>
+ <tuscany:binding.websocket/>
+ <callback>
+ <tuscany:binding.websocket/>
+ </callback>
+ </service>
+ </component>
+
+</composite>
Added:
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/resources/sync.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/resources/sync.composite?rev=1151035&view=auto
==============================================================================
---
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/resources/sync.composite
(added)
+++
tuscany/sca-java-2.x/contrib/modules/binding-websocket/src/test/resources/sync.composite
Tue Jul 26 09:21:21 2011
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912";
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1";
xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912";
+ targetNamespace="http://samples"; name="Sync">
+
+ <component name="HelloComponent">
+ <implementation.java class="sync.HelloServiceImpl" />
+ <service name="HelloService">
+ <interface.java interface="sync.HelloService" />
+ <tuscany:binding.websocket />
+ </service>
+ </component>
+
+</composite>
\ No newline at end of file
