From aaa5ba223a42acd1cab40a0af823a8b8542e7261 Mon Sep 17 00:00:00 2001
From: etyemyer <etyemyer@gmail.com>
Date: Sun, 14 Jun 2015 23:45:09 +0300
Subject: [PATCH] UserApi_Test - test getuserbytoken with valid,invalid and
 empty string CampusesApi_test -  with valid,invalid string

---
 Testing/CampusAPI_Test.py | 20 ++++++++++++--------
 Testing/UserAPI_Test.py   |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Testing/CampusAPI_Test.py b/Testing/CampusAPI_Test.py
index 6f0c6e4..d43f62f 100644
--- a/Testing/CampusAPI_Test.py
+++ b/Testing/CampusAPI_Test.py
@@ -3,7 +3,8 @@ import unittest
 import requests
 from Testing.config import __CONFIG__
 class UserTestPlan(unittest.TestCase):
-       def setUpClass(cls):
+    @classmethod
+    def setUpClass(cls):
         debug = __CONFIG__['DEBUG']
         if debug:
             url = __CONFIG__['PATHS']['DEBUG']
@@ -14,13 +15,16 @@ class UserTestPlan(unittest.TestCase):
         if 200 <= request.status_code <= 299:
             print 'Initialized'
 
-        def test_Campuses_invalid(self):
-           r = requests.get(self.__class__.url_+'api/Campuses/invalidtoken')
-           self.assertEquals(r.status_code, 403)
-        def test_Campuses_valid(self):
-            r = requests.get(self.__class__.url_+'api/Campuses/'+__CONFIG__['TOKENS']['STUDENT'])
-            self.assertEquals(r.status_code, 200)
-            self.assertEquals(r.json()['username'], 'qa_student')
+    def test_Campuses_invalidToken(self):
+        r = requests.get(self.__class__.url_+'api/Campuses/invalidtoken')
+        self.assertEquals(r.status_code, 403)
+
+    def test_Campuses_validToken_testArraySize(self):
+        r = requests.get(self.__class__.url_+'api/Campuses/'+__CONFIG__['TOKENS']['STUDENT'])
+        self.assertEquals(r.status_code, 200)
+        self.assertTrue(len(r.json())>= 1)
+
+
 
 if __name__ == '__main__':
     unittest.main()
\ No newline at end of file
diff --git a/Testing/UserAPI_Test.py b/Testing/UserAPI_Test.py
index 67b9cf6..f1ba2d8 100644
--- a/Testing/UserAPI_Test.py
+++ b/Testing/UserAPI_Test.py
@@ -30,7 +30,7 @@ class UserTestPlan(unittest.TestCase):
     def test_getUserByToken_empty(self):
          r = requests.get(self.__class__.url_+'api/getUserByToken/')
          self.assertEquals(r.status_code, 400)
-
+    
 
 
 if __name__ == '__main__':