@@ -35,22 +35,10 @@ public ArchitectureCacheKeyTests()
3535 private readonly ArchitectureCacheKey _duplicateArchitectureCacheKey ;
3636
3737 [ Fact ]
38- public void ArchitectureCacheKeyContentEquivalentsAreEqual ( )
38+ public void ArchitectureCacheKeyContentEquivalentsAreStringEqual ( )
3939 {
4040 object contentEquivalent = new ArchitectureCacheKey ( ) ;
41- Assert . True ( _architectureCacheKey . Equals ( contentEquivalent ) ) ;
42- }
43-
44- [ Fact ]
45- public void ArchitectureCacheKeyDoesNotEqualNull ( )
46- {
47- Assert . False ( _architectureCacheKey . Equals ( ( object ) null ) ) ;
48- }
49-
50- [ Fact ]
51- public void ArchitectureCacheKeyIsEqualToItself ( )
52- {
53- Assert . True ( _architectureCacheKey . Equals ( _architectureCacheKey ) ) ;
41+ Assert . Equal ( _architectureCacheKey , ( ArchitectureCacheKey ) contentEquivalent , ArchitectureCacheKeysHaveSameToString ) ;
5442 }
5543
5644 [ Fact ]
@@ -62,7 +50,7 @@ public void DuplicateAssemblies()
6250 duplicateCacheKey . Add ( _baseClassModuleName , null ) ;
6351 duplicateCacheKey . Add ( _baseClassModuleName , null ) ;
6452
65- Assert . Equal ( _architectureCacheKey , duplicateCacheKey ) ;
53+ Assert . Equal ( _architectureCacheKey , duplicateCacheKey , ArchitectureCacheKeysHaveSameToString ) ;
6654 }
6755
6856 [ Fact ]
@@ -75,7 +63,7 @@ public void DuplicateAssembliesDifferentOrder()
7563 reverseOrderCacheKey . Add ( _architectureCacheTestsClassModuleName , null ) ;
7664 reverseOrderCacheKey . Add ( _baseClassModuleName , null ) ;
7765
78- Assert . Equal ( _architectureCacheKey , reverseOrderCacheKey ) ;
66+ Assert . Equal ( _architectureCacheKey , reverseOrderCacheKey , ArchitectureCacheKeysHaveSameToString ) ;
7967 }
8068
8169 [ Fact ]
@@ -87,7 +75,7 @@ public void DuplicateFilteredNamespaces()
8775 duplicateCacheKey . Add ( _baseClassModuleName , _memberDependencyTests ) ;
8876 duplicateCacheKey . Add ( _baseClassModuleName , _memberDependencyTests ) ;
8977
90- Assert . Equal ( _architectureCacheKey , duplicateCacheKey ) ;
78+ Assert . Equal ( _architectureCacheKey , duplicateCacheKey , ArchitectureCacheKeysHaveSameToString ) ;
9179 }
9280
9381 [ Fact ]
@@ -100,7 +88,7 @@ public void DuplicateNamespacesDifferentOrder()
10088 reverseOrderCacheKey . Add ( _baseClassModuleName , _attributeDependencyTests ) ;
10189 reverseOrderCacheKey . Add ( _baseClassModuleName , _memberDependencyTests ) ;
10290
103- Assert . Equal ( _architectureCacheKey , reverseOrderCacheKey ) ;
91+ Assert . Equal ( _architectureCacheKey , reverseOrderCacheKey , ArchitectureCacheKeysHaveSameToString ) ;
10492 }
10593
10694 [ Fact ]
@@ -109,16 +97,21 @@ public void SameArchitecturesProduceSameArchitectureCacheKey()
10997 _architectureCacheKey . Add ( _baseClassModuleName , null ) ;
11098 _duplicateArchitectureCacheKey . Add ( _baseClassModuleName , null ) ;
11199
112- Assert . Equal ( _architectureCacheKey , _duplicateArchitectureCacheKey ) ;
100+ Assert . Equal ( _architectureCacheKey , _duplicateArchitectureCacheKey , ArchitectureCacheKeysHaveSameToString ) ;
113101 }
114102
115103 [ Fact ]
116- public void SameObjectReferenceIsSameArchitectureCacheKet ( )
104+ public void SameObjectReferenceIsSameArchitectureCacheKey ( )
117105 {
118106 _architectureCacheKey . Add ( _baseClassModuleName , null ) ;
119107 object referenceDuplicate = _architectureCacheKey ;
120108
121109 Assert . True ( _architectureCacheKey . Equals ( referenceDuplicate ) ) ;
122110 }
111+
112+ private static bool ArchitectureCacheKeysHaveSameToString ( ArchitectureCacheKey first , ArchitectureCacheKey second )
113+ {
114+ return first . ToString ( ) . Equals ( second . ToString ( ) ) ;
115+ }
123116 }
124117}
0 commit comments