Fix #12 - Default Label Enhancements

- Avoid Nil Test - Pass Description as Argument to Accessor - Add test for default/auto labels
seandenigris · Aug 13, 2018 · 2a607e9 · 2a607e9
1 parent 0112312
commit 2a607e9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/source/Magritte-Model.package/MAAccessor.class/instance/defaultLabel.st b/source/Magritte-Model.package/MAAccessor.class/instance/defaultLabel.st
diff --git a/source/Magritte-Model.package/MAAccessor.class/instance/defaultLabelFor..st b/source/Magritte-Model.package/MAAccessor.class/instance/defaultLabelFor..st
@@ -0,0 +1,3 @@
+accessing
+defaultLabelFor: aDescription
+	^ aDescription class defaultLabel
diff --git a/source/Magritte-Model.package/MADescription.class/instance/defaultLabel.st b/source/Magritte-Model.package/MADescription.class/instance/defaultLabel.st
@@ -1,3 +1,3 @@
 acessing-magritte
 defaultLabel
-	^ self accessor defaultLabel	ifNil: [ self class defaultLabel ]
+	^ self accessor defaultLabelFor: self
diff --git a/...orAccessor.class/instance/defaultLabel.st → ...cessor.class/instance/defaultLabelFor..st b/...orAccessor.class/instance/defaultLabel.st → ...cessor.class/instance/defaultLabelFor..st
@@ -1,3 +1,3 @@
 accessing
-defaultLabel
+defaultLabelFor: aDescription
 	^ self readSelector normalizeCamelCase capitalized
diff --git a/source/Magritte-Tests-Model.package/MADescriptionTest.class/instance/testDefaultLabel.st b/source/Magritte-Tests-Model.package/MADescriptionTest.class/instance/testDefaultLabel.st
@@ -0,0 +1,5 @@
+tests-accessing
+testDefaultLabel
+	self assert: self description label = ''.
+	self description accessor: #foo.
+	self assert: self description label = 'Foo'