Merge pull request #882 from tesonep/issue/870

Adding Metacello Integration tests and fixing the detected problems
pharo-vcs · Jun 25, 2018 · 8f459d3 · 8f459d3
2 parents a12bcb9 + 0698567
commit 8f459d3
Show file tree

Hide file tree

Showing 75 changed files with 271 additions and 44 deletions.
diff --git a/Iceberg-Libgit.package/IceRepositoryCreator.class/instance/addLocalRepository.st b/Iceberg-Libgit.package/IceRepositoryCreator.class/instance/addLocalRepository.st
@@ -1,7 +1,10 @@
 private actions
 addLocalRepository
 	self repository location: self locationToUse.
-	self repository pluginManager repositoryWillBeCreated: self repository.	
+	self repository pluginManager repositoryWillBeCreated: self repository.
+
 	self repository workingCopy initializePackagesFromRepository.
+	self doEnsureProject. 	
+
 	self repository pluginManager repositoryWasCreated: self repository.
 	^ self repository	
diff --git a/Iceberg-Libgit.package/IceRepositoryCreator.class/instance/cloneRepository.st b/Iceberg-Libgit.package/IceRepositoryCreator.class/instance/cloneRepository.st
@@ -10,6 +10,9 @@ cloneRepository
 	self commitishName 
 		ifNotNil: [ self repository switchToCommitishNamed: self commitishName ].
 	self repository pluginManager repositoryWillBeCreated: self repository.	
+
 	self repository workingCopy initializePackagesFromRepository.
+	self doEnsureProject. 
+
 	self repository pluginManager repositoryWasCreated: self repository.
 	^ self repository
diff --git a/Iceberg-Libgit.package/IceRepositoryCreator.class/instance/doEnsureProject.st b/Iceberg-Libgit.package/IceRepositoryCreator.class/instance/doEnsureProject.st
@@ -0,0 +1,15 @@
+private
+doEnsureProject
+
+	| fileFormat |
+
+	ensureProjectFile ifFalse: [ ^ self ].
+	self repository project isUnbornProject ifFalse: [ ^ self ].
+
+	fileFormat := self repository project fileFormat.
+
+	self repository workingCopy project:
+			((IceProject onRepository: self repository)
+				fileFormat: fileFormat;
+				sourceDirectory: self subdirectory;
+				yourself)
diff --git a/Iceberg-Libgit.package/IceRepositoryCreator.class/instance/ensureProjectFile.st b/Iceberg-Libgit.package/IceRepositoryCreator.class/instance/ensureProjectFile.st
@@ -0,0 +1,3 @@
+API-project
+ensureProjectFile
+	ensureProjectFile := true
diff --git a/Iceberg-Libgit.package/IceRepositoryCreator.class/instance/initialize.st b/Iceberg-Libgit.package/IceRepositoryCreator.class/instance/initialize.st
@@ -0,0 +1,4 @@
+initialization
+initialize
+	super initialize.
+	ensureProjectFile := false
diff --git a/Iceberg-Libgit.package/IceRepositoryCreator.class/properties.json b/Iceberg-Libgit.package/IceRepositoryCreator.class/properties.json
@@ -11,7 +11,8 @@
 		"remote",
 		"branchName",
 		"subdirectory",
-		"repository"
+		"repository",
+		"ensureProjectFile"
 	],
 	"name" : "IceRepositoryCreator",
 	"type" : "normal"

