Clean out the tests directory a bit removing deps on some 3rd party l…

…ibraries in the tests.

Update issue 7

tests/.classpath

@@ -4,7 +4,5 @@
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/foursquared"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="lib" path="/foursquared/lib/signpost-commonshttp.jar"/>
-	<classpathentry kind="lib" path="/foursquared/lib/signpost-core.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

tests/.project

@@ -3,6 +3,7 @@
 	<name>foursquared_tests</name>
 	<comment></comment>
 	<projects>
+		<project>foursquared</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

tests/AndroidManifest.xml

@@ -1,35 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
   xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.joelapenna.foursquared.tests"
-  android:versionName="2009-07-04"
-  android:versionCode="2009070400">
-
-  <uses-permission
-    android:name="android.permission.ACCESS_COARSE_LOCATION" />
-  <uses-permission
-    android:name="android.permission.ACCESS_FINE_LOCATION" />
-  <uses-permission
-    android:name="android.permission.INTERNET" />
-  <uses-permission
-    android:name="android.permission.READ_PHONE_STATE" />
-
-  <uses-sdk
-    android:minSdkVersion="3" />
-
+  package="com.joelapenna.foursquared.test"
+  android:versionName="2009-09-26"
+  android:versionCode="2009092600">
   <application
-    android:name="Foursquared">
+    android:label="@string/app_name">
 
     <uses-library
       android:name="android.test.runner" />
-
-    <uses-library
-      android:name="com.google.android.maps" />
-
   </application>
-
+  <uses-sdk
+    android:minSdkVersion="3" />
   <instrumentation
-    android:name="android.test.InstrumentationTestRunner"
-    android:targetPackage="com.joelapenna.foursquared">
-  </instrumentation>
+    android:targetPackage="com.joelapenna.foursquared"
+    android:name="android.test.InstrumentationTestRunner" />
 </manifest>

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

tests/res/layout/main.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+<TextView  
+    android:layout_width="fill_parent" 
+    android:layout_height="wrap_content" 
+    android:text="@string/hello"
+    />
+</LinearLayout>

tests/res/values/strings.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="hello">Hello World!</string>
+    <string name="app_name">FoursquareTest</string>
+</resources>

tests/src/com/joelapenna/foursquared/FoursquaredAppTestCase.java → 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.
     }
 }

tests/src/com/joelapenna/foursquared/FoursquaredTest.java → 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);

tests/src/com/joelapenna/foursquared/VenueActivityInstrumentationTestCase.java → 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();