tests for module Keyframes are complete

hpi-swa-teaching · Aug 2, 2022 · 867461d · 867461d
1 parent 8ca512c
commit 867461d
Show file tree

Hide file tree

Showing 31 changed files with 47 additions and 10 deletions.
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/property.st b/packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/property.st
@@ -1,6 +1,16 @@
 accessing
 property
 
-	^self track property.
+	|targetMorph property parentProperty propertyList|
+
+	parentProperty := self track property parentProperty title. 
+	propertyList := self animationsEditor propertyList.
+	targetMorph := propertyList detect: [:each | parentProperty match: each title].
+
+
+	targetMorph hasSubproperties 
+			ifTrue: [property := targetMorph subproperties detect: [:each| self track property asString match: each asString]].
+	^property
+	"^self track property."
 
 
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/value.st b/packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/instance/value.st
@@ -0,0 +1,3 @@
+accessing
+value
+	^ value
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/methodProperties.json b/packages/AnimationsEditor-Core.package/AnimationsEditorKeyframe.class/methodProperties.json
@@ -13,9 +13,10 @@
 		"initialize" : "NR 7/18/2022 10:50",
 		"mouseDown:" : "SG 7/31/2022 18:41",
 		"mouseOverColor" : "NR 7/18/2022 10:49",
-		"property" : "SG 7/31/2022 18:41",
+		"property" : "SG 8/1/2022 09:50",
 		"setCenteredPosition:" : "FH 8/1/2021 19:04",
 		"setValueAndFrame" : "SG 7/31/2022 18:44",
 		"track" : "mjs 7/31/2021 15:46",
 		"track:" : "mjs 7/31/2021 15:46",
+		"value" : "SG 8/1/2022 09:29",
 		"value:" : "mjs 7/31/2021 15:46" } }
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/addKeyframes.st b/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/addKeyframes.st
@@ -10,4 +10,6 @@ addKeyframes
 						withFrame: key
 						withValue: value
 						withAnimationsEditor: self animationsEditor.