diff --git a/Iceberg-Libgit.package/IceRepositoryProperties.class/class/empty.st b/Iceberg-Libgit.package/IceRepositoryProperties.class/class/empty.st
@@ -0,0 +1,5 @@
+requirements
+empty
+	^ self new
+		properties: Dictionary new;
+		yourself
diff --git a/Iceberg-Libgit.package/IceRepositoryProperties.class/instance/^equals.st b/Iceberg-Libgit.package/IceRepositoryProperties.class/instance/^equals.st
@@ -0,0 +1,4 @@
+comparing
+= anotherObject
+
+	^ self species = anotherObject species and: [ properties = anotherObject properties ]
diff --git a/Iceberg-Libgit.package/IceRepositoryProperties.class/instance/hash.st b/Iceberg-Libgit.package/IceRepositoryProperties.class/instance/hash.st
@@ -0,0 +1,3 @@
+comparing
+hash
+	^ properties hash
diff --git a/Iceberg-Memory.package/IceMemoryProject.class/instance/isDirty.st b/Iceberg-Memory.package/IceMemoryProject.class/instance/isDirty.st
@@ -0,0 +1,3 @@
+testing
+isDirty
+	^ repository workingCopy referenceCommit project ~= self
diff --git a/...tegration.package/IceMetacelloPharoPlatform.class/instance/extractTypeFromDescription..st b/...tegration.package/IceMetacelloPharoPlatform.class/instance/extractTypeFromDescription..st
@@ -1,5 +1,6 @@
 repository creation
 extractTypeFromDescription: description
+
 	(description beginsWith: 'ftp://') ifTrue: [ ^'ftp' ].
 	IceMetacelloRepositoryType allTypes 
 		detect:  [ :each | each isSuitableForLocation: description  ] 

diff --git a/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/class/commitishConfiguration.st b/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/class/commitishConfiguration.st
@@ -0,0 +1,8 @@
+testing
+commitishConfiguration
+
+	^ IceTestParameter 
+		withOptions: self commitishOptions
+		on: self 
+		selector: #commitishToUse
+
diff --git a/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/class/commitishOptions.st b/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/class/commitishOptions.st
@@ -0,0 +1,7 @@
+testing
+commitishOptions
+
+	^	{	''. "Without commitish"
+			':forBecomeWriteable'. "With branch"
+			':1.2.3'. "with tag"}
+
diff --git a/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/class/commitishToUse..st b/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/class/commitishToUse..st
@@ -0,0 +1,4 @@
+testing
+commitishToUse: aValue
+
+	CommitishToUse := aValue
diff --git a/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/class/commitishToUse.st b/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/class/commitishToUse.st
@@ -0,0 +1,4 @@
+testing
+commitishToUse
+
+	^ CommitishToUse ifNil: [ '' ]
diff --git a/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/class/isAbstract.st b/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/class/isAbstract.st
@@ -1,4 +1,3 @@
 testing
 isAbstract
-
-	^ self == IceMetacelloIntegrationTests
+	^ self name = #IceMetacelloIntegrationTests
diff --git a/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/class/parameters.st b/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/class/parameters.st
@@ -1,4 +1,5 @@
 testing
 parameters
 
-	^ { self remoteTypeConfiguration }
+	^ { self remoteTypeConfiguration. 
+		 self commitishConfiguration }
diff --git a/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/instance/defaultTimeLimit.st b/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/instance/defaultTimeLimit.st
@@ -0,0 +1,3 @@
+accessing
+defaultTimeLimit
+	^ 30 seconds
diff --git a/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/instance/expectedFileFormat.st b/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/instance/expectedFileFormat.st
@@ -0,0 +1,4 @@
+configuring
+expectedFileFormat
+
+	^ self subclassResponsibility
diff --git a/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/instance/hasProject.st b/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/instance/hasProject.st
@@ -0,0 +1,4 @@
+configuring
+hasProject
+
+	^ self subclassResponsibility
diff --git a/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/instance/installBaseline.st b/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/instance/installBaseline.st
@@ -1,4 +1,7 @@
 tests
 installBaseline
 
-	self subclassResponsibility
+	Metacello new
+		baseline: 'PharoGitTest';
+		repository: (self repository , self class commitishToUse);
+		load.
diff --git a/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/instance/repositoriesForTest.st b/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/instance/repositoriesForTest.st
@@ -1,4 +1,4 @@
 tests
 repositoriesForTest
 
-	^ IceRepository registry select: [ :e | e name = 'pharo-git-test' ]
+	^ IceRepository registry select: [ :e | e name = self repositoryName ]
diff --git a/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/instance/repository.st b/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/instance/repository.st
@@ -0,0 +1,4 @@
+configuring
+repository
+
+	^ 'github://pharo-vcs/' , self repositoryName
diff --git a/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/instance/repositoryForTest.st b/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/instance/repositoryForTest.st
@@ -1,4 +1,4 @@
 tests
 repositoryForTest
 
