Updated tests for unsorted groupby

holoviz · Jun 13, 2018 · fa289bd · fa289bd
1 parent 6b974a1
commit fa289bd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/tests/core/data/base.py b/tests/core/data/base.py
@@ -579,7 +579,8 @@ def test_dataset_groupby(self):
         group2 = {'Age':[12], 'Weight':[10], 'Height':[0.8]}
         grouped = HoloMap([('M', Dataset(group1, kdims=['Age'], vdims=self.vdims)),
                            ('F', Dataset(group2, kdims=['Age'], vdims=self.vdims))],
-                          kdims=['Gender'])
+                          kdims=['Gender'], sort=False)
+        print(grouped.keys())
         self.assertEqual(self.table.groupby(['Gender']), grouped)
 
     def test_dataset_groupby_alias(self):
@@ -589,23 +590,17 @@ def test_dataset_groupby_alias(self):
                                          vdims=self.alias_vdims)),
                            ('F', Dataset(group2, kdims=[('age', 'Age')],
                                          vdims=self.alias_vdims))],
-                          kdims=[('gender', 'Gender')])
+                          kdims=[('gender', 'Gender')], sort=False)
         self.assertEqual(self.alias_table.groupby('Gender'), grouped)
 
-        self.gender, self.age = np.array(['M','M','F']), np.array([10,16,12])
-        self.weight, self.height = np.array([15,18,10]), np.array([0.8,0.6,0.8])
-        self.table = Dataset({'Gender':self.gender, 'Age':self.age,
-                              'Weight':self.weight, 'Height':self.height},
-                             kdims=self.kdims, vdims=self.vdims)
-
     def test_dataset_groupby_second_dim(self):
         group1 = {'Gender':['M'], 'Weight':[15], 'Height':[0.8]}
         group2 = {'Gender':['M'], 'Weight':[18], 'Height':[0.6]}
         group3 = {'Gender':['F'], 'Weight':[10], 'Height':[0.8]}
         grouped = HoloMap([(10, Dataset(group1, kdims=['Gender'], vdims=self.vdims)),
                            (16, Dataset(group2, kdims=['Gender'], vdims=self.vdims)),
                            (12, Dataset(group3, kdims=['Gender'], vdims=self.vdims))],
-                          kdims=['Age'])
+                          kdims=['Age'], sort=False)
         self.assertEqual(self.table.groupby(['Age']), grouped)
 
     def test_dataset_groupby_dynamic(self):

diff --git a/tests/core/data/testpandasinterface.py b/tests/core/data/testpandasinterface.py
@@ -131,7 +131,7 @@ def test_dataset_extract_vdims_with_kdims_defined(self):
     def test_multi_dimension_groupby(self):
         x, y, z = list('AB'*10), np.arange(20)%3, np.arange(20)
         ds = Dataset((x, y, z), kdims=['x', 'y'], vdims=['z'],  datatype=[self.datatype])
-        keys = [('A', 0), ('A', 1), ('A', 2), ('B', 0), ('B', 1), ('B', 2)]
+        keys = [('A', 0), ('B', 1), ('A', 2), ('B', 0), ('A', 1), ('B', 2)]
         grouped = ds.groupby(['x', 'y'])
         self.assertEqual(grouped.keys(), keys)
         group = Dataset({'z': [5, 11, 17]}, vdims=['z'])