add unit test for bitbucket web launch, use https rather than ssh

I think it's better to default to https rather than ssh clone urls for this case because SSH access requires the user to have an SSH key installed - even if it's a public repo. also normalise formatting of AndroidManifest
kevinjava · May 24, 2012 · 4bcdd1e · 4bcdd1e
1 parent bb51a0c
commit 4bcdd1e
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 7 deletions.
diff --git a/agit/AndroidManifest.xml b/agit/AndroidManifest.xml
@@ -125,13 +125,13 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".weblaunchers.BitBucketWebLaunchActivity" android:label="@string/app_name">
+        <activity android:label="@string/app_name" android:name=".weblaunchers.BitBucketWebLaunchActivity">
 			<intent-filter>
-                <category android:name="android.intent.category.DEFAULT" />
-				<category android:name="android.intent.category.BROWSABLE"></category>
-                <action android:name="android.intent.action.VIEW"></action>
-				<data android:host="bitbucket.org" android:scheme="https" android:pathPattern="/.*/.*" />
-				<data android:host="bitbucket.org" android:scheme="http" android:pathPattern="/.*/.*" />
+                <category android:name="android.intent.category.DEFAULT"/>
+				<category android:name="android.intent.category.BROWSABLE"/>
+                <action android:name="android.intent.action.VIEW"/>
+				<data android:host="bitbucket.org" android:pathPattern="/.*/.*" android:scheme="https"/>
+				<data android:host="bitbucket.org" android:pathPattern="/.*/.*" android:scheme="http"/>
 			</intent-filter>
 		</activity>
 

diff --git a/agit/src/main/java/com/madgag/agit/weblaunchers/BitBucketWebLaunchActivity.java b/agit/src/main/java/com/madgag/agit/weblaunchers/BitBucketWebLaunchActivity.java
@@ -19,6 +19,6 @@ public class BitBucketWebLaunchActivity extends WebLaunchActivity {
     Intent cloneLauncherForWebBrowseIntent(Uri uri) {
         Matcher matcher = projectPathPattern.matcher(uri.getPath());
         matcher.find();
-        return cloneLauncherIntentFor("git@bitbucket.org:"+ matcher.group(1) +".git");
+        return cloneLauncherIntentFor("https://bitbucket.org/"+ matcher.group(1) +".git");
     }
 }
diff --git a/agit/src/test/java/com/madgag/agit/weblaunchers/BitBucketWebLaunchActivityTest.java b/agit/src/test/java/com/madgag/agit/weblaunchers/BitBucketWebLaunchActivityTest.java
@@ -0,0 +1,36 @@
+package com.madgag.agit.weblaunchers;
+
+import static com.madgag.agit.GitIntents.sourceUriFrom;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import android.net.Uri;
+
+import com.google.inject.Inject;
+import com.madgag.agit.InjectedTestRunner;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(InjectedTestRunner.class)
+public class BitBucketWebLaunchActivityTest {
+
+    @Inject
+    BitBucketWebLaunchActivity activity;
+
+    @Test
+    public void shouldSupplyCloneSourceFromBitBucketProjectPage() {
+        String projectUrl = "https://bitbucket.org/grubix/git";
+        assertThat(sourceUriDerivedFrom(projectUrl), is("https://bitbucket.org/grubix/git.git"));
+    }
+
+    @Test
+    public void shouldSupplyCloneSourceFromBitBucketCheckoutPage() {
+        String sourceUri = sourceUriDerivedFrom("https://bitbucket.org/grubix/git/src");
+        assertThat(sourceUri, is("https://bitbucket.org/grubix/git.git"));
+    }
+
+    private String sourceUriDerivedFrom(String url) {
+        return sourceUriFrom(activity.cloneLauncherForWebBrowseIntent(Uri.parse(url)));
+    }
+
+}