-	^ IceRepository registry detect: [ :e | e name = 'pharo-git-test' ]
+	^ IceRepository registry detect: [ :e | e name = self repositoryName ]
diff --git a/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/instance/repositoryName.st b/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/instance/repositoryName.st
@@ -0,0 +1,4 @@
+configuring
+repositoryName
+
+	^ self subclassResponsibility
diff --git a/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/instance/shouldBeDirty.st b/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/instance/shouldBeDirty.st
@@ -0,0 +1,4 @@
+configuring
+shouldBeDirty
+
+	^ false
diff --git a/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/instance/tearDown.st b/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/instance/tearDown.st
@@ -14,7 +14,7 @@ tearDown
 
 	"Remove temporary repository just in case"
 	'temp/test' asFileReference ensureDeleteAll.
-	(IceLibgitRepository localRepositoriesLocation/'pharo-vcs/pharo-git-test') ensureDeleteAll.
+	(IceLibgitRepository localRepositoriesLocation/'pharo-vcs'/self repositoryName) ensureDeleteAll.
 
 	super tearDown.
 

diff --git a/...acelloIntegrationTests.class/instance/testInstallBaselineWhenNoSSHIsAvailableUsesHTTPS.st b/...acelloIntegrationTests.class/instance/testInstallBaselineWhenNoSSHIsAvailableUsesHTTPS.st
@@ -3,8 +3,7 @@ testInstallBaselineWhenNoSSHIsAvailableUsesHTTPS
 
 	"This test is meant to run in the CI using SSH, when SSH is not available.
 	Other configurations make no sense for this test"
-	self isTestingSSH ifFalse: [ ^ self skip ].
-	self isCI ifFalse: [ ^ self skip ].
+	self isTestingSSH ifTrue: [ ^ self skip ].
 
 	self installBaseline.
 	repository := self repositoryForTest.

diff --git a/...ionTests.class/instance/testInstallBaselineWhileMissingRepositoryIsInstalledIsPossible.st b/...ionTests.class/instance/testInstallBaselineWhileMissingRepositoryIsInstalledIsPossible.st
@@ -11,4 +11,4 @@ testInstallBaselineWhileMissingRepositoryIsInstalledIsPossible
 	self installBaseline.
 	repository := self repositoryForTest.
 
-	self assert: (repository workingCopy loadedPackages allSatisfy: [ :each | each isClean ])
+	self assert: repository workingCopy isModified equals: self shouldBeDirty
diff --git a/....class/instance/testInstallBaselineWithConflictingUnrelatedRepositoryInDiskThrowsError.st b/....class/instance/testInstallBaselineWithConflictingUnrelatedRepositoryInDiskThrowsError.st
@@ -5,6 +5,6 @@ testInstallBaselineWithConflictingUnrelatedRepositoryInDiskThrowsError
 	(self isTestingSSH and: [ self isCI ])
 		ifTrue: [ ^ self skip ].
 
-	self createConflictingRepositoryIn: IceLibgitRepository localRepositoriesLocation/'pharo-vcs/pharo-git-test'.
+	self createConflictingRepositoryIn: IceLibgitRepository localRepositoriesLocation/ 'pharo-vcs' / self repositoryName.
 
 	self should: [ self installBaseline ] raise: IceMetacelloDuplicatedNotification
diff --git a/....package/IceMetacelloIntegrationTests.class/instance/testNewRepositoryPackagesAreClean.st b/....package/IceMetacelloIntegrationTests.class/instance/testNewRepositoryPackagesAreClean.st
@@ -8,4 +8,4 @@ testNewRepositoryPackagesAreClean
 	self installBaseline.
 	repository := self repositoryForTest.
 
-	self assert: (repository workingCopy loadedPackages allSatisfy: [ :each | each isClean ])
+	self assert: repository workingCopy isModified equals: self shouldBeDirty
diff --git a/...s.class/instance/testProjectIsNotDirty.st → ...ts.class/instance/testProjectDirtiness.st b/...s.class/instance/testProjectIsNotDirty.st → ...ts.class/instance/testProjectDirtiness.st
@@ -1,11 +1,11 @@
 tests
