Merge pull request #71 from pavel-krivanek/70-createDefaultOrganizationFrom

70-createDefaultOrganizationFrom

Author: estebanlm

MonticelloTonel-Core.package/TonelWriter.class/instance/createDefaultOrganizationFrom..st

@@ -5,8 +5,8 @@ createDefaultOrganizationFrom: aCollection
 	"simplest case, I answer the clas definition"
 	snapshot definitions 
 		detect: #isClassDefinition
-		ifFound: [ :each | ^ each category  ].
+		ifFound: [ :each | ^ MCOrganizationDefinition categories: { each category } ].
 
 	^ self createDefaultOrganizationFromDefinition: (snapshot definitions
 		detect: #isMethodDefinition
-		ifNone: [ self error: 'cannot determine package name from empty snapshot' ])
+		ifNone: [ self error: 'cannot determine package name from empty snapshot' ])

MonticelloTonel-Tests.package/TonelWriterTest.class/instance/checkFilesStructureIn..st

@@ -0,0 +1,31 @@
+tests
+checkFilesStructureIn: aFileReference
+
+	| nl |
+	
+	self assert: (aFileReference / 'MonticelloMocks') exists.
+	self 
+		assert: ((aFileReference / 'MonticelloMocks') entries collect: #basename) 
+		equals: #(
+			'MCMockASubclass.class.st' 
+			'MCMockClassA.class.st' 
+			'MCMockClassB.class.st' 
+			'MCMockClassD.class.st' 
+			'MCMockClassE.class.st' 
+			'MCMockClassF.class.st' 
+			'MCMockClassG.class.st' 
+			'MCMockClassH.class.st' 
+			'MCMockClassI.class.st' 
+			'MCSnapshotTest.extension.st'
+			'package.st').
+	
+	nl := OSPlatform current lineEnding.
+	self 
+		assert: (aFileReference / 'MonticelloMocks' / 'MCMockClassA.class.st') contents
+		equals: (self expectedMCMockClassAClassSt withLineEndings: nl).
+	self 
+		assert: (aFileReference / 'MonticelloMocks' / 'MCMockASubclass.class.st') contents
+		equals: (self expectedMCMockASubclassClassSt withLineEndings: nl).
+	self 
+		assert: (aFileReference / 'MonticelloMocks' / 'MCSnapshotTest.extension.st') contents
+		equals: (self expectedMCSnapshotTestExtensionSt withLineEndings: nl)

MonticelloTonel-Tests.package/TonelWriterTest.class/instance/testWriteSnapshot.st

@@ -1,34 +1,9 @@
 tests
 testWriteSnapshot
-	| writer mem nl |
+	| writer memoryFileReference |
 
-	mem := FileSystem memory root.
-	writer := self actualClass on: mem.
+	memoryFileReference := FileSystem memory root.
+	writer := self actualClass on: memoryFileReference.
 	writer writeSnapshot: self mockSnapshot.
 
-	self assert: (mem / 'MonticelloMocks') exists.
-	self 
-		assert: ((mem / 'MonticelloMocks') entries collect: #basename) 
-		equals: #(
-			'MCMockASubclass.class.st' 
-			'MCMockClassA.class.st' 
-			'MCMockClassB.class.st' 
-			'MCMockClassD.class.st' 
-			'MCMockClassE.class.st' 
-			'MCMockClassF.class.st' 
-			'MCMockClassG.class.st' 
-			'MCMockClassH.class.st' 
-			'MCMockClassI.class.st' 
-			'MCSnapshotTest.extension.st'
-			'package.st').
-	
-	nl := OSPlatform current lineEnding.
-	self 
-		assert: (mem / 'MonticelloMocks' / 'MCMockClassA.class.st') contents
-		equals: (self expectedMCMockClassAClassSt withLineEndings: nl).
-	self 
-		assert: (mem / 'MonticelloMocks' / 'MCMockASubclass.class.st') contents
-		equals: (self expectedMCMockASubclassClassSt withLineEndings: nl).
-	self 
-		assert: (mem / 'MonticelloMocks' / 'MCSnapshotTest.extension.st') contents
-		equals: (self expectedMCSnapshotTestExtensionSt withLineEndings: nl)
+	self checkFilesStructureIn: memoryFileReference

MonticelloTonel-Tests.package/TonelWriterTest.class/instance/testWriteSnapshotWithoutOrganization.st

@@ -0,0 +1,19 @@
+tests
+testWriteSnapshotWithoutOrganization
+	"test if the exported code has correct structure even if the Monticello snapshot does not have
+	a proper organization definition so the structure must be taken from the category names. 
+	See TonelWriter>>#createDefaultOrganizationFrom:"
+
+	| aSnapshot memoryFileReference writer |
+	
+	aSnapshot := self mockSnapshot copy.
+	(aSnapshot definitions select: #isOrganizationDefinition) do: [ :each | 
+		aSnapshot definitions remove: each ].
+	
+	memoryFileReference := FileSystem memory root.
+	writer := self actualClass on: memoryFileReference.
+	writer writeSnapshot: self mockSnapshot.
+	
+	self checkFilesStructureIn: memoryFileReference
+	
+