Merge 2a9bb71 into d459c41

packages/BaselineOfAcceptIt.package/BaselineOfAcceptIt.class/instance/baseline..st

@@ -4,10 +4,12 @@ baseline: spec
 	spec
 		for: #'common'
 		do: [
-				spec baseline: 'Ohm' with: [	spec repository: 'github://hpi-swa/ohm-s:update-to-v0.86/packages' ].
 			spec
-				package: 'acceptit-Core' with: [ spec requires: #('Ohm') ];
-				package: 'acceptit-Tests' with: [ spec requires: #('default') ];
+				baseline: 'Ohm' with: [	spec repository: 'github://hpi-swa/ohm-s:update-to-v0.86/packages' ];
+				baseline: 'Project12' with: [spec repository: 'github://hpi-swa-teaching/Morphic-Testing-Framework:master/packages']. 
+			spec
+				package: 'acceptit-Core' with: [ spec requires: #('Ohm' 'Project12') ];
+				package: 'acceptit-Tests' with: [ spec requires: #('default' 'acceptit-GUI') ];
 				package: 'acceptit-GUI' with: [ spec requires: #('default') ].
 			spec
 				group: 'default' with: #('acceptit-Core');

packages/BaselineOfAcceptIt.package/BaselineOfAcceptIt.class/methodProperties.json

@@ -2,4 +2,4 @@
 	"class" : {
 		 },
 	"instance" : {
-		"baseline:" : "mp 6/29/2016 01:15" } }
+		"baseline:" : "jb 5/28/2018 19:20" } }

packages/acceptit-Core.package/ACUserStory.class/class/addUserStoryConstantsToClass.fromDictionary..st

@@ -0,0 +1,4 @@
+user story creation
+addUserStoryConstantsToClass: aClass fromDictionary: aDictionary 
+	#( title role purpose means ) do: [:property | 
+		self createConstant: property forUserStory: aClass withValue: (aDictionary at: property)].

packages/acceptit-Core.package/ACUserStory.class/class/createConstant.forUserStory.withValue..st

@@ -0,0 +1,10 @@
+user story creation
+createConstant: constantName forUserStory: aUserStoryClass withValue: aString
+
+	aUserStoryClass class 
+		compile: (String streamContents: [:stream |
+			stream 
+				nextPutAll: constantName; crtab;
+				nextPutAll: '<generated>';cr;crtab;
+				nextPutAll: '^'; store: aString.])
+		classified: 'constants'.

packages/acceptit-Core.package/ACUserStory.class/class/createSubclass.withCategory..st

@@ -0,0 +1,8 @@
+user story creation
+createSubclass: aName withCategory: aCategory
+
+	^self subclass: aName asSymbol
+		instanceVariableNames: ''
+		classVariableNames: ''
+		poolDictionaries: ''
+		category: aCategory

packages/acceptit-Core.package/ACUserStory.class/class/createUserStory.withCategory..st

@@ -0,0 +1,6 @@
+user story creation
+createUserStory: aStory withCategory: aCategory 
+
+	|propertyDictionary|
+	propertyDictionary := ACUserStoryParser new parseStoryToDictionary: aStory.
+	^self createUserStoryClassFromDictionary: propertyDictionary withCategory: aCategory

packages/acceptit-Core.package/ACUserStory.class/class/createUserStoryClassFromDictionary.withCategory..st

@@ -0,0 +1,7 @@
+user story creation
+createUserStoryClassFromDictionary: aDictionary withCategory: aCategory
+
+	|createdClass|
+	createdClass := self createSubclass: (aDictionary at: #title) withCategory: aCategory.
+	self addUserStoryConstantsToClass: createdClass fromDictionary: aDictionary.
+	^createdClass

packages/acceptit-Core.package/ACUserStory.class/class/definition.st

@@ -7,6 +7,6 @@ definition
 			superklass := (super definition findTokens: ' ') first.
 			stream
 				nextPutAll: superklass; space;
-				nextPutAll: 'named:'; space; store: self storyName; crtab;
+				nextPutAll: 'named:'; space; store: self title; crtab;
 				nextPutAll: 'story:'; cr; store: self userStoryString;  crtab;
 				nextPutAll: 'category:'; space; store: self category asString]]

packages/acceptit-Core.package/ACUserStory.class/class/means.st

@@ -1,4 +1,3 @@
-accessing
+constants
 means
-
-	^means
+	"self subclassResponsibility."

packages/acceptit-Core.package/ACUserStory.class/class/purpose.st

@@ -1,4 +1,3 @@
-accessing
+constants
 purpose
-
-	^purpose
+	"self subclassResponsibility."

packages/acceptit-Core.package/ACUserStory.class/class/role.st

@@ -1,4 +1,3 @@
-accessing
+constants
 role
-
-	^role
+	"self subclassResponsibility."

packages/acceptit-Core.package/ACUserStory.class/class/title.st

@@ -0,0 +1,3 @@
+constants
+title
+	"self subclassResponsibility."

packages/acceptit-Core.package/ACUserStory.class/class/userStoryString.st

@@ -1,4 +1,8 @@
 accessing
 userStoryString
 
-	^ userStoryString
+	^ String streamContents: [ :stream |
+		stream 
+			nextPutAll: 'In order to ', self purpose; crtab;
+			nextPutAll: 'As a ', self role; crtab;
+			nextPutAll: 'I want ', self means.]

packages/acceptit-Core.package/ACUserStory.class/methodProperties.json

@@ -1,43 +1,39 @@
 {
 	"class" : {
+		"addUserStoryConstantsToClass:fromDictionary:" : "jb 5/24/2018 11:36",
 		"allTestSelectors" : "fg 6/30/2010 16:22",
 		"basicAddSelector:withMethod:" : "mp 6/29/2016 00:04",
 		"buildArgumentsForMethod:using:" : "mp 6/28/2016 23:52",
 		"buildConfiguration:" : "topa 4/27/2011 10:03",
 		"compiledMethodAt:" : "topa 9/24/2010 09:45",
 		"compiledMethodAt:ifAbsent:" : "topa 9/22/2010 13:57",
 		"compilerClass" : "mp 6/28/2016 23:53",
+		"createConstant:forUserStory:withValue:" : "jb 5/24/2018 10:57",
 		"createNewVerbsMethodCache" : "topa 3/11/2011 13:41",
-		"definition" : "topa 4/27/2011 08:39",
+		"createSubclass:withCategory:" : "jb 5/24/2018 11:49",
+		"createUserStory:withCategory:" : "jb 5/24/2018 11:51",
+		"createUserStoryClassFromDictionary:withCategory:" : "jb 5/24/2018 12:02",
+		"definition" : "jb 5/24/2018 11:09",
 		"includesSelector:" : "topa 9/23/2010 14:48",
-		"initializationTemplateForClass:named:story:" : "topa 4/27/2011 08:35",
 		"isAbstract" : "topa 6/3/2010 13:23",
 		"libraries" : "topa 4/27/2011 08:51",
 		"looksLikeUserStoryHeir" : "topa 6/14/2010 12:46",
-		"means" : "topa 6/3/2010 12:42",
-		"means:" : "topa 6/3/2010 12:42",
-		"named:purpose:role:means:category:" : "topa 4/26/2011 19:56",
-		"named:story:category:" : "topa 4/27/2011 08:22",
+		"means" : "jb 5/24/2018 12:30",
 		"organization" : "topa 9/24/2010 13:39",
 		"parserClass" : "mp 6/28/2016 23:59",
-		"purpose" : "topa 6/3/2010 12:42",
-		"purpose:" : "topa 6/3/2010 12:42",
-		"role" : "topa 6/3/2010 12:42",
-		"role:" : "topa 6/3/2010 12:42",
+		"purpose" : "jb 5/24/2018 12:22",
+		"role" : "jb 5/24/2018 12:22",
 		"scenarioAndMethodDict" : "topa 9/26/2010 21:28",
 		"selectorForString:prefixed:" : "topa 8/5/2010 11:54",
 		"setUpUserStory" : "topa 4/27/2011 08:54",
 		"shouldInheritSelectors" : "mp 4/4/2011 15:36:03.297",
 		"shoutParserClass" : "mp 6/28/2016 23:48",
 		"sourceCodeAt:ifAbsent:" : "topa 9/22/2010 14:02",
 		"sourceCodeTemplate" : "topa 7/15/2010 10:37",
-		"storyName" : "topa 4/26/2011 19:45",
-		"storyName:" : "topa 4/26/2011 19:45",
 		"tearDownUserStory" : "topa 4/27/2011 08:55",
 		"testSelectors" : "mp 4/4/2011 17:14:17.646",
-		"userStoryNamed:story:withCategory:fullText:" : "mp 7/4/2016 16:17",
-		"userStoryString" : "topa 6/29/2010 15:12",
-		"userStoryString:" : "topa 6/29/2010 15:11" },
+		"title" : "jb 5/24/2018 12:22",
+		"userStoryString" : "jb 5/24/2018 10:24" },
 	"instance" : {
 		"configuration" : "topa 7/15/2010 09:30",
 		"configuration:" : "topa 2/14/2011 09:33",

packages/acceptit-Core.package/ACUserStory.class/properties.json

@@ -1,11 +1,7 @@
 {
 	"category" : "acceptit-Core-Model",
 	"classinstvars" : [
-		"purpose",
-		"role",
-		"means",
-		"storyName",
-		"userStoryString" ],
+		 ],
 	"classvars" : [
 		 ],
 	"commentStamp" : "",

packages/acceptit-Core.package/ACUserStoryParser.class/instance/evaluator.st

@@ -0,0 +1,3 @@
+parser-emulation
+evaluator
+	^ self grammar synthesizedAttribute: self semantic new

packages/acceptit-Core.package/ACUserStoryParser.class/instance/matchStory..st

@@ -0,0 +1,3 @@
+parser-emulation
+matchStory: aStory
+	^self grammar match: aStory startingFrom: self startRule

packages/acceptit-Core.package/ACUserStoryParser.class/instance/parseStoryToDictionary..st

@@ -0,0 +1,5 @@
+parser-emulation
+parseStoryToDictionary: aStory
+	|match|
+	match := self matchStory: aStory.
+	^self evaluator value: match

packages/acceptit-Core.package/ACUserStoryParser.class/methodProperties.json

@@ -4,10 +4,13 @@
 	"instance" : {
 		"buildCode:" : "mp 7/4/2016 16:22",
 		"endOfLastToken" : "mp 6/22/2016 10:19",
+		"evaluator" : "jb 5/24/2018 11:27",
 		"grammar" : "mp 6/28/2016 23:47",
+		"matchStory:" : "jb 5/24/2018 11:28",
 		"parseAMethod" : "mp 6/22/2016 11:36",
 		"parseAMethod:" : "mp 6/22/2016 11:37",
 		"parseSelector:" : "mp 6/22/2016 10:22",
+		"parseStoryToDictionary:" : "jb 5/24/2018 11:29",
 		"rangesIn:classOrMetaClass:workspace:environment:" : "mp 6/22/2016 10:23",
 		"semantic" : "mp 6/28/2016 23:50",
 		"startRule" : "mp 5/31/2016 18:37" } }

packages/acceptit-Core.package/MTFMorphWrapper.extension/class/classesWithLabel.st

@@ -0,0 +1,4 @@
+*acceptit-Core
+classesWithLabel
+
+	^ {SimpleButtonMorph. PluggableButtonMorphPlus}

packages/acceptit-Core.package/MTFMorphWrapper.extension/methodProperties.json

@@ -0,0 +1,5 @@
+{
+	"class" : {
+		"classesWithLabel" : "jb 5/28/2018 19:29" },
+	"instance" : {
+		 } }

packages/acceptit-Core.package/MTFMorphWrapper.extension/properties.json

@@ -0,0 +1,2 @@
+{
+	"name" : "MTFMorphWrapper" }

packages/acceptit-Tests.package/ACCreateUserStoryTest.class/instance/setUp.st

@@ -1,8 +1,6 @@
 setUp and tearDown
 setUp
 	super setUp.
-	ACUserStory userStoryNamed: self userStoryName 
-		story: self basicUserStory
-		withCategory: self categoryName
-		fullText: self basicUserStory.
-	self createdClass: (Smalltalk classNamed: self userStoryName).
+	ACUserStory createUserStory: UserStoryFactory userStoryString
+		withCategory: UserStoryFactory categoryName.
+	self createdClass: (Smalltalk classNamed: UserStoryFactory userStoryTitleTrimmed).

packages/acceptit-Tests.package/ACCreateUserStoryTest.class/instance/tearDown.st

@@ -1,5 +1,5 @@
 setUp and tearDown
 tearDown
 	super tearDown.
-	(Smalltalk classNamed: self userStoryName) removeFromSystemUnlogged.
-	SystemOrganization removeCategory: self categoryName.
+	(Smalltalk classNamed: UserStoryFactory userStoryTitleTrimmed) removeFromSystemUnlogged.
+	SystemOrganization removeCategory: UserStoryFactory categoryName.

packages/acceptit-Tests.package/ACCreateUserStoryTest.class/instance/testItHasCorrectCategory.st

@@ -1,3 +1,3 @@
 tests
 testItHasCorrectCategory
-	self assert: self categoryName equals: self createdClass category. 
+	self assert: UserStoryFactory categoryName equals: self createdClass category.

packages/acceptit-Tests.package/ACCreateUserStoryTest.class/instance/testItHasCorrectClassName.st

@@ -1,3 +1,3 @@
 tests
 testItHasCorrectClassName
-	self assert: self userStoryName equals: self createdClass name.
+	self assert: UserStoryFactory userStoryTitleTrimmed equals: self createdClass name.