53059cec9053a8429b7f0a8f06e6cbe1672b60e7,cellprofiler/modules/tests/test_groups.py,TestGroups,test_02_01_group_on_two,#TestGroups#,144

Before Change

                self.assertTrue(groupings.has_key((plate, site)))
                image_set_list = groupings[(plate, site)]
                self.assertEqual(len(image_set_list), 3)
                expected_image_set_list = \
                    sorted(filter(lambda x: x[0] == plate and x[2] == site, 
                                  image_sets.keys()))
                for image_set_key, expected_image_set_key in zip(
                    image_set_list, expected_image_set_list):
                    self.assertEqual(image_set_key, expected_image_set_key)
                
        
        

After Change

                ftr = "_".join((cpmeas.C_FILE_NAME, "DNA"))
                for image_number in image_set_list:
                    file_name = m[cpmeas.IMAGE, ftr, image_number]
                    p, w, s, rest = file_name.split("_")
                    self.assertEqual(p, plate)
                    self.assertEqual(s, site)
                

Instances