Implemented testing script. Disable chilpit expand, needs fixing.

joshthecoder · joshthecoder · commit ff79415ac910 · 2009-08-02T18:35:46.000-05:00
diff --git a/common.py b/common.py
@@ -57,6 +57,20 @@ def http_error_302(self, req, fp, code, smg, headers):
 """Base interface that all services implement."""
 class Service(object):
 
+    tested = False
+
+    def _test(self):
+        self.tested = True
+
+        # first shrink an url
+        turl = self.shrink('http://test.com')
+
+        # second expand url and verify
+        if self.expand(turl) == 'http://test.com':
+            return True
+        else:
+            return False
+
     def shrink(self, bigurl):
         """Take a big url and make it smaller"""
         return None
diff --git a/compile.py b/compile.py
@@ -84,6 +84,7 @@ def compile_shorty(services):
         print 'Usage: compile.py <services>'
         print '  services -- names of the services to include in compiled module'
         print 'Example: compile.py sandbox tinyurl bitly'
+        sys.exit(1)
 
     # get list of services to compile
     if sys.argv[1] == '--all':
diff --git a/services/chilpit.py b/services/chilpit.py
@@ -9,20 +9,23 @@ def shrink(self, bigurl):
         resp = request('http://chilp.it/api.php', {'url': bigurl})
         url = resp.read()
         if url.startswith('http://'):
-            return url
+            return url.strip()
         else:
             raise ShortyError(url)
 
     def expand(self, tinyurl):
-        turl = urlparse(tinyurl)
+        Service.expand(self, tinyurl)
+
+        # needs fixing
+        """turl = urlparse(tinyurl)
         if turl.netloc.lstrip('www.') != 'chilp.it':
             raise ShortyError('Not a chilp.it url')
-        resp = request('http://p.chilp.it/api.php?' + turl.path.strip('/'))
+        resp = request('http://p.chilp.it/api.php?' + turl.query)
         url = resp.read()
         if url.startswith('http://'):
-            return url
+            return url.strip('\n\r')
         else:
-            raise ShortyError(url)
+            raise ShortyError(url)"""
 
     # get click stats of the tinyurl
     def stats(self, tinyurl):
diff --git a/shorty.py b/shorty.py
@@ -102,6 +102,20 @@ def http_error_302(self, req, fp, code, smg, headers):
 """Base interface that all services implement."""
 class Service(object):
 
+    tested = False
+
+    def _test(self):
+        self.tested = True
+
+        # first shrink an url
+        turl = self.shrink('http://test.com')
+
+        # second expand url and verify
+        if self.expand(turl) == 'http://test.com':
+            return True
+        else:
+            return False
+
     def shrink(self, bigurl):
         """Take a big url and make it smaller"""
         return None
@@ -433,20 +447,23 @@ def shrink(self, bigurl):
         resp = request('http://chilp.it/api.php', {'url': bigurl})
         url = resp.read()
         if url.startswith('http://'):
-            return url
+            return url.strip()
         else:
             raise ShortyError(url)
 
     def expand(self, tinyurl):
-        turl = urlparse(tinyurl)
+        Service.expand(self, tinyurl)
+
+        # needs fixing
+        """turl = urlparse(tinyurl)
         if turl.netloc.lstrip('www.') != 'chilp.it':
             raise ShortyError('Not a chilp.it url')
-        resp = request('http://p.chilp.it/api.php?' + turl.path.strip('/'))
+        resp = request('http://p.chilp.it/api.php?' + turl.query)
         url = resp.read()
         if url.startswith('http://'):
-            return url
+            return url.strip('\n\r')
         else:
-            raise ShortyError(url)
+            raise ShortyError(url)"""
 
     # get click stats of the tinyurl
     def stats(self, tinyurl):
diff --git a/test.py b/test.py
@@ -0,0 +1,25 @@
+# Shorty
+# Copyright 2009 Joshua Roesslein
+# See LICENSE
+
+import shorty
+
+print 'Running shorty tests...'
+
+passes = 0
+fails = 0
+
+for name, service in shorty.services.items():
+
+    try:
+        if service.tested:
+            # skip services with aliases
+            continue
+        service._test()
+        passes += 1
+        print 'PASS: <%s>' % name
+    except shorty.ShortyError, e:
+        fails += 1
+        print 'FAIL: <%s> %s' % (name, e)
+
+print 'PASSES: %i  FAILS: %i' % (passes, fails)
