Add a test for twitter search

.gitignore

@@ -0,0 +1,2 @@
+__pycache__
+.DS_Store

pySearch.py

@@ -1,68 +1,14 @@
 #jrkong's command line searcher
-
-import urllib
 import argparse
-import webbrowser
+from search import Search
 
 argparser = argparse.ArgumentParser()
-argparser.add_argument("-s", action="append", help="Takes a query to search for and searches it.", nargs="*")
+argparser.add_argument("-s", action="append", help="Takes a query to search for and searches it.", nargs="*", required=True)
 argparser.add_argument("-e", "--engine", help="Changes the name or alias of a search engine and sets it as the search engine for the session", nargs="+")
 argparser.add_argument("-d", "--domain", help="Changes the domain extention", nargs="+")
 
 args = argparser.parse_args()
 
-class Search:
-    def __init__(self, searchIn = None, engineIn = "google", domainIn = "ca"):
-        self.searchRaw = searchIn
-        self.searchQuery = ""
-        self.engine = engineIn
-        self.domain = domainIn
-        self.url = ""
-        self.searchString = "/search?q="
-    #end of constructor
-
-    #set search engine
-    def setEngine(self, engineIn):
-        self.engine = engineIn
-    #end of setEngine
-
-    #set domain engine
-    def setDomain(self, domainIn):
-        self.domain = domainIn
-    #end of setdomain
-
-    #set search Query
-    def setQuery(self, searchIn):
-        self.searchRaw = searchIn
-    #end of setQuery
-
-    def buildLink(self):
-        if self.engine == "amazon":
-            self.searchString = "/s/keywords="
-            self.searchQuery = "%20".join(self.searchRaw)
-        elif self.engine == "twitter":
-            self.searchQuery = " ".join(self.searchRaw)
-        else:
-            self.searchQuery = "+".join(self.searchRaw)
-        #end of search exceptions
-        self.url = "http://www." + self.engine + "." + self.domain + self.searchString + self.searchQuery
-    #end of link building
-
-    def openBrowser(self):
-        webbrowser.open_new_tab(self.url)
-    #end of openBrowser()
-#end of Query
-
 searchObj = Search()
 
-if args.engine is not None:
-    searchObj.setEngine(args.engine[0])
-
-if args.domain is not None:
-    searchObj.setDomain(args.domain[0])
-#end of cmd args handling
-
-for search in args.s:
-    searchObj.setQuery(search)
-    searchObj.buildLink()
-    searchObj.openBrowser()
+searchObj.handleArgs(args)

search.py

@@ -0,0 +1,60 @@
+
+import urllib
+import webbrowser
+
+class Search:
+    def __init__(self, searchIn = None, engineIn = "google", domainIn = "ca"):
+        self.searchRaw = searchIn
+        self.searchQuery = ""
+        self.engine = engineIn
+        self.domain = domainIn
+        self.url = ""
+        self.searchString = "/search?q="
+    #end of constructor
+
+    #set search engine
+    def setEngine(self, engineIn):
+        self.engine = engineIn
+    #end of setEngine
+
+    #set domain engine
+    def setDomain(self, domainIn):
+        self.domain = domainIn
+    #end of setdomain
+
+    #set search Query
+    def setQuery(self, searchIn):
+        self.searchRaw = searchIn
+    #end of setQuery
+
+    def buildLink(self):
+        if self.engine == "amazon":
+            self.searchString = "/s/keywords="
+            self.searchQuery = "%20".join(self.searchRaw)
+        elif self.engine == "twitter":
+            self.searchQuery = " ".join(self.searchRaw)
+        else:
+            self.searchQuery = "+".join(self.searchRaw)
+        #end of search exceptions
+        self.url = "http://www." + self.engine + "." + self.domain + self.searchString + self.searchQuery
+        return self.url
+    #end of link building
+
+    def openBrowser(self):
+        webbrowser.open_new_tab(self.url)
+    #end of openBrowser()
+
+    def handleArgs(self, args):
+        if args.engine is not None:
+            self.setEngine(args.engine[0])
+
+        if args.domain is not None:
+            self.setDomain(args.domain[0])
+
+        for search in args.s:
+            self.setQuery(search)
+            self.buildLink()
+            self.openBrowser()
+    #end of handleArgs
+
+#end of Query

tests/README.md

@@ -0,0 +1,3 @@
+# pySearch Tests
+
+pySearch tests use the [pytest](https://docs.pytest.org) library which is not part of the default Python library. If this is the first time pytest tests are being run on the machine use `pip install -r requirements.txt` to install pytest and it's dependencies (NOTE your `pip` alias may differ based on your installation). Afterwards pySearch tests can be run with the `pytest` command when inside the pySearch directory.

tests/requirements.txt

@@ -0,0 +1 @@
+pytest

tests/test_search.py

@@ -0,0 +1,10 @@
+import pytest
+
+from ..search import Search
+
+def test_builtLink():
+    tmpSearch = Search()
+    tmpSearch.setEngine("amazon")
+    tmpSearch.setDomain("com")
+    tmpSearch.setQuery(["test", "query"])
+    assert tmpSearch.buildLink() == "http://www.amazon.com/s/keywords=test%20query"

tests/test_search_google.py

@@ -0,0 +1,11 @@
+import pytest
+
+from ..search import Search
+
+
+def test_builtLink_google():
+    tempSearch = Search()
+    tempSearch.setEngine("google")
+    tempSearch.setDomain("com")
+    tempSearch.setQuery(["test","query"])
+    assert tempSearch.buildLink() == "http://www.google.com/search?q=test+query"

tests/test_search_twitter.py

@@ -0,0 +1,10 @@
+import pytest
+
+from ..search import Search
+
+def test_builtLink_twitter():
+    tempSearch = Search()
+    tempSearch.setEngine("twitter")
+    tempSearch.setDomain("com")
+    tempSearch.setQuery(["test","query"])
+    assert tempSearch.buildLink() == "http://www.twitter.com/search?q=test query"