paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-10 08:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

analytics: Set property and interval defaults in assertCountEquals.

Browse Source
This commit is contained in:
Rishi Gupta
2017-01-12 23:12:39 -08:00
committed by Tim Abbott
parent a563a15f88
commit f30b174199
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
analytics/tests/test_counts.py
View File

@@ -27,7 +27,11 @@ class AnalyticsTestCase(TestCase):
self.default_realm = Realm.objects.create( self.default_realm = Realm.objects.create(
string_id='realmtest', name='Realm Test', string_id='realmtest', name='Realm Test',
domain='test.analytics', date_created=self.TIME_ZERO - 2*self.DAY) domain='test.analytics', date_created=self.TIME_ZERO - 2*self.DAY)
# used to generate unique names in self.create_*
self.name_counter = 100 self.name_counter = 100
# used as defaults in self.assertCountEquals
self.current_property = None # type: Optional[str]
self.current_interval = None # type: Optional[str]
# Lightweight creation of users, streams, and messages # Lightweight creation of users, streams, and messages
def create_user(self, **kwargs): def create_user(self, **kwargs):
@@ -82,9 +86,13 @@ class AnalyticsTestCase(TestCase):
return Message.objects.create(**kwargs) return Message.objects.create(**kwargs)
# kwargs should only ever be a UserProfile or Stream. # kwargs should only ever be a UserProfile or Stream.
def assertCountEquals(self, table, property, value, subgroup=None, end_time=TIME_ZERO, def assertCountEquals(self, table, value, property=None, subgroup=None,
interval=CountStat.HOUR, realm=None, **kwargs): end_time=TIME_ZERO, interval=None, realm=None, **kwargs):
# type: (Type[BaseCount], Text, int, Optional[Text], datetime, str, Optional[Realm], **models.Model) -> None # type: (Type[BaseCount], int, Optional[Text], Optional[Text], datetime, Optional[str], Optional[Realm], **models.Model) -> None
if property is None:
property = self.current_property
if interval is None:
interval = self.current_interval
queryset = table.objects.filter(property=property, interval=interval, end_time=end_time) \ queryset = table.objects.filter(property=property, interval=interval, end_time=end_time) \
.filter(**kwargs) .filter(**kwargs)
if table is not InstallationCount: if table is not InstallationCount:
@@ -175,8 +183,9 @@ class TestCountStats(AnalyticsTestCase):
def test_active_users_by_is_bot(self): def test_active_users_by_is_bot(self):
# type: () -> None # type: () -> None
property = 'active_users:is_bot' stat = COUNT_STATS['active_users:is_bot']
stat = COUNT_STATS[property] self.current_property = stat.property
self.current_interval = stat.interval
# To be included # To be included
self.create_user(is_bot=True) self.create_user(is_bot=True)
@@ -188,15 +197,13 @@ class TestCountStats(AnalyticsTestCase):
do_fill_count_stat_at_hour(stat, self.TIME_ZERO) do_fill_count_stat_at_hour(stat, self.TIME_ZERO)
self.assertCountEquals(RealmCount, property, 2, subgroup='true', interval=stat.interval) self.assertCountEquals(RealmCount, 2, subgroup='true')
self.assertCountEquals(RealmCount, property, 1, subgroup='false', interval=stat.interval) self.assertCountEquals(RealmCount, 1, subgroup='false')
self.assertCountEquals(RealmCount, property, 3, subgroup='false', interval=stat.interval, self.assertCountEquals(RealmCount, 3, subgroup='false', realm=self.second_realm)
realm=self.second_realm) self.assertCountEquals(RealmCount, 1, subgroup='false', realm=self.no_message_realm)
self.assertCountEquals(RealmCount, property, 1, subgroup='false', interval=stat.interval,
realm=self.no_message_realm)
self.assertEqual(RealmCount.objects.count(), 4) self.assertEqual(RealmCount.objects.count(), 4)
self.assertCountEquals(InstallationCount, property, 2, subgroup='true', interval=stat.interval) self.assertCountEquals(InstallationCount, 2, subgroup='true')
self.assertCountEquals(InstallationCount, property, 5, subgroup='false', interval=stat.interval) self.assertCountEquals(InstallationCount, 5, subgroup='false')
self.assertEqual(InstallationCount.objects.count(), 2) self.assertEqual(InstallationCount.objects.count(), 2)
self.assertFalse(UserCount.objects.exists()) self.assertFalse(UserCount.objects.exists())
self.assertFalse(StreamCount.objects.exists()) self.assertFalse(StreamCount.objects.exists())