-			self addMorph: keyframeMorph].
+			self addMorph: keyframeMorph].
+
+
diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/methodProperties.json b/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/methodProperties.json
@@ -2,7 +2,7 @@
 	"class" : {
 		"on:withProperty:withPosition:withExtent:withAnimationsEditor:" : "SG 6/17/2022 15:45" },
 	"instance" : {
-		"addKeyframes" : "SG 6/17/2022 15:46",
+		"addKeyframes" : "SG 8/2/2022 08:26",
 		"animationsEditor" : "SG 6/17/2022 15:40",
 		"animationsEditor:" : "SG 6/17/2022 15:40",
 		"initialize" : "ob 6/13/2022 13:20",

diff --git a/...EditorRightclickSelection.class/README.md → ...mationsEditorKeyframeTest.class/README.md b/...EditorRightclickSelection.class/README.md → ...mationsEditorKeyframeTest.class/README.md
diff --git a/...on.class/instance/animationRotation100.st → ...st.class/instance/animationRotation100.st b/...on.class/instance/animationRotation100.st → ...st.class/instance/animationRotation100.st
diff --git a/...on.class/instance/animationRotation200.st → ...st.class/instance/animationRotation200.st b/...on.class/instance/animationRotation200.st → ...st.class/instance/animationRotation200.st
diff --git a/...ass/instance/animationsEditorInstance..st → ...ass/instance/animationsEditorInstance..st b/...ass/instance/animationsEditorInstance..st → ...ass/instance/animationsEditorInstance..st
diff --git a/...lass/instance/animationsEditorInstance.st → ...lass/instance/animationsEditorInstance.st b/...lass/instance/animationsEditorInstance.st → ...lass/instance/animationsEditorInstance.st
diff --git a/....class/instance/createKeyframeWith.on..st → ....class/instance/createKeyframeWith.on..st b/....class/instance/createKeyframeWith.on..st → ....class/instance/createKeyframeWith.on..st
diff --git a/...election.class/instance/frameNumber100.st → ...rameTest.class/instance/frameNumber100.st b/...election.class/instance/frameNumber100.st → ...rameTest.class/instance/frameNumber100.st
diff --git a/...election.class/instance/frameNumber200.st → ...rameTest.class/instance/frameNumber200.st b/...election.class/instance/frameNumber200.st → ...rameTest.class/instance/frameNumber200.st
diff --git a/...kSelection.class/instance/keyframe100..st → ...yframeTest.class/instance/keyframe100..st b/...kSelection.class/instance/keyframe100..st → ...yframeTest.class/instance/keyframe100..st
diff --git a/...ckSelection.class/instance/keyframe100.st → ...eyframeTest.class/instance/keyframe100.st b/...ckSelection.class/instance/keyframe100.st → ...eyframeTest.class/instance/keyframe100.st
diff --git a/...kSelection.class/instance/keyframe200..st → ...yframeTest.class/instance/keyframe200..st b/...kSelection.class/instance/keyframe200..st → ...yframeTest.class/instance/keyframe200..st
diff --git a/...ckSelection.class/instance/keyframe200.st → ...eyframeTest.class/instance/keyframe200.st b/...ckSelection.class/instance/keyframe200.st → ...eyframeTest.class/instance/keyframe200.st
diff --git a/...htclickSelection.class/instance/morph..st → ...itorKeyframeTest.class/instance/morph..st b/...htclickSelection.class/instance/morph..st → ...itorKeyframeTest.class/instance/morph..st
diff --git a/...ghtclickSelection.class/instance/morph.st → ...ditorKeyframeTest.class/instance/morph.st b/...ghtclickSelection.class/instance/morph.st → ...ditorKeyframeTest.class/instance/morph.st
diff --git a/...ection.class/instance/propertyRotation.st → ...meTest.class/instance/propertyRotation.st b/...ection.class/instance/propertyRotation.st → ...meTest.class/instance/propertyRotation.st
diff --git a/...election.class/instance/rotationTrack..st → ...rameTest.class/instance/rotationTrack..st b/...election.class/instance/rotationTrack..st → ...rameTest.class/instance/rotationTrack..st
diff --git a/...Selection.class/instance/rotationTrack.st → ...frameTest.class/instance/rotationTrack.st b/...Selection.class/instance/rotationTrack.st → ...frameTest.class/instance/rotationTrack.st
diff --git a/...ionsEditor-Tests.package/AnimationsEditorKeyframeTest.class/instance/selectKeyframe100.st b/...ionsEditor-Tests.package/AnimationsEditorKeyframeTest.class/instance/selectKeyframe100.st
@@ -0,0 +1,5 @@
+support
+selectKeyframe100
+
+	self keyframe100 setValueAndFrame.
+	self animationsEditorInstance selectedTreeNode: self keyframe100 property.
diff --git a/...ghtclickSelection.class/instance/setUp.st → ...ditorKeyframeTest.class/instance/setUp.st b/...ghtclickSelection.class/instance/setUp.st → ...ditorKeyframeTest.class/instance/setUp.st
@@ -6,7 +6,6 @@ setUp
 	self morph: Morph new openInWorld.
 	self animationsEditorInstance addTargetMorph: self morph.
 	self timeline: self animationsEditorInstance timeline.
-	"self property: self animationsEditor propertyList first. "
 	self propertyRotation isActivated: true.
 	self animationsEditorInstance selectedTreeNode: self propertyRotation.
 	self rotationTrack: (self timeline submorphs at: 2).

diff --git a/...clickSelection.class/instance/tearDown.st → ...orKeyframeTest.class/instance/tearDown.st b/...clickSelection.class/instance/tearDown.st → ...orKeyframeTest.class/instance/tearDown.st
diff --git a/...ts.package/AnimationsEditorKeyframeTest.class/instance/testChangeSelectedKeyframeValue.st b/...ts.package/AnimationsEditorKeyframeTest.class/instance/testChangeSelectedKeyframeValue.st
@@ -0,0 +1,16 @@
+testing
+testChangeSelectedKeyframeValue
+	| sizeBeforeChange oldValue oldTargetValues|
+
+	self selectKeyframe100.
+
+	sizeBeforeChange := self propertyRotation targetValues size.
+	oldValue := self propertyRotation targetValues at: (self frameNumber100).
+	oldTargetValues := self propertyRotation targetValues deepCopy.
+	self createKeyframeWith: self animationRotation200 on: self frameNumber100.
+
+	self assert: sizeBeforeChange = self propertyRotation targetValues size.
+	self deny: oldValue equals: (self propertyRotation targetValues at: self frameNumber100).
+	self deny: oldTargetValues equals: self propertyRotation targetValues.
+	self assert: (oldTargetValues removeKey: self frameNumber100; yourself) equals: (self propertyRotation targetValues removeKey: self frameNumber100; yourself).
+
diff --git a/...nce/testLeftClickShowsSelectedProperty.st → ...nce/testLeftClickShowsSelectedProperty.st b/...nce/testLeftClickShowsSelectedProperty.st → ...nce/testLeftClickShowsSelectedProperty.st
@@ -1,8 +1,7 @@
 testing
 testLeftClickShowsSelectedProperty
 
-	self keyframe100 setValueAndFrame.
-	self animationsEditorInstance selectedTreeNode: self keyframe100 property.
+	self selectKeyframe100.
 
 	self assert: self propertyRotation currentValue = self animationRotation100.
 	self assert: self propertyRotation targetFrame = self frameNumber100.

diff --git a/...lickSelection.class/instance/timeline..st → ...rKeyframeTest.class/instance/timeline..st b/...lickSelection.class/instance/timeline..st → ...rKeyframeTest.class/instance/timeline..st
diff --git a/...clickSelection.class/instance/timeline.st → ...orKeyframeTest.class/instance/timeline.st b/...clickSelection.class/instance/timeline.st → ...orKeyframeTest.class/instance/timeline.st
diff --git a/...lickSelection.class/methodProperties.json → ...rKeyframeTest.class/methodProperties.json b/...lickSelection.class/methodProperties.json → ...rKeyframeTest.class/methodProperties.json
@@ -18,8 +18,10 @@
 		"propertyRotation" : "lka 7/1/2022 15:34",
 		"rotationTrack" : "SG 7/31/2022 23:14",
 		"rotationTrack:" : "SG 7/31/2022 23:14",
-		"setUp" : "SG 7/31/2022 23:21",
+		"selectKeyframe100" : "SG 8/2/2022 08:28",
+		"setUp" : "SG 8/1/2022 09:41",
 		"tearDown" : "SG 7/31/2022 23:22",
-		"testLeftClickShowsSelectedProperty" : "SG 7/31/2022 23:18",
+		"testChangeSelectedKeyframeValue" : "SG 8/2/2022 09:22",
+		"testLeftClickShowsSelectedProperty" : "SG 8/2/2022 08:29",
 		"timeline" : "SG 7/31/2022 22:46",
 		"timeline:" : "SG 7/31/2022 22:46" } }
diff --git a/...RightclickSelection.class/properties.json → ...sEditorKeyframeTest.class/properties.json b/...RightclickSelection.class/properties.json → ...sEditorKeyframeTest.class/properties.json
@@ -12,7 +12,7 @@
 		"rotationTrack",
 		"keyframe100",
 		"keyframe200" ],
-	"name" : "AnimationsEditorRightclickSelection",
+	"name" : "AnimationsEditorKeyframeTest",
 	"pools" : [
 		 ],
 	"super" : "TestCase",