Author: rgardler
Date: Sat Feb 27 01:31:20 2010
New Revision: 916891
URL: http://svn.apache.org/viewvc?rev=916891&view=rev
Log:
Rename MockWookieConnectorService to TestWookieConnectorService since it is not
really a mock object.
Test against a running instance of Wookie, either locally or remotely (bombax)
Added:
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/connector/framework/impl/TestWookieConnectorService.java
- copied, changed from r916644,
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/connector/framework/impl/MockWookieConnectorService.java
Removed:
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/connector/framework/impl/MockWookieConnectorService.java
Modified:
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/connector/framework/impl/WookieConnectorService.java
Copied:
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/connector/framework/impl/TestWookieConnectorService.java
(from r916644,
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/connector/framework/impl/MockWookieConnectorService.java)
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src-tests/org/apache/wookie/tests/connector/framework/impl/TestWookieConnectorService.java?p2=incubator/wookie/trunk/src-tests/org/apache/wookie/tests/connector/framework/impl/TestWookieConnectorService.java&p1=incubator/wookie/trunk/src-tests/org/apache/wookie/tests/connector/framework/impl/MockWookieConnectorService.java&r1=916644&r2=916891&rev=916891&view=diff
==============================================================================
---
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/connector/framework/impl/MockWookieConnectorService.java
(original)
+++
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/connector/framework/impl/TestWookieConnectorService.java
Sat Feb 27 01:31:20 2010
@@ -13,23 +13,29 @@
*/
package org.apache.wookie.tests.connector.framework.impl;
+import java.io.IOException;
+import java.net.ConnectException;
+import java.net.MalformedURLException;
+import java.net.URL;
+
import org.apache.wookie.connector.framework.AbstractWookieConnectorService;
import org.apache.wookie.connector.framework.User;
import org.apache.wookie.connector.framework.WookieConnectorException;
-import org.apache.wookie.connector.framework.WookieServerConnection;
/**
- * A mock class for testing purposes.
+ * A Wookie connector for testing purposes. It will first try to connect to
+ * http;//localhost:8888/wookie and run tests against that server. If no
instance
+ * is running locally it will connect to http://bombax.oucs.ox.ac.uk:8888 a
test
+ * server hosted at the University of Oxford.
*
- * @FIXME this is not really a mock class it connects, via the network to a
live
- * instance of Wookie. This is clearly bad for testing, we need to make this a
real
- * Mock class or at least run a local version of Wookie to test against.
+ * Please note tha the bombax server is not guaranteed to be running, therefore
+ * always try and run tests against localhost.
*/
-public class MockWookieConnectorService extends AbstractWookieConnectorService
{
+public class TestWookieConnectorService extends AbstractWookieConnectorService
{
- private static MockWookieConnectorService instance;
+ private static TestWookieConnectorService instance;
User testUser = new User("test", "test_user");
- public MockWookieConnectorService(String url, String apiKey,
+ private TestWookieConnectorService(String url, String apiKey,
String sharedDataKey) throws WookieConnectorException {
super(url, apiKey, sharedDataKey);
}
@@ -45,10 +51,15 @@
return null;
}
- public static MockWookieConnectorService getInstance() throws
WookieConnectorException {
+ public static TestWookieConnectorService getInstance() throws
WookieConnectorException, MalformedURLException, IOException {
if (instance == null) {
- instance = new
MockWookieConnectorService("http://bombax.oucs.ox.ac.uk:8888/wookie";, "TEST",
"myshareddata");
-
+ try {
+ new URL("http://localhost:8888/wookie";).openStream();
+ instance = new
TestWookieConnectorService("http://localhost:8888/wookie";, "TEST",
"myshareddata");
+ } catch (ConnectException e) {
+ // assume localhost is not running so run against bombax
+ instance = new
TestWookieConnectorService("http://bombax.oucs.ox.ac.uk:8888/wookie";, "TEST",
"myshareddata");
+ }
}
return instance;
}
Modified:
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/connector/framework/impl/WookieConnectorService.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src-tests/org/apache/wookie/tests/connector/framework/impl/WookieConnectorService.java?rev=916891&r1=916890&r2=916891&view=diff
==============================================================================
---
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/connector/framework/impl/WookieConnectorService.java
(original)
+++
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/connector/framework/impl/WookieConnectorService.java
Sat Feb 27 01:31:20 2010
@@ -13,7 +13,6 @@
*/
package org.apache.wookie.tests.connector.framework.impl;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -28,11 +27,11 @@
public class WookieConnectorService {
- private static MockWookieConnectorService service;
+ private static TestWookieConnectorService service;
@BeforeClass
- public static void setup() throws WookieConnectorException {
- service = MockWookieConnectorService.getInstance();
+ public static void setup() throws Exception {
+ service = TestWookieConnectorService.getInstance();
}
@Test