-testProjectIsNotDirty
+testProjectDirtiness
 
 	"Avoid this test if on ssh on the CI"
 	(self isTestingSSH and: [ self isCI ])
 		ifTrue: [ ^ self skip ].
 
 	self installBaseline.
 	repository := self repositoryForTest.
-		
-	self deny: repository isModified
+
+	self assert: repository isModified equals: self shouldBeDirty
diff --git a/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/instance/testProjectFileFormat.st b/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/instance/testProjectFileFormat.st
@@ -0,0 +1,11 @@
+tests
+testProjectFileFormat
+
+	"Avoid this test if on ssh on the CI"
+	(self isTestingSSH and: [ self isCI ])
+		ifTrue: [ ^ self skip ].
+
+	self installBaseline.
+	repository := self repositoryForTest.
+
+	self assert: repository project fileFormat equals: self expectedFileFormat.
diff --git a/...erg-Tests.package/IceMetacelloIntegrationTests.class/instance/testProjectHasDescriptor.st b/...erg-Tests.package/IceMetacelloIntegrationTests.class/instance/testProjectHasDescriptor.st
@@ -0,0 +1,11 @@
+tests
+testProjectHasDescriptor
+
+	"Avoid this test if on ssh on the CI"
+	(self isTestingSSH and: [ self isCI ])
+		ifTrue: [ ^ self skip ].
+
+	self installBaseline.
+	repository := self repositoryForTest.
+
+	self assert: repository project isUnbornProject equals: self hasProject not.
diff --git a/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/properties.json b/Iceberg-Tests.package/IceMetacelloIntegrationTests.class/properties.json
@@ -4,7 +4,9 @@
 	"category" : "Iceberg-Tests-MetacelloIntegration",
 	"classinstvars" : [ ],
 	"pools" : [ ],
-	"classvars" : [ ],
+	"classvars" : [
+		"CommitishToUse"
+	],
 	"instvars" : [
 		"repository",
 		"conflictingRepository"

diff --git a/...rg-Tests.package/IceMetacelloIntegrationWithBranchTests.class/instance/installBaseline.st b/...rg-Tests.package/IceMetacelloIntegrationWithBranchTests.class/instance/installBaseline.st
diff --git a/...sts.package/IceMetacelloIntegrationWithDefaultHEADTests.class/instance/installBaseline.st b/...sts.package/IceMetacelloIntegrationWithDefaultHEADTests.class/instance/installBaseline.st
diff --git a/...ntegrationWithBranchTests.class/README.md → ...ionWithProjectAndNoSrcDir.class/README.md b/...ntegrationWithBranchTests.class/README.md → ...ionWithProjectAndNoSrcDir.class/README.md
diff --git a/...sts.package/IceMetacelloIntegrationWithProjectAndNoSrcDir.class/class/commitishOptions.st b/...sts.package/IceMetacelloIntegrationWithProjectAndNoSrcDir.class/class/commitishOptions.st
@@ -0,0 +1,5 @@
+testing
+commitishOptions
+
+	^	super commitishOptions , {	':61024d7e81eac0b752ade9f3e03f6e2bd34ee5bf' "With commit"}
+
diff --git a/...ackage/IceMetacelloIntegrationWithProjectAndNoSrcDir.class/instance/expectedFileFormat.st b/...ackage/IceMetacelloIntegrationWithProjectAndNoSrcDir.class/instance/expectedFileFormat.st
@@ -0,0 +1,3 @@
+configuring
+expectedFileFormat
+	^ IceLibgitFiletreeWriter
diff --git a/...-Tests.package/IceMetacelloIntegrationWithProjectAndNoSrcDir.class/instance/hasProject.st b/...-Tests.package/IceMetacelloIntegrationWithProjectAndNoSrcDir.class/instance/hasProject.st
@@ -0,0 +1,4 @@
+configuring
+hasProject
+
+	^ true
diff --git a/...ts.package/IceMetacelloIntegrationWithProjectAndNoSrcDir.class/instance/repositoryName.st b/...ts.package/IceMetacelloIntegrationWithProjectAndNoSrcDir.class/instance/repositoryName.st
@@ -0,0 +1,4 @@
+configuring
+repositoryName
+
+	^ 'pharo-git-test-withProject-and-noSource'
diff --git a/...sts.package/IceMetacelloIntegrationWithProjectAndNoSrcDir.class/instance/shouldBeDirty.st b/...sts.package/IceMetacelloIntegrationWithProjectAndNoSrcDir.class/instance/shouldBeDirty.st
@@ -0,0 +1,4 @@
+configuring
+shouldBeDirty
+
+	^ false
diff --git a/...grationWithTagTests.class/properties.json → ...hProjectAndNoSrcDir.class/properties.json b/...grationWithTagTests.class/properties.json → ...hProjectAndNoSrcDir.class/properties.json
@@ -6,6 +6,6 @@
 	"pools" : [ ],
 	"classvars" : [ ],
 	"instvars" : [ ],
-	"name" : "IceMetacelloIntegrationWithTagTests",
+	"name" : "IceMetacelloIntegrationWithProjectAndNoSrcDir",
 	"type" : "normal"
 }
