Compatibility - change to Dolphin versions of a couple of base methods.

testRetrievingIncompatibleClassRaisesError - fix; verify the descriptions of the expected errors.

SSW ReStore Tables/Object.extension.st

@@ -68,16 +68,6 @@ Object class >> persistencyRootClass [
 	^self allSuperclasses detect: [ :sup | sup reStoreTableClass == SSWDBSuperTable]
 ]
 
-{ #category : #'*SSW ReStore Tables' }
-Object >> related [
-
-	"Return a related version of the receiver"
-
-	^SSWDBRelatedWrapper on: self
-
-
-]
-
 { #category : #'*SSW ReStore Tables' }
 Object class >> reStoreDefinition [
 
@@ -160,6 +150,16 @@ Object class >> reStoreValueClass [
 		ifFalse: [self reStoreIDClass]
 ]
 
+{ #category : #'*SSW ReStore Tables' }
+Object >> related [
+
+	"Return a related version of the receiver"
+
+	^SSWDBRelatedWrapper on: self
+
+
+]
+
 { #category : #'*SSW ReStore Tables' }
 Object class >> shouldInheritPersistency [
 

SSW ReStore Tables/SSWDBInheritedTable.class.st

@@ -80,9 +80,7 @@ SSWDBInheritedTable >> recoverInstanceFromRow: aDBRow into: anSSWDBObjectProxy [
 
 	| class |
 	class := self instanceClassFromRow: aDBRow.
-	self assert: (class includesBehavior: self instanceClass)
-		description: 
-			['Proxy for ' , self instanceClass name , ' retrieved a ' , class name , ' from the database.'].
+	(class includesBehavior: self instanceClass) ifFalse: [self error:  'Proxy for <1d> retrieved a <2d> from the database.' << {self instanceClass. class}].
 	anSSWDBObjectProxy _class: class.
 	(class = self instanceClass ifTrue: [self] ifFalse: [self reStore tableForClass: class])
 		recoverExactClassInstanceFromRow: aDBRow

SSW ReStore Tests/SSWReStoreHierarchyTest.class.st

@@ -51,16 +51,16 @@ SSWReStoreHierarchyTest >> _testClassOfProxyOfInstanceOf: aClass recoveredBy: aB
 	self assert: proxy _class equals: aClass.
 
 	"Check that all declared mutable properties have been properly copied"
-	aClass mutableAspects withIndexDo: 
-			[:sym :i |
+	aClass mutableAspects keysAndValuesDo: 
+			[:i :sym |
 			self deny: (proxy _proxiedObject perform: sym) == (proxy _copyObject perform: sym).
 			self deny: ((owner midFriend perform: sym) isBitSet: i).	"Sanity check, bitmask initializes with 0"
 			(owner midFriend perform: sym) bitSet: i].
 	owner midFriend storeIn: reStore.
 	reStore simulateReconnect.
 	owner := (MidPerson storedInstancesIn: reStore) detect: [:each | each firstName = 'owner'].
 	aClass mutableAspects
-		withIndexDo: [:sym :i | self assert: ((owner midFriend perform: sym) isBitSet: i)].
+		keysAndValuesDo: [:i :sym | self assert: ((owner midFriend perform: sym) isBitSet: i)]
 ]
 
 { #category : #running }
@@ -335,10 +335,12 @@ SSWReStoreHierarchyTest >> testInheritanceStructureWithoutIntermediateInheritanc
 SSWReStoreHierarchyTest >> testRetrievingIncompatibleClassRaisesError [
 	| detailedID midID |
 	midID := (reStore instancesOf: MidPerson) first _id.
-	detailedID := (DetailedPerson1 new storeIn: reStore) _id.
+	DetailedPerson1 new storeIn: reStore.
+	detailedID := (reStore instancesOf: DetailedPerson1) first _id.
 	reStore simulateReconnect.
+
 	"Attempt to retrieve what is actually a DetailedPerson as if it were a MidPerson (siblings)"
-	self should: [(reStore deferredObjectOfClass: MidPerson withID: detailedID) firstName] raise: Error.
+	self should: [(reStore deferredObjectOfClass: MidPerson withID: detailedID) firstName] raise: Error description: 'Proxy for MidPerson retrieved a DetailedPerson1 from the database.'.
 	"As above, but parent of the declared class"
-	self should: [(reStore deferredObjectOfClass: SubPerson withID: midID) firstName] raise: Error.
+	self should: [(reStore deferredObjectOfClass: SubPerson withID: midID) firstName] raise: Error description: 'Proxy for SubPerson retrieved a MidPerson from the database.'
 ]