Fix issue pharo-vcs#984

- add test for file corruption - fix properties file writing
guillep · Oct 2, 2018 · 3b18204 · 3b18204
1 parent 1066e84
commit 3b18204
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 0 deletions.
diff --git a/...nvertFormatActionTest.class/instance/testConvertToFiletreeDoesNotCorruptPropertiesFile.st b/...nvertFormatActionTest.class/instance/testConvertToFiletreeDoesNotCorruptPropertiesFile.st
@@ -0,0 +1,25 @@
+tests
+testConvertToFiletreeDoesNotCorruptPropertiesFile
+	self repository properties fileFormat: IceLibgitTonelWriter.
+	self repository workingCopy addPackageNamed: self packageName1.
+	self repository workingCopy
+		createClass: 'IceGeneratedClassForTesting'
+		inPackage: self packageName1 asSymbol.
+	self repository commitWithMessage: 'First commit'.
+
+	self 
+		assert: self repository writerClass 
+		equals: IceLibgitTonelWriter.
+
+	IceConvertFormatAction new
+		repository: self repository;
+		branchName: 'migrate-to-filetree';
+		mergeWithCurrentBranch: true;
+		format: #filetree;
+		execute.
+
+	self
+		assert: (self repository workingCopy fileSystem / '.properties') contents
+		equals: '{
+	#format : #filetree
+}'
diff --git a/...eConvertFormatActionTest.class/instance/testConvertToTonelDoesNotCorruptPropertiesFile.st b/...eConvertFormatActionTest.class/instance/testConvertToTonelDoesNotCorruptPropertiesFile.st
@@ -0,0 +1,25 @@
+tests
+testConvertToTonelDoesNotCorruptPropertiesFile
+	self repository properties fileFormat: IceLibgitFiletreeWriter.
+	self repository workingCopy addPackageNamed: self packageName1.
+	self repository workingCopy
+		createClass: 'IceGeneratedClassForTesting'
+		inPackage: self packageName1 asSymbol.
+	self repository commitWithMessage: 'First commit'.
+
+	self 
+		assert: self repository writerClass 
+		equals: IceLibgitFiletreeWriter.
+
+	IceConvertFormatAction new
+		repository: self repository;
+		branchName: 'migrate-to-filetree';
+		mergeWithCurrentBranch: true;
+		format: #tonel;
+		execute.
+
+	self
+		assert: (self repository workingCopy fileSystem / '.properties') contents
+		equals: '{
+	#format : #tonel
+}'
diff --git a/Iceberg-Plugin-Migration.package/IceConvertFormatAction.class/instance/migrateSources.st b/Iceberg-Plugin-Migration.package/IceConvertFormatAction.class/instance/migrateSources.st
@@ -13,6 +13,7 @@ migrateSources
 			commit: commit ].
 
 	(self repository workingCopy fileSystem resolve: self repository properties propertiesFilePath)
+		ensureDelete;
 		binaryWriteStreamDo: [ :stream |
 			stream nextPutAll: (self repository properties
 				fileFormatId: self format;