diff --git a/...ationWithDefaultHEADTests.class/README.md → ...ationWithProjectAndSrcDir.class/README.md b/...ationWithDefaultHEADTests.class/README.md → ...ationWithProjectAndSrcDir.class/README.md
diff --git a/...Tests.package/IceMetacelloIntegrationWithProjectAndSrcDir.class/class/commitishOptions.st b/...Tests.package/IceMetacelloIntegrationWithProjectAndSrcDir.class/class/commitishOptions.st
@@ -0,0 +1,13 @@
+testing
+commitishOptions
+
+	^	super commitishOptions , {	
+			':30c9f38109f437d184b4017e7d9da9d953266e8b'. "With commit" 
+			"Adding the src directory"
+			'/src'. "Without commitish"
+			':forBecomeWriteable/src'. "With branch"
+			':1.2.3/src'. "with tag"
+			':30c9f38109f437d184b4017e7d9da9d953266e8b/src'. "With commit" }
+
+
+
diff --git a/....package/IceMetacelloIntegrationWithProjectAndSrcDir.class/instance/expectedFileFormat.st b/....package/IceMetacelloIntegrationWithProjectAndSrcDir.class/instance/expectedFileFormat.st
@@ -0,0 +1,3 @@
+configuring
+expectedFileFormat
+	^ IceLibgitFiletreeWriter
diff --git a/...rg-Tests.package/IceMetacelloIntegrationWithProjectAndSrcDir.class/instance/hasProject.st b/...rg-Tests.package/IceMetacelloIntegrationWithProjectAndSrcDir.class/instance/hasProject.st
@@ -0,0 +1,4 @@
+configuring
+hasProject
+
+	^ true
diff --git a/...ests.package/IceMetacelloIntegrationWithProjectAndSrcDir.class/instance/repositoryName.st b/...ests.package/IceMetacelloIntegrationWithProjectAndSrcDir.class/instance/repositoryName.st
@@ -0,0 +1,4 @@
+configuring
+repositoryName
+
+	^ 'pharo-git-test-withProject-and-source'
diff --git a/...Tests.package/IceMetacelloIntegrationWithProjectAndSrcDir.class/instance/shouldBeDirty.st b/...Tests.package/IceMetacelloIntegrationWithProjectAndSrcDir.class/instance/shouldBeDirty.st
@@ -0,0 +1,4 @@
+configuring
+shouldBeDirty
+
+	^ false
diff --git a/...ithDefaultHEADTests.class/properties.json → ...ithProjectAndSrcDir.class/properties.json b/...ithDefaultHEADTests.class/properties.json → ...ithProjectAndSrcDir.class/properties.json
@@ -6,6 +6,6 @@
 	"pools" : [ ],
 	"classvars" : [ ],
 	"instvars" : [ ],
-	"name" : "IceMetacelloIntegrationWithDefaultHEADTests",
+	"name" : "IceMetacelloIntegrationWithProjectAndSrcDir",
 	"type" : "normal"
 }