Green tests for MDFileTest

Author: Ducasse

src/MicroEd-Tests/MDFileTest.class.st

@@ -19,13 +19,16 @@ MDFileTest >> setUp [
 	| fileNamer |
 	super setUp.
 	memoryFS := FileSystem memory.
-	
+
 	mdFollowingConventionFile := MDFile new.
 	fileNamer := mdFollowingConventionFile fileNamer.
-	fileNamer date:
-		(Date readFrom: '2024-11-02' readStream pattern: 'y-m-d').
+	fileNamer date: (Date readFrom: '2024-11-02' readStream pattern: 'y-m-d').
 
-	fileReferenceFollowingConventions := memoryFS / (mdFollowingConventionFile fileNamer newNameBasedOn: 'example').
+	fileReferenceFollowingConventions := memoryFS
+	                                     /
+	                                     (mdFollowingConventionFile
+		                                      fileNamer newNameBasedOn:
+		                                      'example').
 
 	fileReferenceFollowingConventions writeStreamDo: [ :stream |
 		stream nextPutAll: 'example file' ].
@@ -38,11 +41,13 @@ MDFileTest >> setUp [
 
 { #category : 'tests - contents' }
 MDFileTest >> testContentsIsSaved [
-
-	self assert: fileReferenceFollowingConventions contents equals: 'example file'.
+	
+	self
+		assert: fileReferenceFollowingConventions contents
+		equals: 'example file'.
 
 	self
-		assert: (memoryFS / 'example.md') contents
+		assert: (memoryFS / '2024-11-02_example.md') contents
 		equals: 'example file'
 ]
 
@@ -68,65 +73,33 @@ MDFileTest >> testMDFileCreationWithoutExistingFile [
 
 	| fileWithoutFileReference |
 	fileWithoutFileReference := MDFile new.
-	self assert: fileWithoutFileReference hasFile not.
+	self deny: fileWithoutFileReference hasFile
 ]
 
 { #category : 'tests' }
 MDFileTest >> testMDFileExistingFileWithName [
 
 	| fileReferenceWithoutName |
 	fileReferenceWithoutName := (memoryFS / 'name.md') ensureCreateFile.
-	mdFollowingConventionFile initializeWithFileReference:
-		fileReferenceWithoutName.
-	self assert: (mdFollowingConventionFile basename endsWith: 'name.md')
-]
-
-{ #category : 'tests' }
-MDFileTest >> testMDFileExistingFileWithoutName [
-
-	| file fileReferenceWithoutName |
- 	
-	fileReferenceWithoutName := (memoryFS / '.md') ensureCreateFile.
-	toDelete add: fileReferenceWithoutName. 
-	file := MDFile new.
-	file initializeWithFileReference: fileReferenceWithoutName.
-	self denyEmpty: file basename. 
-	
+	mdFollowingConventionFile initializeWithFileReference: fileReferenceWithoutName.
+	self assert: (mdFollowingConventionFile fileReference basename endsWith: 'name.md')
 ]
 
 { #category : 'tests' }
 MDFileTest >> testMDFileHasFileReferenceAddMetaData [
 
 	| root file |
-	
 	file := memoryFS / 'test2'.
-	file ensureCreateFile. 
-	mdFollowingConventionFile initializeWithFileReference: file. 
-	mdFollowingConventionFile addMetaDataElements. 
-	
-	root := MicrodownParser parse: mdFollowingConventionFile contents.
-	self assert: root hasMetaDataElement.
-	
-	
-]
-
-{ #category : 'tests' }
-MDFileTest >> testMDFileHasFileReferenceHasMetaData [
+	file ensureCreateFile.
+	mdFollowingConventionFile initializeWithFileReference: file.
+	mdFollowingConventionFile addMetaDataElements.
 
-	| root file |
-	
-	file := memoryFS / 'test2'.
-	file ensureCreateFile. 
-	mdFollowingConventionFile initializeWithFileReference: file. 
-	root := MicrodownParser parse: mdFollowingConventionFile fileReference contents.
-	mdFollowingConventionFile addMetaDataElements. 
-	
 	root := MicrodownParser parse: mdFollowingConventionFile contents.
 	self assert: root hasMetaDataElement.
-	
-	mdFollowingConventionFile fileReference delete. 
-	
-	
+	self 
+		assert: (root metaDataElement atKey: 'title') 
+		equals: 'unnamed'.
+		
 ]
 
 { #category : 'tests' }
@@ -146,11 +119,11 @@ MDFileTest >> testMDFileHasFileReferenceHasNotMetaData [
 { #category : 'tests' }
 MDFileTest >> testMDFileHasFileReferenceWithFormatISO [
 
-	| file date |
-	file := MDFile newFromFileReference: fileReferenceWithName. 
-	date := Date today yyyymmdd.
-	self assert: (file basename includesSubstring: date).
-	self deny: fileReferenceWithName exists
+	| file |
+	file := MDFile new.
+	file fileNamer date: (Date newDay: 21 month: 9  year: 1969). 
+	self assert: file fileReference basename equals: '1969-09-21_unnamed.md'.
+	
 ]
 
 { #category : 'tests - title' }

src/MicroEd/MDFile.class.st

@@ -31,41 +31,36 @@ MDFile class >> newFromFileReference: aFileReference [
 { #category : 'add' }
 MDFile >> addMetaDataElements [
 
-	| root |
-	root := MicrodownParser parse: fileReference contents.
+	| root newDoc |
+
+	root := MicrodownParser parse: self fileReference contents.
 
 	root hasMetaDataElement
 		ifFalse: [
-			root := MicrodownParser parse: '{ "author" : "addos" }'.
+"pay attention MD is line based. so the } should be on another line."
+			newDoc := MicrodownParser parse: '{ 
+"author" : "addos" 
+}'.
+			root addChild: newDoc children first. 
+			"yes the metadata element in the first one.
+			The API of Microdown could be better."
 			root metaDataElement
-				atKey: 'author' put: (fileReference entry reference path at: 3);
-				atKey: 'title' put: nameOfFileReferenceBeforeSaved;
+				atKey: 'author' 
+				put: 'toto for now';
+				
+				atKey: 'title' 
+				put: self title;
+				
 				atKey: 'lastModificationDate'
-				put: fileReference modificationTime asDate yyyymmdd ]
+				put: self fileReference modificationTime asDate yyyymmdd ]
 		ifTrue: [
 			root metaDataElement
 				atKey: 'lastModificationDate'
-				put: fileReference modificationTime asDate yyyymmdd ].
+				put: self fileReference modificationTime asDate yyyymmdd ].
 
 	self writeFileContentsOf: root
 ]
 
-{ #category : 'accessing' }
-MDFile >> basename [
-	"Answer a String representing the receiver's file name"
-
-	| dateCreationOfFileReference |
-	fileReference ifNil: [
-		nameOfFileReferenceBeforeSaved := 'Untitled'.
-		^ nameOfFileReferenceBeforeSaved ].
-	
-	nameOfFileReferenceBeforeSaved := fileReference basename.
-	dateCreationOfFileReference := Date today yyyymmdd.
-	(fileReference basename includesSubstring: dateCreationOfFileReference) 
-		ifFalse: [ ^ dateCreationOfFileReference , '_' , fileReference basename ].
-	^ fileReference basename
-]
-
 { #category : 'accessing' }
 MDFile >> contents [
 
@@ -82,13 +77,13 @@ MDFile >> contents: aContent [
 { #category : 'testing' }
 MDFile >> exists [
 
-	^ fileReference exists
+	^ self fileReference exists
 ]
 
 { #category : 'accessing' }
 MDFile >> extension [
 
-	^ fileReference extension
+	^ self fileReference extension
 ]
 
 { #category : 'accessing' }
@@ -121,6 +116,12 @@ MDFile >> fileReference: aFileReference [
 	fileName := aFileReference basenameWithoutExtension. 
 ]
 
+{ #category : 'testing' }
+MDFile >> hasFile [
+	
+	^ fileReference isNotNil
+]
+
 { #category : 'testing' }
 MDFile >> hasTitle [
 
@@ -143,8 +144,8 @@ MDFile >> initializeWithFileReference: aFileReference [
 	fileReference := aFileReference.
 	"Create of a new file reference which has the ISO format with the default extension: 'md' "
 	newFileReference := fileReference extension isEmptyOrNil
-		                    ifTrue: [ (self basename , '.md') ]
-		                    ifFalse: [ self basename ].
+		                    ifTrue: [ (fileReference basename , '.md') ]
+		                    ifFalse: [ fileReference basename ].
 	aFileReference delete.
 
 	fileReference := newFileReference asFileReference.