Added more test cases

Author: julesyan

pandas/core/groupby/_test_get_groups.py

@@ -1,6 +1,6 @@
-# DO NOT MERGE _test_get_groups.py WITH ACTUAL PANDAS 
-# DO NOT MERGE _test_get_groups.py WITH ACTUAL PANDAS 
-# DO NOT MERGE _test_get_groups.py WITH ACTUAL PANDAS 
+# DO NOT MERGE _test_get_groups.py WITH ACTUAL PANDAS
+# DO NOT MERGE _test_get_groups.py WITH ACTUAL PANDAS
+# DO NOT MERGE _test_get_groups.py WITH ACTUAL PANDAS
 
 import unittest
 
@@ -9,7 +9,7 @@
 import numpy as np
 
 class _test_get_groups(unittest.TestCase):
-    def test_cero_discovered_invalid(self):
+    def test_discovered_invalid(self):
         df = DataFrame(data={
             'A': ['a1', 'a2', None],
             'B': ['b1', 'b2', 'b1'],
@@ -18,7 +18,7 @@ def test_cero_discovered_invalid(self):
         grps = df.groupby(by=['A', 'B'])
         self.assertRaises(KeyError, grps.get_group, ('a1', 'b2'))
 
-    def test_uno_single_row_valid(self):
+    def test_single_row_valid(self):
         df = DataFrame(data={
             'A': ['a1', 'a2', None],
             'B': ['b1', 'b2', 'b1'],
@@ -32,7 +32,7 @@ def test_uno_single_row_valid(self):
         grps = df.groupby(by=['A', 'B'])
         assert_frame_equal(grps.get_group(('a1', 'b1')), expected)
 
-    def test_dos_alternate_invalid(self):
+    def test_alternate_invalid(self):
         df = DataFrame(data={
             'A': ['a1', 'a2', None],
             'B': ['b1', 'b2', 'b1'],
@@ -41,7 +41,7 @@ def test_dos_alternate_invalid(self):
         grps = df.groupby(by=['A', 'B'])
         self.assertRaises(KeyError, grps.get_group, ('a2', 'b1'))
 
-    def test_tres_double_row_valid(self):
+    def test_double_row_valid(self):
         df = DataFrame(data={
             'A': ['a1', 'a2', None],
             'B': ['b1', 'b2', 'b1'],
@@ -55,7 +55,7 @@ def test_tres_double_row_valid(self):
         grps = df.groupby(by=['B'])
         self.assertEqual(True, np.array_equal(grps.get_group(('b1')).values, expected.values))
 
-    def test_cuatro_expect_empty(self):
+    def test_expect_empty(self):
         df = DataFrame(data={
             'A': ['a1', 'a2', None],
             'B': ['b1', 'b2', 'b1'],
@@ -64,7 +64,7 @@ def test_cuatro_expect_empty(self):
         grps = df.groupby(by=['B'])
         self.assertRaises(KeyError, grps.get_group, ('b3'))
 
-    def test_cinco_double_row_valid(self):
+    def test_double_row_valid(self):
         df = DataFrame({'Animal': ['Falcon', 'Falcon',
                                    'Parrot', 'Parrot'],
                         'Max Speed': [380., 370., 24., 26.],
@@ -75,7 +75,35 @@ def test_cinco_double_row_valid(self):
         grps = df.groupby(['Animal'])
         assert_frame_equal(grps.get_group(('Falcon')), expected)
 
+    def test_multi_group_multi_result(self):
+        df = DataFrame([('bird', 'Falconiformes', 389.0),
+                        ('bird', 'Psittaciformes', 24.0),
+                        ('mammal', 'Carnivora', 80.2),
+                        ('mammal', 'Primates', None),
+                        ('mammal', 'Carnivora', 58)],
+                        index=['falcon', 'parrot', 'lion', 'monkey', 'leopard'],
+                        columns=('class', 'order', 'max_speed'))
+        expected = DataFrame([('mammal', 'Carnivora', 80.2),
+                        ('mammal', 'Carnivora', 58)],
+                        index=['lion', 'leopard'],
+                        columns=('class', 'order', 'max_speed'))
+        grps = df.groupby(['class', 'order']);
+        assert_frame_equal(grps.get_group(('mammal','Carnivora')), expected)
 
+    def test_single_group_no_tuple(self):
+        df = DataFrame([('bird', 'Falconiformes', 389.0),
+                        ('bird', 'Psittaciformes', 24.0),
+                        ('mammal', 'Carnivora', 80.2),
+                        ('mammal', 'Primates', None),
+                        ('mammal', 'Carnivora', 58)],
+                        index=['falcon', 'parrot', 'lion', 'monkey', 'leopard'],
+                        columns=('class', 'order', 'max_speed'))
+        expected = DataFrame([('bird', 'Falconiformes', 389.0),
+                        ('bird', 'Psittaciformes', 24.0)],
+                        index=['falcon', 'parrot'],
+                        columns=('class', 'order', 'max_speed'))
+        grps = df.groupby(['class']);
+        assert_frame_equal(grps.get_group('bird'), expected)
 
 if __name__ == '__main__':
     unittest.main()