Merge pull request #1849 from tinchodias/21167-Epicea-create-test-dir…

…ectory-in-temp Use /tmp (or analog in other OSs) instead of the working "directory"
pharo-project · Oct 2, 2018 · 5faf5ce · 5faf5ce
2 parents a787b88 + 2b8d95d
commit 5faf5ce
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 42 deletions.
diff --git a/src/Epicea-Tests/EpTestLogBuilder.class.st b/src/Epicea-Tests/EpTestLogBuilder.class.st
@@ -83,7 +83,7 @@ EpTestLogBuilder >> logInitial [
 { #category : #initialization }
 EpTestLogBuilder >> newDirectory [
 
-	^ ('epicea-tests-', UUID new asString36) asFileReference
+	^ FileReference newTempFilePrefix: 'epicea-tests-' suffix: ''
 ]
 
 { #category : #initialization }

diff --git a/src/EpiceaBrowsers-Tests/EpOmbuExporterTest.class.st b/src/EpiceaBrowsers-Tests/EpOmbuExporterTest.class.st
@@ -5,45 +5,42 @@ Class {
 		'outputLog',
 		'inputLog1',
 		'inputLog2',
+		'outputDirectory',
 		'logBuilder1',
 		'logBuilder2'
 	],
 	#category : #'EpiceaBrowsers-Tests-Exporter'
 }
 
-{ #category : #accessing }
-EpOmbuExporterTest >> outputLogNameForTest [
-
-	^ self className, 'LogForTest'
-]
-
 { #category : #running }
-EpOmbuExporterTest >> setUp [ 
+EpOmbuExporterTest >> setUp [
+
 	super setUp.
-	
+
 	logBuilder1 := EpTestLogBuilder new.
-	logBuilder2 := EpTestLogBuilder new.	
+	logBuilder2 := EpTestLogBuilder new.
+
+	"Create 2 logs in different directories"
 	inputLog1 := logBuilder1 oneTriggerWithFourChildrenLog.
 	inputLog2 := logBuilder2 oneTriggerWithOneChildLog.
-	outputLog := EpLog newWithStore: OmFileStore new.
 
+	outputDirectory := logBuilder2 directory.
+	outputLog := EpLog
+		newWithStore: (OmFileStore named: 'exported' inDirectory: outputDirectory)
 ]
 
 { #category : #running }
 EpOmbuExporterTest >> tearDown [
 
 	logBuilder1 cleanUp.
 	logBuilder2 cleanUp.
-
-	(FileSystem workingDirectory / (self outputLogNameForTest, '.ombu')) ensureDelete.
-
 	super tearDown.
 ]
 
 { #category : #tests }
 EpOmbuExporterTest >> testBasicExport [
+
 	| selection outputResult |
-
 	selection := inputLog1 entries.
 
 	EpOmbuExporter new 
@@ -91,22 +88,16 @@ EpOmbuExporterTest >> testCommentExportWithDependencyFix [
 { #category : #tests }
 EpOmbuExporterTest >> testRoundtrip [
 
-	| aLog anotherLog |
-	aLog := 
-		EpLog newWithStore: 
-			(OmFileStore 
-				named: self outputLogNameForTest
-				inDirectory: FileSystem workingDirectory).
-
+	| outputLogReopened |
 	EpOmbuExporter new 
-		outputLog: aLog;
+		outputLog: outputLog;
 		fileOut: inputLog1 entries.
 
-	anotherLog := 
-		EpLog newWithStore: 
-			(OmFileStore 
-				named: self outputLogNameForTest
-				inDirectory: FileSystem workingDirectory).
+	"Open a fresh log with the exported entries. 
+	(fresh, to be sure it was correctly written to disk)"
+	outputLogReopened := EpLog newWithStore: outputLog store flush copyReopened refresh.
 
-	self assert: anotherLog entries size equals: inputLog1 entries size.
+	self
+		assert: outputLogReopened entries size
+		equals: inputLog1 entries size
 ]
diff --git a/src/Ombu-Tests/OmFileStoreTest.class.st b/src/Ombu-Tests/OmFileStoreTest.class.st
@@ -4,12 +4,6 @@ Class {
 	#category : #'Ombu-Tests'
 }
 
-{ #category : #resources }
-OmFileStoreTest >> directoryForTests [
-
-	^ FileSystem workingDirectory
-]
-
 { #category : #resources }
 OmFileStoreTest >> setUpOtherStore [
 

diff --git a/src/Ombu-Tests/OmSessionStoreNameStrategyTest.class.st b/src/Ombu-Tests/OmSessionStoreNameStrategyTest.class.st
@@ -28,7 +28,7 @@ OmSessionStoreNameStrategyTest >> createFileWith: aName [
 { #category : #private }
 OmSessionStoreNameStrategyTest >> directory [
 
-	^ 'ombu-strategy-tests' asFileReference
+	^ FileLocator temp asFileReference / 'ombu-strategy-tests'
 ]
 
 { #category : #private }
@@ -41,6 +41,7 @@ OmSessionStoreNameStrategyTest >> fileReferenceWith: aName [
 
 { #category : #running }
 OmSessionStoreNameStrategyTest >> setUp [
+
 	super setUp.
 	strategy := self strategyClass new
 ]

diff --git a/src/Ombu-Tests/OmSessionStoreTest.class.st b/src/Ombu-Tests/OmSessionStoreTest.class.st
@@ -4,12 +4,6 @@ Class {
 	#category : #'Ombu-Tests'
 }
 
-{ #category : #resources }
-OmSessionStoreTest >> directoryForTests [
-
-	^ FileSystem workingDirectory
-]
-
 { #category : #resources }
 OmSessionStoreTest >> setUpOtherStore [
 

diff --git a/src/Ombu-Tests/OmStoreTest.class.st b/src/Ombu-Tests/OmStoreTest.class.st
@@ -26,6 +26,12 @@ OmStoreTest >> beforeAndAfterFlushStore: aBlock [
 	aBlock value.
 ]
 
+{ #category : #resources }
+OmStoreTest >> directoryForTests [
+
+	^ FileLocator temp asFileReference / 'ombu-tests'
+]
+
 { #category : #running }
 OmStoreTest >> setUp [
 	super setUp.