From 231a30eaa762ddbc442116ef77355b38aa4bcb73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sun, 27 Jan 2019 18:10:17 +0000
Subject: [PATCH] rewrite search, show, and list tests

---
 endtoend_test.go            | 25 -------------------------
 testdata/scripts/list.txt   |  6 ++++++
 testdata/scripts/search.txt | 15 +++++++++++++++
 testdata/scripts/show.txt   | 11 +++++++++++
 4 files changed, 32 insertions(+), 25 deletions(-)
 create mode 100644 testdata/scripts/list.txt
 create mode 100644 testdata/scripts/search.txt
 create mode 100644 testdata/scripts/show.txt

diff --git a/endtoend_test.go b/endtoend_test.go
index 155f2c4..221b585 100644
--- a/endtoend_test.go
+++ b/endtoend_test.go
@@ -44,31 +44,6 @@ func TestCommands(t *testing.T) {
 		mustRun(t, false, wantRe, negRe, cmd, args...)
 	}
 
-	t.Run("SearchNoArgs", func(t *testing.T) {
-		mustSucceed(t, `F-Droid`, ``, cmdSearch)
-	})
-	t.Run("SearchWithArgs", func(t *testing.T) {
-		mustSucceed(t, `F-Droid`, ``, cmdSearch, "fdroid.fdroid")
-	})
-	t.Run("SearchWithArgsNone", func(t *testing.T) {
-		mustSucceed(t, `^$`, ``, cmdSearch, "nomatches")
-	})
-	t.Run("SearchOnlyPackageNames", func(t *testing.T) {
-		mustSucceed(t, `^[^ ]*$`, ``, cmdSearch, "-q", "fdroid.fdroid")
-	})
-
-	t.Run("ShowOne", func(t *testing.T) {
-		mustSucceed(t, `fdroid/fdroidclient`, ``, cmdShow, "org.fdroid.fdroid")
-	})
-	t.Run("ShowMany", func(t *testing.T) {
-		mustSucceed(t, `fdroid/fdroidclient.*fdroid/privileged-extension`, ``,
-			cmdShow, "org.fdroid.fdroid", "org.fdroid.fdroid.privileged")
-	})
-
-	t.Run("ListCategories", func(t *testing.T) {
-		mustSucceed(t, `Development`, ``, cmdList, "categories")
-	})
-
 	if err := startAdbIfNeeded(); err != nil {
 		t.Log("skipping the device tests as ADB is not installed")
 		return
diff --git a/testdata/scripts/list.txt b/testdata/scripts/list.txt
new file mode 100644
index 0000000..ac20601
--- /dev/null
+++ b/testdata/scripts/list.txt
@@ -0,0 +1,6 @@
+env HOME=$WORK/home
+
+fdroidcl update
+
+fdroidcl list categories
+stdout 'Development'
diff --git a/testdata/scripts/search.txt b/testdata/scripts/search.txt
new file mode 100644
index 0000000..76383df
--- /dev/null
+++ b/testdata/scripts/search.txt
@@ -0,0 +1,15 @@
+env HOME=$WORK/home
+
+fdroidcl update
+
+fdroidcl search
+stdout 'F-Droid'
+
+fdroidcl search fdroid.fdroid
+stdout 'F-Droid'
+
+fdroidcl search nomatches
+! stdout .
+
+fdroidcl search -q fdroid.fdroid
+! stdout ' '
diff --git a/testdata/scripts/show.txt b/testdata/scripts/show.txt
new file mode 100644
index 0000000..4024df8
--- /dev/null
+++ b/testdata/scripts/show.txt
@@ -0,0 +1,11 @@
+env HOME=$WORK/home
+
+fdroidcl update
+
+fdroidcl show org.fdroid.fdroid
+stdout 'fdroid/fdroidclient'
+! stdout 'fdroid/privileged-extension'
+
+fdroidcl show org.fdroid.fdroid org.fdroid.fdroid.privileged
+stdout 'fdroid/fdroidclient'
+stdout 'fdroid/privileged-extension'