From 58743897517841a3427d43f76660bd3231e0fcfb Mon Sep 17 00:00:00 2001 From: nash Date: Tue, 26 Oct 2010 12:50:12 +0000 Subject: Merge r1006260 TUSCANY-3707: If no internet connection, avoid running tests that need the internet git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027521 13f79535-47bb-0310-9956-ffa450edef68 --- .../gdata/GoogleBloggerServiceTestCase.java | 50 ++++++++++++++++++++-- .../gdata/GoogleCalendarServiceTestCase.java | 50 ++++++++++++++++++++-- .../gdata/GoogleContactsServiceTestCase.java | 50 ++++++++++++++++++++-- .../gdata/GoogleWebAlbumServiceTestCase.java | 43 +++++++++++++++++-- 4 files changed, 181 insertions(+), 12 deletions(-) (limited to 'sca-java-1.x/trunk/modules/binding-gdata-runtime') diff --git a/sca-java-1.x/trunk/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java b/sca-java-1.x/trunk/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java index a827677fd0..82b1d6eb89 100644 --- a/sca-java-1.x/trunk/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java +++ b/sca-java-1.x/trunk/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java @@ -19,6 +19,7 @@ package org.apache.tuscany.sca.binding.gdata; +import java.net.Socket; import java.net.URL; import junit.framework.Assert; @@ -43,17 +44,25 @@ public class GoogleBloggerServiceTestCase { @BeforeClass public static void setUp() throws Exception { //Initialize the GData client service (Reference Binding test) - scaDomainConsumer = SCADomain.newInstance("org/apache/tuscany/sca/binding/gdata/ConsumerGoogleBlogger.composite"); - testService = scaDomainConsumer.getService(CustomerClient.class, "CustomerClient"); + if (internetConnected()) { + scaDomainConsumer = SCADomain.newInstance("org/apache/tuscany/sca/binding/gdata/ConsumerGoogleBlogger.composite"); + testService = scaDomainConsumer.getService(CustomerClient.class, "CustomerClient"); + } } @AfterClass public static void tearDown(){ - scaDomainConsumer.close(); + if (scaDomainConsumer != null) { + scaDomainConsumer.close(); + } } @Test public void testClientGetFeed() throws Exception { + if (testService == null) { + // no internet connection + return; + } Feed feed = testService.clientGetFeed(); //System.out.println("feed title: " + feed.getTitle().getPlainText()); Assert.assertEquals("gdata binding tuscany test", feed.getTitle().getPlainText()); @@ -62,6 +71,10 @@ public class GoogleBloggerServiceTestCase { @Test public void testClientGetEntry() throws Exception { + if (testService == null) { + // no internet connection + return; + } String entryID = "8308734583601887890"; Entry blogEntry = testService.clientGetEntry(entryID); //System.out.println("Entry ID: " + blogEntry.getId()); @@ -72,6 +85,10 @@ public class GoogleBloggerServiceTestCase { @Test public void testClientPut() throws Exception { + if (testService == null) { + // no internet connection + return; + } String entryID = "2889832689497686762"; String newBlogEntryTitle = "updatedTitleByTestCase2"; testService.clientPut(entryID, newBlogEntryTitle); //update the title @@ -84,6 +101,10 @@ public class GoogleBloggerServiceTestCase { @Test public void testClientPost() throws Exception { + if (testService == null) { + // no internet connection + return; + } String blogEntryTitle = "titleByBloogerTestcase000"; Entry newEntry = new Entry(); newEntry.setTitle(new PlainTextConstruct(blogEntryTitle)); @@ -95,6 +116,10 @@ public class GoogleBloggerServiceTestCase { @Test public void testClientDelete() throws Exception { + if (testService == null) { + // no internet connection + return; + } //This test case might fail //because Google blogger service has limitation on new posts allowed everyday/every hour? @@ -127,6 +152,10 @@ public class GoogleBloggerServiceTestCase { @Test public void testClientQuery() throws Exception { + if (testService == null) { + // no internet connection + return; + } Query myQuery = new Query(new URL("http://haibotuscany.blogspot.com/feeds/posts/default")); myQuery.setMaxResults(100); //myQuery.setUpdatedMin(startTime); @@ -137,5 +166,20 @@ public class GoogleBloggerServiceTestCase { //assertEquals("gdata binding tuscany test", resultFeed.getTitle().getPlainText()); } + private static boolean internetConnected() { + try { + // see whether an internet connection is available + Socket testInternet = new Socket("tuscany.apache.org", 80); + testInternet.close(); + + // internet connection available + return true; + + } catch (Exception e) { + // no internet connection + System.out.println("Unable to run test because no internet connection available"); + return false; + } + } } diff --git a/sca-java-1.x/trunk/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java b/sca-java-1.x/trunk/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java index 9c3122e134..b64650aa7c 100644 --- a/sca-java-1.x/trunk/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java +++ b/sca-java-1.x/trunk/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleCalendarServiceTestCase.java @@ -19,6 +19,7 @@ package org.apache.tuscany.sca.binding.gdata; +import java.net.Socket; import java.net.URL; import junit.framework.Assert; @@ -46,17 +47,25 @@ public class GoogleCalendarServiceTestCase { @BeforeClass public static void setUp() throws Exception { //Initialize the GData client service (Reference Binding test) - scaDomainConsumer = SCADomain.newInstance("org/apache/tuscany/sca/binding/gdata/ConsumerGoogleCalendar.composite"); - testService = scaDomainConsumer.getService(CustomerClient.class, "CustomerClient"); + if (internetConnected()) { + scaDomainConsumer = SCADomain.newInstance("org/apache/tuscany/sca/binding/gdata/ConsumerGoogleCalendar.composite"); + testService = scaDomainConsumer.getService(CustomerClient.class, "CustomerClient"); + } } @AfterClass public static void tearDown(){ - scaDomainConsumer.close(); + if (scaDomainConsumer != null) { + scaDomainConsumer.close(); + } } @Test public void testClientGetFeed() throws Exception { + if (testService == null) { + // no internet connection + return; + } Feed feed = testService.clientGetFeed(); //System.out.println("feed title: " + feed.getTitle().getPlainText()); Assert.assertEquals("gsoc gosc", feed.getTitle().getPlainText()); @@ -65,6 +74,10 @@ public class GoogleCalendarServiceTestCase { @Test public void testClientGetEntry() throws Exception { + if (testService == null) { + // no internet connection + return; + } String entryID = "1c76lcl70jg9r0fm18rcbneea8"; Entry blogEntry = testService.clientGetEntry(entryID); //System.out.println("Entry ID: " + blogEntry.getId()); @@ -75,6 +88,10 @@ public class GoogleCalendarServiceTestCase { @Test public void testClientPut() throws Exception { + if (testService == null) { + // no internet connection + return; + } String entryID = "1c76lcl70jg9r0fm18rcbneea8"; String newBlogEntryTitle = "updatedTitleByGoogleContactsConsumerTestCase"; testService.clientPut(entryID, newBlogEntryTitle); //update the title @@ -85,6 +102,10 @@ public class GoogleCalendarServiceTestCase { @Test public void testClientPost() throws Exception { + if (testService == null) { + // no internet connection + return; + } String blogEntryTitle = "titleByGoogleCalendarTestcase"; Entry newEntry = new Entry(); newEntry.setTitle(new PlainTextConstruct(blogEntryTitle)); @@ -95,6 +116,10 @@ public class GoogleCalendarServiceTestCase { @Test public void testClientDelete() throws Exception { + if (testService == null) { + // no internet connection + return; + } //This test case might fail //because Google blogger service has limitation on new posts allowed everyday/every hour? @@ -130,6 +155,10 @@ public class GoogleCalendarServiceTestCase { @Test public void testClientQuery() throws Exception { + if (testService == null) { + // no internet connection + return; + } Query myQuery = new Query(new URL("http://www.google.com/calendar/feeds/haibotuscany@gmail.com/private/full")); myQuery.setMaxResults(100); //myQuery.setUpdatedMin(startTime); @@ -145,5 +174,20 @@ public class GoogleCalendarServiceTestCase { //assertEquals("gdata binding tuscany test", resultFeed.getTitle().getPlainText()); } + private static boolean internetConnected() { + try { + // see whether an internet connection is available + Socket testInternet = new Socket("tuscany.apache.org", 80); + testInternet.close(); + + // internet connection available + return true; + + } catch (Exception e) { + // no internet connection + System.out.println("Unable to run test because no internet connection available"); + return false; + } + } } diff --git a/sca-java-1.x/trunk/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java b/sca-java-1.x/trunk/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java index 1f261dfc90..5a16f8b5a6 100644 --- a/sca-java-1.x/trunk/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java +++ b/sca-java-1.x/trunk/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleContactsServiceTestCase.java @@ -19,6 +19,7 @@ package org.apache.tuscany.sca.binding.gdata; +import java.net.Socket; import java.net.URL; import junit.framework.Assert; @@ -46,17 +47,25 @@ public class GoogleContactsServiceTestCase { @BeforeClass public static void setUp() throws Exception { //Initialize the GData client service (Reference Binding test) - scaDomainConsumer = SCADomain.newInstance("org/apache/tuscany/sca/binding/gdata/ConsumerGoogleContacts.composite"); - testService = scaDomainConsumer.getService(CustomerClient.class, "CustomerClient"); + if (internetConnected()) { + scaDomainConsumer = SCADomain.newInstance("org/apache/tuscany/sca/binding/gdata/ConsumerGoogleContacts.composite"); + testService = scaDomainConsumer.getService(CustomerClient.class, "CustomerClient"); + } } @AfterClass public static void tearDown(){ - scaDomainConsumer.close(); + if (scaDomainConsumer != null) { + scaDomainConsumer.close(); + } } @Test public void testClientGetFeed() throws Exception { + if (testService == null) { + // no internet connection + return; + } Feed feed = testService.clientGetFeed(); System.out.println("feed title: " + feed.getTitle().getPlainText()); Assert.assertEquals("Haibo Zhao's Contacts", feed.getTitle().getPlainText()); @@ -65,6 +74,10 @@ public class GoogleContactsServiceTestCase { @Test public void testClientGetEntry() throws Exception { + if (testService == null) { + // no internet connection + return; + } String entryID = "12feeeb38ab87365"; Entry contactEntry = testService.clientGetEntry(entryID); //System.out.println("Entry ID: " + contactEntry.getId()); @@ -74,6 +87,10 @@ public class GoogleContactsServiceTestCase { @Test public void testClientPut() throws Exception { + if (testService == null) { + // no internet connection + return; + } String entryID = "12feeeb38ab87365"; String newBlogEntryTitle = "updatedTitleByGoogleContactsConsumerTestCase"; testService.clientPut(entryID, newBlogEntryTitle); //update the title @@ -86,6 +103,10 @@ public class GoogleContactsServiceTestCase { @Test public void testClientPost() throws Exception { + if (testService == null) { + // no internet connection + return; + } String blogEntryTitle = "titleByGoogleContactsTestcase"; Entry newEntry = new Entry(); newEntry.setTitle(new PlainTextConstruct(blogEntryTitle)); @@ -97,6 +118,10 @@ public class GoogleContactsServiceTestCase { @Test public void testClientDelete() throws Exception { + if (testService == null) { + // no internet connection + return; + } //This test case might fail //because Google blogger service has limitation on new posts allowed everyday/every hour? @@ -154,6 +179,10 @@ public class GoogleContactsServiceTestCase { @Test public void testClientQuery() throws Exception { + if (testService == null) { + // no internet connection + return; + } Query myQuery = new Query(new URL("http://www.google.com/m8/feeds/contacts/default/base")); myQuery.setMaxResults(100); //myQuery.setUpdatedMin(startTime); @@ -164,5 +193,20 @@ public class GoogleContactsServiceTestCase { //assertEquals("gdata binding tuscany test", resultFeed.getTitle().getPlainText()); } + private static boolean internetConnected() { + try { + // see whether an internet connection is available + Socket testInternet = new Socket("tuscany.apache.org", 80); + testInternet.close(); + + // internet connection available + return true; + + } catch (Exception e) { + // no internet connection + System.out.println("Unable to run test because no internet connection available"); + return false; + } + } } diff --git a/sca-java-1.x/trunk/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleWebAlbumServiceTestCase.java b/sca-java-1.x/trunk/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleWebAlbumServiceTestCase.java index 459c2f6933..e7a83cb367 100644 --- a/sca-java-1.x/trunk/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleWebAlbumServiceTestCase.java +++ b/sca-java-1.x/trunk/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleWebAlbumServiceTestCase.java @@ -19,6 +19,7 @@ package org.apache.tuscany.sca.binding.gdata; +import java.net.Socket; import java.net.URL; import junit.framework.Assert; @@ -45,17 +46,25 @@ public class GoogleWebAlbumServiceTestCase { @BeforeClass public static void setUp() throws Exception { //Initialize the GData client service (Reference Binding test) - scaDomainConsumer = SCADomain.newInstance("org/apache/tuscany/sca/binding/gdata/ConsumerGoogleWebAlbum.composite"); - testService = scaDomainConsumer.getService(CustomerClient.class, "CustomerClient"); + if (internetConnected()) { + scaDomainConsumer = SCADomain.newInstance("org/apache/tuscany/sca/binding/gdata/ConsumerGoogleWebAlbum.composite"); + testService = scaDomainConsumer.getService(CustomerClient.class, "CustomerClient"); + } } @AfterClass public static void tearDown(){ - scaDomainConsumer.close(); + if (scaDomainConsumer != null) { + scaDomainConsumer.close(); + } } @Test public void testClientGetFeed() throws Exception { + if (testService == null) { + // no internet connection + return; + } Feed feed = testService.clientGetFeed(); //System.out.println("feed title: " + feed.getTitle().getPlainText()); Assert.assertEquals("flowers", feed.getTitle().getPlainText()); @@ -66,6 +75,10 @@ public class GoogleWebAlbumServiceTestCase { @Test public void testClientGetEntry() throws Exception { + if (testService == null) { + // no internet connection + return; + } String entryID = "photoid/5233468700029715874"; Entry contactEntry = testService.clientGetEntry(entryID); //System.out.println("Entry ID: " + contactEntry.getId()); @@ -76,6 +89,10 @@ public class GoogleWebAlbumServiceTestCase { @Test public void testClientQuery() throws Exception { + if (testService == null) { + // no internet connection + return; + } String feedUrlString = "http://picasaweb.google.com/data/feed/api/user/haibotuscany/album/flowers"; URL feedURL = new URL(feedUrlString); Query myQuery = new Query(feedURL); @@ -91,6 +108,10 @@ public class GoogleWebAlbumServiceTestCase { @Test public void testClientPut() throws Exception { + if (testService == null) { + // no internet connection + return; + } String entryID = "photoid/5233468700029715874"; String newBlogEntryTitle = "updatedTitle:dog"; testService.clientPut(entryID, newBlogEntryTitle); //update the title @@ -112,4 +133,20 @@ public class GoogleWebAlbumServiceTestCase { //testService.clientDelete(entryID); } + private static boolean internetConnected() { + try { + // see whether an internet connection is available + Socket testInternet = new Socket("tuscany.apache.org", 80); + testInternet.close(); + + // internet connection available + return true; + + } catch (Exception e) { + // no internet connection + System.out.println("Unable to run test because no internet connection available"); + return false; + } + } + } -- cgit v1.2.3