diff --git a/tests/.classpath b/tests/.classpath
index bd64d04..e7de8f6 100644
--- a/tests/.classpath
+++ b/tests/.classpath
@@ -4,7 +4,5 @@
-
-
diff --git a/tests/.project b/tests/.project
index 7b646a7..21e751c 100644
--- a/tests/.project
+++ b/tests/.project
@@ -3,6 +3,7 @@
foursquared_tests
+ foursquared
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 0ef6882..a38c17d 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -1,35 +1,18 @@
-
-
-
-
-
-
-
-
+ package="com.joelapenna.foursquared.test"
+ android:versionName="2009-09-26"
+ android:versionCode="2009092600">
+ android:label="@string/app_name">
-
-
-
-
+
-
+ android:targetPackage="com.joelapenna.foursquared"
+ android:name="android.test.InstrumentationTestRunner" />
diff --git a/tests/default.properties b/tests/default.properties
index 324e960..4513a1e 100644
--- a/tests/default.properties
+++ b/tests/default.properties
@@ -7,16 +7,5 @@
# "build.properties", and override values to adapt the script to your
# project structure.
-# apk configurations. This property allows creation of APK files with limited
-# resources. For example, if your application contains many locales and
-# you wish to release multiple smaller apks instead of a large one, you can
-# define configuration to create apks with limited language sets.
-# Format is a comma separated list of configuration names. For each
-# configuration, a property will declare the resource configurations to
-# include. Example:
-# apk-configurations=european,northamerica
-# apk-config-european=en,fr,it,de,es
-# apk-config-northamerica=en,es
-apk-configurations=
# Project target.
-target=Google Inc.:Google APIs:3
+target=android-3
diff --git a/tests/res/layout/main.xml b/tests/res/layout/main.xml
new file mode 100644
index 0000000..3a5f117
--- /dev/null
+++ b/tests/res/layout/main.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/tests/res/values/strings.xml b/tests/res/values/strings.xml
new file mode 100644
index 0000000..7ba5cb0
--- /dev/null
+++ b/tests/res/values/strings.xml
@@ -0,0 +1,5 @@
+
+
+ Hello World!
+ FoursquareTest
+
diff --git a/tests/src/com/joelapenna/foursquare/FoursquareHttpApiV1TestCase.java b/tests/src/com/joelapenna/foursquare/FoursquareHttpApiV1TestCase.java
deleted file mode 100644
index 24d3264..0000000
--- a/tests/src/com/joelapenna/foursquare/FoursquareHttpApiV1TestCase.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Copyright 2009 Joe LaPenna
- */
-
-package com.joelapenna.foursquare;
-
-import com.joelapenna.foursquare.error.FoursquareException;
-import com.joelapenna.foursquare.types.Credentials;
-
-import android.test.suitebuilder.annotation.LargeTest;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-/**
- * @author Joe LaPenna (joe@joelapenna.com)
- */
-public class FoursquareHttpApiV1TestCase extends TestCase {
-
- @LargeTest
- public void test_authExchange() throws FoursquareException, IOException {
- FoursquareHttpApiV1 foursquare = new FoursquareHttpApiV1();
- foursquare.setOAuthConsumerCredentials( //
- TestCredentials.oAuthConsumerKey, TestCredentials.oAuthConsumerSecret);
- Credentials credentials = foursquare.authExchange(TestCredentials.testFoursquarePhone,
- TestCredentials.testFoursquarePassword);
- assertNotNull(credentials.getOauthToken());
- assertNotNull(credentials.getOauthTokenSecret());
- }
-}
diff --git a/tests/src/com/joelapenna/foursquare/FoursquareTestCase.java b/tests/src/com/joelapenna/foursquare/FoursquareTestCase.java
deleted file mode 100644
index 323cc4b..0000000
--- a/tests/src/com/joelapenna/foursquare/FoursquareTestCase.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- * Copyright 2009 Joe LaPenna
- */
-
-package com.joelapenna.foursquare;
-
-import com.joelapenna.foursquare.error.FoursquareException;
-import com.joelapenna.foursquare.types.Group;
-import com.joelapenna.foursquare.types.User;
-import com.joelapenna.foursquare.types.Venue;
-import com.joelapenna.foursquare.types.classic.Auth;
-
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.SmallTest;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-/**
- * @author Joe LaPenna (joe@joelapenna.com)
- */
-public class FoursquareTestCase extends TestCase {
-
- /**
- * hasCredentials tests for only phone/password unless the user specifies true as a parameter.
- * In that case, hasCredentials will makes ure that the foursquare instance has an oauth_token
- * and oauth_token_secret, usually acquired through authExchange().
- */
- @SmallTest
- public void test_hasCredentials() {
- Foursquare foursquare = new Foursquare(true);
- foursquare.setOAuthConsumerCredentials( //
- TestCredentials.oAuthConsumerKey, TestCredentials.oAuthConsumerSecret);
-
- // Test classic API behavior.
- assertFalse(foursquare.hasCredentials());
- foursquare.setCredentials("phone", "password");
- assertTrue(foursquare.hasCredentials());
-
- // check for v1/oauth credentials
- assertFalse(foursquare.hasCredentials());
- foursquare.setCredentials("phone", "password");
- foursquare.setOAuthToken("token", "secret");
- assertTrue(foursquare.hasCredentials());
-
- }
-
- // Geeze! This bastard caused me all sorts of problems by expiring my old auth tokens whenever I
- // would request a new one. I wonder if that is the corre
- // @LargeTest
- // public void test_authExchange() throws FoursquareException, IOException {
- // Foursquare foursquare = new Foursquare(TestCredentials.oAuthConsumerKey,
- // TestCredentials.oAuthConsumerSecret);
- // foursquare.setCredentials(TestCredentials.testFoursquarePhone,
- // TestCredentials.testFoursquarePassword);
- //
- // Credentials credentials = foursquare.authExchange();
- //
- // assertNotNull(credentials.getOauthToken());
- // assertNotNull(credentials.getOauthTokenSecret());
- // }
-
- @LargeTest
- public void test_login() throws FoursquareException, IOException {
- Foursquare foursquare = getFoursquareForTest();
-
- Auth auth = foursquare.login();
- assertNotNull(auth);
- assertEquals("testuser@joelapenna.com", auth.getEmail());
- assertEquals("9711", auth.getId());
- }
-
- @LargeTest
- public void test_tips() throws FoursquareException, IOException {
- Foursquare foursquare = getFoursquareForTest();
-
- Group tips = foursquare.tips("37.770900", "-122.436987", 1);
- assertNotNull(tips);
- }
-
- @LargeTest
- public void test_user() throws FoursquareException, IOException {
- Foursquare foursquare = getFoursquareForTest();
-
- User user = foursquare.user(null, true, true);
- assertNotNull(user);
- }
-
- @LargeTest
- public void test_venue() throws FoursquareException, IOException {
- Foursquare foursquare = getFoursquareForTest();
-
- Venue venue = foursquare.venue("23035");
- assertNotNull(venue);
- }
-
- @LargeTest
- public void test_venues() throws FoursquareException, IOException {
- Foursquare foursquare = getFoursquareForTest();
-
- Group venues = foursquare.venues(null, null, "coffee", 1, 10);
- assertNotNull(venues);
- }
-
- private static final Foursquare getFoursquareForTest() {
- Foursquare foursquare = new Foursquare(true);
- // Set the oauth credentials.
- foursquare.setOAuthConsumerCredentials( //
- TestCredentials.oAuthConsumerKey, TestCredentials.oAuthConsumerSecret);
- foursquare.setCredentials(TestCredentials.testFoursquarePhone,
- TestCredentials.testFoursquarePassword);
- foursquare.setOAuthToken(TestCredentials.oAuthToken, TestCredentials.oAuthTokenSecret);
- return foursquare;
- }
-}
diff --git a/tests/src/com/joelapenna/foursquare/http/HttpApiWithOAuthTestCase.java b/tests/src/com/joelapenna/foursquare/http/HttpApiWithOAuthTestCase.java
deleted file mode 100644
index 8221a38..0000000
--- a/tests/src/com/joelapenna/foursquare/http/HttpApiWithOAuthTestCase.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Copyright 2009 Joe LaPenna
- */
-
-package com.joelapenna.foursquare.http;
-
-import com.joelapenna.foursquare.TestCredentials;
-
-import oauth.signpost.OAuthConsumer;
-import oauth.signpost.commonshttp.CommonsHttpOAuthConsumer;
-import oauth.signpost.exception.OAuthExpectationFailedException;
-import oauth.signpost.exception.OAuthMessageSignerException;
-import oauth.signpost.signature.SignatureMethod;
-
-import org.apache.http.HttpResponse;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.util.EntityUtils;
-
-import android.test.suitebuilder.annotation.LargeTest;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-/**
- * @author Joe LaPenna (joe@joelapenna.com)
- */
-public class HttpApiWithOAuthTestCase extends TestCase {
-
- public HttpApiWithOAuthTestCase() {
- super();
- }
-
- @LargeTest
- public void test_oAuthSigning() throws ClientProtocolException, IOException,
- OAuthMessageSignerException, OAuthExpectationFailedException {
- OAuthConsumer consumer = new CommonsHttpOAuthConsumer(TestCredentials.oAuthConsumerKey,
- TestCredentials.oAuthConsumerSecret, SignatureMethod.HMAC_SHA1);
- consumer.setTokenWithSecret(TestCredentials.oAuthToken, TestCredentials.oAuthTokenSecret);
-
- HttpGet httpGet = new HttpGet(
- "http://api.playfoursquare.com/v1/tips?geolat=37.770900&geolong=-122.436987&l=1");
- consumer.sign(httpGet);
- HttpClient httpClient = HttpApi.createHttpClient();
- HttpResponse response = httpClient.execute(httpGet);
- String responseString = EntityUtils.toString(response.getEntity());
- assertTrue(responseString.contains(""));
- }
-}
diff --git a/tests/src/com/joelapenna/foursquared/CheckinsActivityInstrumentationTestCase.java b/tests/src/com/joelapenna/foursquared/CheckinsActivityInstrumentationTestCase.java
deleted file mode 100644
index 6745cd7..0000000
--- a/tests/src/com/joelapenna/foursquared/CheckinsActivityInstrumentationTestCase.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Copyright 2009 Joe LaPenna
- */
-
-package com.joelapenna.foursquared;
-
-import com.joelapenna.foursquare.types.Group;
-import com.joelapenna.foursquared.CheckinsActivity;
-
-import android.test.ActivityInstrumentationTestCase2;
-import android.test.UiThreadTest;
-import android.test.suitebuilder.annotation.SmallTest;
-
-/**
- * @author Joe LaPenna (joe@joelapenna.com)
- */
-public class CheckinsActivityInstrumentationTestCase extends
- ActivityInstrumentationTestCase2 {
-
- public CheckinsActivityInstrumentationTestCase() {
- super("com.joelapenna.foursquared", CheckinsActivity.class);
- }
-
- @SmallTest
- @UiThreadTest
- public void testSetSearchResults() {
- Group fakeResults = FoursquaredTest.createRandomCheckinGroups("Root");
- getActivity().setSearchResults(fakeResults);
- getActivity().putSearchResultsInAdapter(fakeResults);
- }
-}
diff --git a/tests/src/com/joelapenna/foursquared/FoursquaredAppTestCase.java b/tests/src/com/joelapenna/foursquared/test/FoursquaredAppTestCase.java
similarity index 87%
rename from tests/src/com/joelapenna/foursquared/FoursquaredAppTestCase.java
rename to tests/src/com/joelapenna/foursquared/test/FoursquaredAppTestCase.java
index a6280e1..9f65789 100644
--- a/tests/src/com/joelapenna/foursquared/FoursquaredAppTestCase.java
+++ b/tests/src/com/joelapenna/foursquared/test/FoursquaredAppTestCase.java
@@ -2,7 +2,7 @@
* Copyright 2009 Joe LaPenna
*/
-package com.joelapenna.foursquared;
+package com.joelapenna.foursquared.test;
import com.joelapenna.foursquared.Foursquared;
@@ -29,7 +29,5 @@ public void testLocationMethods() {
@SmallTest
public void testPreferences() {
createApplication();
- Foursquared.getFoursquare();
- // ... to be continued.
}
}
diff --git a/tests/src/com/joelapenna/foursquared/FoursquaredTest.java b/tests/src/com/joelapenna/foursquared/test/FoursquaredTest.java
similarity index 91%
rename from tests/src/com/joelapenna/foursquared/FoursquaredTest.java
rename to tests/src/com/joelapenna/foursquared/test/FoursquaredTest.java
index ac366d9..7389a8a 100644
--- a/tests/src/com/joelapenna/foursquared/FoursquaredTest.java
+++ b/tests/src/com/joelapenna/foursquared/test/FoursquaredTest.java
@@ -2,7 +2,7 @@
* Copyright 2009 Joe LaPenna
*/
-package com.joelapenna.foursquared;
+package com.joelapenna.foursquared.test;
import com.joelapenna.foursquare.types.Beenhere;
import com.joelapenna.foursquare.types.Group;
@@ -39,18 +39,6 @@ public static Checkin createCheckin(String id, Venue venue) {
return checkin;
}
- public static com.joelapenna.foursquare.types.classic.Checkin createIncomingCheckin() {
- com.joelapenna.foursquare.types.classic.Checkin checkin = new com.joelapenna.foursquare.types.classic.Checkin();
- checkin.setCheckinid("67889");
- checkin.setMessage("OK! We've got you @ The Page.");
- checkin.setStatus(true);
- checkin
- .setUrl("http://playfoursquare.com/incoming/breakdown?cid=67889&uid=9232&client=iphone");
- checkin.setUserid("9232");
- return checkin;
-
- }
-
public static Group createRandomCheckinGroup(String id) {
Group tlg = new Group();
tlg.setType(id);
diff --git a/tests/src/com/joelapenna/foursquared/VenueActivityInstrumentationTestCase.java b/tests/src/com/joelapenna/foursquared/test/VenueActivityInstrumentationTestCase.java
similarity index 84%
rename from tests/src/com/joelapenna/foursquared/VenueActivityInstrumentationTestCase.java
rename to tests/src/com/joelapenna/foursquared/test/VenueActivityInstrumentationTestCase.java
index 2b8e545..6081dc4 100644
--- a/tests/src/com/joelapenna/foursquared/VenueActivityInstrumentationTestCase.java
+++ b/tests/src/com/joelapenna/foursquared/test/VenueActivityInstrumentationTestCase.java
@@ -2,8 +2,9 @@
* Copyright 2009 Joe LaPenna
*/
-package com.joelapenna.foursquared;
+package com.joelapenna.foursquared.test;
+import com.joelapenna.foursquared.Foursquared;
import com.joelapenna.foursquared.VenueActivity;
import android.content.Intent;
@@ -23,7 +24,7 @@ public VenueActivityInstrumentationTestCase() {
@SmallTest
public void testOnCreate() {
Intent intent = new Intent(Intent.ACTION_VIEW);
- intent.putExtra(VenueActivity.EXTRA_VENUE, "40450");
+ intent.putExtra(Foursquared.EXTRA_VENUE_ID, "40450");
setActivityIntent(intent);
VenueActivity activity = getActivity();