@@ -519,433 +520,434 @@
from coverage import coverage
cov = coverage(branch=True, omit=['/usr/local/lib/python2.7/dist-packages/*',
'/usr/local/lib/python2.7/site-packages/*',
- 'test_app.py', 'config.py', 'test_config.py'])
-cov.start()
-cov.exclude('pragma')
-
-import unittest
-import json
-from app import db, app, Person, Event, Group
-
-class SignupTestCase(unittest.TestCase):
-
- def setUp(self):
- """
- Creates a new database for the unit test to use
- """
- app.config.from_pyfile('test_config.py')
- db.init_app(app)
- db.create_all()
-
- self.app = app.test_client()
- return self.app
-
- def tearDown(self):
- db.drop_all()
-
- def test_user_signup(self):
- response = self.app.post('/signup', data = json.dumps(dict(
- email='abc@columbia.edu',
- password='passwd',
- lastname='ab',
- firstname='cd'
- )))
- assert response.status_code == 200
-
- def test_existant_user(self):
- self.app.post('/signup', data = json.dumps(dict(
- email='abc@columbia.edu',
- password='passwd',
- lastname='ab',
- firstname='cd'
- )))
- # Duplicate accounts
- response = self.app.post('/signup', data = json.dumps(dict(
- email='abc@columbia.edu',
- password='passwd',
- lastname='ab',
- firstname='cd'
- )))
-
- assert response.status_code == 409
-
- def test_incomplete_data(self):
- '''
- Missing email, password, firstname, lastname
- '''
- resp = self.app.post('/signup', data = json.dumps(dict(
- password='passwd',
- firstname='cd',
- lastname='ab'
- )))
- assert resp.status_code == 400
-
- resp = self.app.post('/signup', data = json.dumps(dict(
- email='abc@columbia.edu',
- firstname='cd',
- lastname='ab'
- )))
- assert resp.status_code == 400
-
- resp = self.app.post('/signup', data = json.dumps(dict(
- email='abc@columbia.edu',
- password='passwd',
- lastname='ab'
- )))
- assert resp.status_code == 400
-
- resp = self.app.post('/signup', data = json.dumps(dict(
- email='abc@columbia.edu',
- password='passwd',
- firstname='cd'
- )))
- assert resp.status_code == 400
-
+ '/home/travis/virtualenv/python2.7.9/lib/python2.7/site-packages/*',
+ 'test_app.py', 'config.py', 'test_config.py'])
+cov.start()
+cov.exclude('pragma')
+
+import unittest
+import json
+from app import db, app, Person, Event, Group
+
+class SignupTestCase(unittest.TestCase):
+
+ def setUp(self):
+ """
+ Creates a new database for the unit test to use
+ """
+ app.config.from_pyfile('test_config.py')
+ db.init_app(app)
+ db.create_all()
+
+ self.app = app.test_client()
+ return self.app
+
+ def tearDown(self):
+ db.drop_all()
+
+ def test_user_signup(self):
+ response = self.app.post('/signup', data = json.dumps(dict(
+ email='abc@columbia.edu',
+ password='passwd',
+ lastname='ab',
+ firstname='cd'
+ )))
+ assert response.status_code == 200
+
+ def test_existant_user(self):
+ self.app.post('/signup', data = json.dumps(dict(
+ email='abc@columbia.edu',
+ password='passwd',
+ lastname='ab',
+ firstname='cd'
+ )))
+ # Duplicate accounts
+ response = self.app.post('/signup', data = json.dumps(dict(
+ email='abc@columbia.edu',
+ password='passwd',
+ lastname='ab',
+ firstname='cd'
+ )))
+
+ assert response.status_code == 409
+
+ def test_incomplete_data(self):
+ '''
+ Missing email, password, firstname, lastname
+ '''
+ resp = self.app.post('/signup', data = json.dumps(dict(
+ password='passwd',
+ firstname='cd',
+ lastname='ab'
+ )))
+ assert resp.status_code == 400
+
+ resp = self.app.post('/signup', data = json.dumps(dict(
+ email='abc@columbia.edu',
+ firstname='cd',
+ lastname='ab'
+ )))
+ assert resp.status_code == 400
+
+ resp = self.app.post('/signup', data = json.dumps(dict(
+ email='abc@columbia.edu',
+ password='passwd',
+ lastname='ab'
+ )))
+ assert resp.status_code == 400
+
+ resp = self.app.post('/signup', data = json.dumps(dict(
+ email='abc@columbia.edu',
+ password='passwd',
+ firstname='cd'
+ )))
+ assert resp.status_code == 400
-class LoginTestCase(unittest.TestCase):
-
- def setUp(self):
- """
- Creates a new database for the unit test to use
- """
- app.config.from_pyfile('test_config.py')
- db.init_app(app)
- db.create_all()
-
- self.app = app.test_client()
-
- # Create test user
- new_user = Person(
- 'validuser@columbia.edu',
- 'validpassword',
- 'test',
- 'testerson'
- )
- db.session.add(new_user)
- db.session.commit()
-
- return self.app
-
- def tearDown(self):
- db.drop_all()
-
- def test_user_login(self):
- response = self.app.post('/login', data = json.dumps(dict(
- exist_email='validuser@columbia.edu',
- exist_password='validpassword'
- )))
- assert response.status_code == 200
-
- def test_invalid_username(self):
- response = self.app.post('/login', data = json.dumps(dict(
- exist_email='wronguser@columbia.edu',
- exist_password='validpassword'
- )))
- assert response.status_code == 400
-
- def test_invalid_password(self):
- response = self.app.post('/login', data = json.dumps(dict(
- exist_email='validuser@columbia.edu',
- exist_password='wrongpassword'
- )))
- assert response.status_code == 400
-
-class BrowseTestCase(unittest.TestCase):
-
- def setUp(self):
- """
- Creates a new database for the unit test to use
- """
- app.config.from_pyfile('test_config.py')
- db.init_app(app)
- db.create_all()
-
- self.app = app.test_client()
- return self.app
-
- def tearDown(self):
- db.drop_all()
-
- def test_root_unlogined(self):
- response = self.app.get('/')
- assert response.location == 'http://localhost/login/index.html'
-
+
+class LoginTestCase(unittest.TestCase):
+
+ def setUp(self):
+ """
+ Creates a new database for the unit test to use
+ """
+ app.config.from_pyfile('test_config.py')
+ db.init_app(app)
+ db.create_all()
+
+ self.app = app.test_client()
+
+ # Create test user
+ new_user = Person(
+ 'validuser@columbia.edu',
+ 'validpassword',
+ 'test',
+ 'testerson'
+ )
+ db.session.add(new_user)
+ db.session.commit()
+
+ return self.app
+
+ def tearDown(self):
+ db.drop_all()
+
+ def test_user_login(self):
+ response = self.app.post('/login', data = json.dumps(dict(
+ exist_email='validuser@columbia.edu',
+ exist_password='validpassword'
+ )))
+ assert response.status_code == 200
+
+ def test_invalid_username(self):
+ response = self.app.post('/login', data = json.dumps(dict(
+ exist_email='wronguser@columbia.edu',
+ exist_password='validpassword'
+ )))
+ assert response.status_code == 400
+
+ def test_invalid_password(self):
+ response = self.app.post('/login', data = json.dumps(dict(
+ exist_email='validuser@columbia.edu',
+ exist_password='wrongpassword'
+ )))
+ assert response.status_code == 400
+
+class BrowseTestCase(unittest.TestCase):
+
+ def setUp(self):
+ """
+ Creates a new database for the unit test to use
+ """
+ app.config.from_pyfile('test_config.py')
+ db.init_app(app)
+ db.create_all()
+
+ self.app = app.test_client()
+ return self.app
+
+ def tearDown(self):
+ db.drop_all()
+
+ def test_root_unlogined(self):
+ response = self.app.get('/')
+ assert response.location == 'http://localhost/login/index.html'
-class EventsTestCase(unittest.TestCase):
-
- def setUp(self):
- """
- Creates a new database for the unit test to use
- """
- app.config.from_pyfile('test_config.py')
- db.init_app(app)
- db.create_all()
-
- app.config['TESTING'] = True
- app.login_manager.init_app(app)
-
- self.app = app.test_client()
-
- self.app.post('/signup', data = json.dumps(dict(
- email='abc@columbia.edu',
- password='passwd',
- lastname='ab',
- firstname='cd'
- )))
-
- self.app.post('/login', data = json.dumps(dict(
- exist_email='abc@columbia.edu',
- exist_password='passwd'
- )))
-
+
+class EventsTestCase(unittest.TestCase):
+
+ def setUp(self):
+ """
+ Creates a new database for the unit test to use
+ """
+ app.config.from_pyfile('test_config.py')
+ db.init_app(app)
+ db.create_all()
+
+ app.config['TESTING'] = True
+ app.login_manager.init_app(app)
+
+ self.app = app.test_client()
+
+ self.app.post('/signup', data = json.dumps(dict(
+ email='abc@columbia.edu',
+ password='passwd',
+ lastname='ab',
+ firstname='cd'
+ )))
+
+ self.app.post('/login', data = json.dumps(dict(
+ exist_email='abc@columbia.edu',
+ exist_password='passwd'
+ )))
- def tearDown(self):
- db.drop_all()
-
+
+ def tearDown(self):
+ db.drop_all()
- def test_no_events(self):
- response = self.app.get('/events',
- content_type='application/json'
- )
- data = json.loads(response.data)
- assert len(data['events']) == 0
-
- def test_insert_event_lackinfo(self):
- # Add a group to test DB
- db.session.add(Group({
- 'group_id': '456',
- 'group': 'testgroup'
- }))
- # Add an event to test DB
- db.session.commit()
-
- db.session.add(Event({
- 'id': '000',
- 'group_id': '456'
- }))
- db.session.commit()
- response = self.app.get('/events',
- content_type='application/json'
- )
- data = json.loads(response.data)
- assert len(data['events']) == 1
-
- def test_events_returned(self):
- # Add a group to test DB
- agroup = Group({
- 'group_id': '456',
- 'group': 'testgroup'
- })
- print agroup
- db.session.add(agroup)
- # Add an event to test DB
- db.session.commit()
-
- db.session.add(Event({
- 'id': '123',
- 'datetime': '1993-11-17T12:00:00',
- 'location': 'mars',
- 'group_id': '456',
- 'title': 'a new event',
- 'url': 'http://www.testevent.com',
- 'photo_url': 'http://www.testphotourl.com'
- }))
-
- db.session.commit()
-
- response = self.app.get('/events',
- content_type='application/json'
- )
- data = json.loads(response.data)
- assert len(data['events']) == 1
-
+
+ def test_no_events(self):
+ response = self.app.get('/events',
+ content_type='application/json'
+ )
+ data = json.loads(response.data)
+ assert len(data['events']) == 0
+
+ def test_insert_event_lackinfo(self):
+ # Add a group to test DB
+ db.session.add(Group({
+ 'group_id': '456',
+ 'group': 'testgroup'
+ }))
+ # Add an event to test DB
+ db.session.commit()
+
+ db.session.add(Event({
+ 'id': '000',
+ 'group_id': '456'
+ }))
+ db.session.commit()
+ response = self.app.get('/events',
+ content_type='application/json'
+ )
+ data = json.loads(response.data)
+ assert len(data['events']) == 1
+
+ def test_events_returned(self):
+ # Add a group to test DB
+ agroup = Group({
+ 'group_id': '456',
+ 'group': 'testgroup'
+ })
+ print agroup
+ db.session.add(agroup)
+ # Add an event to test DB
+ db.session.commit()
+
+ db.session.add(Event({
+ 'id': '123',
+ 'datetime': '1993-11-17T12:00:00',
+ 'location': 'mars',
+ 'group_id': '456',
+ 'title': 'a new event',
+ 'url': 'http://www.testevent.com',
+ 'photo_url': 'http://www.testphotourl.com'
+ }))
+
+ db.session.commit()
+
+ response = self.app.get('/events',
+ content_type='application/json'
+ )
+ data = json.loads(response.data)
+ assert len(data['events']) == 1
-class FavoritesTestCase(unittest.TestCase):
-
- def setUp(self):
- """
- Creates a new database for the unit test to use
- """
- app.config.from_pyfile('test_config.py')
- db.init_app(app)
- db.create_all()
-
- self.app = app.test_client()
-
- new_user = Person(
- 'asdf123@columbia.edu',
- 'asdf',
- 'test',
- 'testerson'
- )
-
- db.session.add(new_user)
- db.session.add(Group({
- 'group_id':'12345',
- 'group':'groupname'
- }))
- db.session.commit()
- db.session.add(Event({
- 'id': '123',
- 'datetime': '1993-11-17T12:00:00',
- 'location': 'mars',
- 'group_id':'12345',
- 'group': 'columbiagroup',
- 'title': 'a new event',
- 'group_url': 'http://www.google.com'
- }))
-
- db.session.commit()
-
- self.app.post('/login', data = json.dumps(dict(
- exist_email='asdf123@columbia.edu',
- exist_password='asdf'
- )))
-
- return self.app
-
- def tearDown(self):
- db.drop_all()
-
- def test_set_unset_favorite(self):
- response = self.app.post('/favorite', data = json.dumps(dict(
- id='123'
- )))
- assert response.status_code == 200
-
- response = self.app.delete('/favorite', data = json.dumps(dict(
- id='123'
- )))
- assert response.status_code == 200
-
- def test_dup_set_fav(self):
- response = self.app.post('/favorite', data = json.dumps(dict(
- id='123'
- )))
- assert response.status_code == 200
-
- response = self.app.post('/favorite', data = json.dumps(dict(
- id='123'
- )))
- assert response.status_code == 409
-
- def test_unset_nothing(self):
- response = self.app.delete('/favorite', data = json.dumps(dict(
- id='123'
- )))
- assert response.status_code == 404
-
-class RatingTestCase(unittest.TestCase):
-
- def setUp(self):
- """
- Creates a new database for the unit test to use
- """
- app.config.from_pyfile('test_config.py')
- db.init_app(app)
- db.create_all()
-
- self.app = app.test_client()
-
- new_user = Person(
- 'asdf123@columbia.edu',
- 'asdf',
- 'test',
- 'testerson'
- )
-
- db.session.add(new_user)
- db.session.add(Group({
- 'group_id':'12345',
- 'group':'groupname'
- }))
- db.session.commit()
- db.session.add(Event({
- 'id': '123',
- 'datetime': '1993-11-17T12:00:00',
- 'location': 'mars',
- 'group_id': '12345',
- 'title': 'a new event',
- 'url': 'http://www.testevent.com',
- 'photo_url': 'http://www.testphotourl.com'
- }))
-
- db.session.commit()
-
- self.app.post('/login', data = json.dumps(dict(
- exist_email='asdf123@columbia.edu',
- exist_password='asdf'
- )))
-
- return self.app
-
- def tearDown(self):
- db.drop_all()
-
- def test_show_default_rating(self):
- response = self.app.get('/events',
- content_type='application/json'
- )
- data = json.loads(response.data)
- assert data['events'][0]['rating'] == 5
-
- def test_rate(self):
- response = self.app.post('/rate', data = json.dumps(dict(
- group_id='12345',
- rate_value=1
- )))
- assert response.status_code == 200
-
- response = self.app.get('/events',
- content_type='application/json'
- )
- data = json.loads(response.data)
- assert data['events'][0]['rating'] == 3
-
- def test_duprate(self):
- response = self.app.post('/rate', data = json.dumps(dict(
- group_id='12345',
- rate_value=1
- )))
- assert response.status_code == 200
-
- response = self.app.get('/events',
- content_type='application/json'
- )
- data = json.loads(response.data)
- assert data['events'][0]['rating'] == 3
-
- response = self.app.post('/rate', data = json.dumps(dict(
- group_id='12345',
- rate_value=3
- )))
- assert response.status_code == 200
-
- response = self.app.get('/events',
- content_type='application/json'
- )
- data = json.loads(response.data)
- assert data['events'][0]['rating'] == 4
-
-if __name__ == '__main__':
- # with open('test_app.py') as f:
- # for l in f:
- # if 'def test_' in l and 'if' not in l:
- # print l.strip()
-
- try:
- unittest.main()
- except:
- pass
- cov.stop()
- cov.save()
- print("\n\nCoverage Report:\n")
- cov.report()
-
- cov.html_report()
- cov.erase()
+
+class FavoritesTestCase(unittest.TestCase):
+
+ def setUp(self):
+ """
+ Creates a new database for the unit test to use
+ """
+ app.config.from_pyfile('test_config.py')
+ db.init_app(app)
+ db.create_all()
+
+ self.app = app.test_client()
+
+ new_user = Person(
+ 'asdf123@columbia.edu',
+ 'asdf',
+ 'test',
+ 'testerson'
+ )
+
+ db.session.add(new_user)
+ db.session.add(Group({
+ 'group_id':'12345',
+ 'group':'groupname'
+ }))
+ db.session.commit()
+ db.session.add(Event({
+ 'id': '123',
+ 'datetime': '1993-11-17T12:00:00',
+ 'location': 'mars',
+ 'group_id':'12345',
+ 'group': 'columbiagroup',
+ 'title': 'a new event',
+ 'group_url': 'http://www.google.com'
+ }))
+
+ db.session.commit()
+
+ self.app.post('/login', data = json.dumps(dict(
+ exist_email='asdf123@columbia.edu',
+ exist_password='asdf'
+ )))
+
+ return self.app
+
+ def tearDown(self):
+ db.drop_all()
+
+ def test_set_unset_favorite(self):
+ response = self.app.post('/favorite', data = json.dumps(dict(
+ id='123'
+ )))
+ assert response.status_code == 200
+
+ response = self.app.delete('/favorite', data = json.dumps(dict(
+ id='123'
+ )))
+ assert response.status_code == 200
+
+ def test_dup_set_fav(self):
+ response = self.app.post('/favorite', data = json.dumps(dict(
+ id='123'
+ )))
+ assert response.status_code == 200
+
+ response = self.app.post('/favorite', data = json.dumps(dict(
+ id='123'
+ )))
+ assert response.status_code == 409
+
+ def test_unset_nothing(self):
+ response = self.app.delete('/favorite', data = json.dumps(dict(
+ id='123'
+ )))
+ assert response.status_code == 404
+
+class RatingTestCase(unittest.TestCase):
+
+ def setUp(self):
+ """
+ Creates a new database for the unit test to use
+ """
+ app.config.from_pyfile('test_config.py')
+ db.init_app(app)
+ db.create_all()
+
+ self.app = app.test_client()
+
+ new_user = Person(
+ 'asdf123@columbia.edu',
+ 'asdf',
+ 'test',
+ 'testerson'
+ )
+
+ db.session.add(new_user)
+ db.session.add(Group({
+ 'group_id':'12345',
+ 'group':'groupname'
+ }))
+ db.session.commit()
+ db.session.add(Event({
+ 'id': '123',
+ 'datetime': '1993-11-17T12:00:00',
+ 'location': 'mars',
+ 'group_id': '12345',
+ 'title': 'a new event',
+ 'url': 'http://www.testevent.com',
+ 'photo_url': 'http://www.testphotourl.com'
+ }))
+
+ db.session.commit()
+
+ self.app.post('/login', data = json.dumps(dict(
+ exist_email='asdf123@columbia.edu',
+ exist_password='asdf'
+ )))
+
+ return self.app
+
+ def tearDown(self):
+ db.drop_all()
+
+ def test_show_default_rating(self):
+ response = self.app.get('/events',
+ content_type='application/json'
+ )
+ data = json.loads(response.data)
+ assert data['events'][0]['rating'] == 5
+
+ def test_rate(self):
+ response = self.app.post('/rate', data = json.dumps(dict(
+ group_id='12345',
+ rate_value=1
+ )))
+ assert response.status_code == 200
+
+ response = self.app.get('/events',
+ content_type='application/json'
+ )
+ data = json.loads(response.data)
+ assert data['events'][0]['rating'] == 3
+
+ def test_duprate(self):
+ response = self.app.post('/rate', data = json.dumps(dict(
+ group_id='12345',
+ rate_value=1
+ )))
+ assert response.status_code == 200
+
+ response = self.app.get('/events',
+ content_type='application/json'
+ )
+ data = json.loads(response.data)
+ assert data['events'][0]['rating'] == 3
+
+ response = self.app.post('/rate', data = json.dumps(dict(
+ group_id='12345',
+ rate_value=3
+ )))
+ assert response.status_code == 200
+
+ response = self.app.get('/events',
+ content_type='application/json'
+ )
+ data = json.loads(response.data)
+ assert data['events'][0]['rating'] == 4
+
+if __name__ == '__main__':
+ # with open('test_app.py') as f:
+ # for l in f:
+ # if 'def test_' in l and 'if' not in l:
+ # print l.strip()
+
+ try:
+ unittest.main()
+ except:
+ pass
+ cov.stop()
+ cov.save()
+ print("\n\nCoverage Report:\n")
+ cov.report()
+
+ cov.html_report()
+ cov.erase()
|
@@ -956,7 +958,7 @@