Fixup some test changes now that order is maintained

Author: TomAugspurger

pandas/core/categorical.py

@@ -1964,7 +1964,7 @@ def is_dtype_equal(self, other):
         """
 
         try:
-            return self.dtype is other.dtype
+            return hash(self.dtype) == hash(other.dtype)
         except (AttributeError, TypeError):
             return False
 

pandas/tests/test_categorical.py

@@ -141,8 +141,9 @@ def test_is_equal_dtype(self):
         c2 = Categorical(list('aabca'), categories=list('cab'), ordered=False)
         c3 = Categorical(list('aabca'), categories=list('cab'), ordered=True)
         assert c1.is_dtype_equal(c1)
-        assert c2.is_dtype_equal(c2)  # XXX: changed
+        assert c2.is_dtype_equal(c2)
         assert c3.is_dtype_equal(c3)
+        assert c1.is_dtype_equal(c2)
         assert not c1.is_dtype_equal(c3)
         assert not c1.is_dtype_equal(Index(list('aabca')))
         assert not c1.is_dtype_equal(c1.astype(object))
@@ -191,11 +192,8 @@ def f():
 
         c1 = Categorical(["a", "b", "c", "a"], categories=["a", "c", "b"])
         c2 = Categorical(c1, categories=["a", "b", "c"])
-        # XXX: change
-        # tm.assert_numpy_array_equal(c1.__array__(), c2.__array__())
-        assert set(c2.categories) == {'a', 'b', 'c'}
-        # XXX: change
-        # tm.assert_index_equal(c2.categories, Index(["a", "b", "c"]))
+        tm.assert_numpy_array_equal(c1.__array__(), c2.__array__())
+        tm.assert_index_equal(c2.categories, Index(["a", "b", "c"]))
 
         # Series of dtype category
         c1 = Categorical(["a", "b", "c", "a"], categories=["a", "b", "c", "d"])
@@ -814,14 +812,12 @@ def test_construction_with_ordered(self):
     def test_ordered_api(self):
         # GH 9347
         cat1 = pd.Categorical(["a", "c", "b"], ordered=False)
-        # XXX: changed
-        assert set(cat1.categories) == {'a', 'b', 'c'}
+        tm.assert_index_equal(cat1.categories, Index(['a', 'b', 'c']))
         assert not cat1.ordered
 
         cat2 = pd.Categorical(["a", "c", "b"], categories=['b', 'c', 'a'],
                               ordered=False)
-        # XXX: changed
-        assert set(cat1.categories) == {'a', 'b', 'c'}
+        tm.assert_index_equal(cat2.categories, Index(['b', 'c', 'a']))
         assert not cat2.ordered
 
         cat3 = pd.Categorical(["a", "c", "b"], ordered=True)
@@ -1224,8 +1220,7 @@ def test_unique(self):
                           categories=["a", "b", "c"])
         exp = Index(["c", "a", "b"])
         res = cat.unique()
-        # XXX: changed
-        assert set(res.categories) == set(exp)
+        tm.assert_index_equal(res.categories, exp)
         exp_cat = Categorical(exp, categories=['c', 'a', 'b'])
         tm.assert_categorical_equal(res, exp_cat)