Merge pull request #655 from hernanmd/use_file_list_from_newtools

Use file list from newtools
pharo-spec · Jan 17, 2024 · 435667d · 435667d
2 parents e6f9922 + 917f919
commit 435667d
Show file tree

Hide file tree

Showing 90 changed files with 2,899 additions and 1,323 deletions.
diff --git a/src/BaselineOfNewTools/BaselineOfNewTools.class.st b/src/BaselineOfNewTools/BaselineOfNewTools.class.st
@@ -156,8 +156,9 @@ BaselineOfNewTools >> baseline: spec [
 						'FontChooser' 
 						'Methods'
 				   		'Spotter'
-            					'RewriterTools'
-						'ScopesEditor') ]
+            			'RewriterTools'
+						'ScopesEditor'
+						'FileBrowser') ]
 ]
 
 { #category : 'external projects' }

diff --git a/...ser-Tests/StFBAbstractFilterTest.class.st → ...owser-Tests/StAbstractFilterTest.class.st b/...ser-Tests/StFBAbstractFilterTest.class.st → ...owser-Tests/StAbstractFilterTest.class.st
@@ -2,8 +2,8 @@
 A FDAbstractFilterTest is a test class for testing the behavior of FDAbstractFilter
 "
 Class {
-	#name : 'StFBAbstractFilterTest',
-	#superclass : 'StFBTestCase',
+	#name : 'StAbstractFilterTest',
+	#superclass : 'StFileBrowserTestCase',
 	#instVars : [
 		'filter'
 	],
@@ -13,67 +13,67 @@ Class {
 }
 
 { #category : 'testing' }
-StFBAbstractFilterTest class >> isAbstract [
-	^ self = StFBAbstractFilterTest
+StAbstractFilterTest class >> isAbstract [
+	^ self = StAbstractFilterTest
 ]
 
 { #category : 'accessing' }
-StFBAbstractFilterTest >> actualClass [
+StAbstractFilterTest >> actualClass [
 	^ self subclassResponsibility
 ]
 
 { #category : 'accessing' }
-StFBAbstractFilterTest >> bananaJpg [
+StAbstractFilterTest >> bananaJpg [
 	^ root / 'banana.jpg'
 ]
 
 { #category : 'accessing' }
-StFBAbstractFilterTest >> dir [
+StAbstractFilterTest >> dir [
 	^ root / 'dir'
 ]
 
 { #category : 'accessing' }
-StFBAbstractFilterTest >> dirExt [
+StAbstractFilterTest >> dirExt [
 	^ root / 'dir.ext'
 ]
 
 { #category : 'instance creation' }
-StFBAbstractFilterTest >> fileNamed: aString [
+StAbstractFilterTest >> fileNamed: aString [
 	^ FileSystem memory / aString
 ]
 
 { #category : 'accessing' }
-StFBAbstractFilterTest >> hidden [
+StAbstractFilterTest >> hidden [
 	^ root / '.hidden'
 ]
 
 { #category : 'accessing' }
-StFBAbstractFilterTest >> hiddenDir [
+StAbstractFilterTest >> hiddenDir [
 	^ root / '.hidden-dir'
 ]
 
 { #category : 'accessing' }
-StFBAbstractFilterTest >> patatePng [
+StAbstractFilterTest >> patatePng [
 	^ root / 'patate.png'
 ]
 
 { #category : 'running' }
-StFBAbstractFilterTest >> setUp [
+StAbstractFilterTest >> setUp [
 	super setUp.
 	filter := self actualClass new
 ]
 
 { #category : 'accessing' }
-StFBAbstractFilterTest >> sthAaa [
+StAbstractFilterTest >> sthAaa [
 	^ root / 'sth.aaa'
 ]
 
 { #category : 'accessing' }
-StFBAbstractFilterTest >> sthExt [
+StAbstractFilterTest >> sthExt [
 	^ root / 'sth.ext'
 ]
 
 { #category : 'tests' }
-StFBAbstractFilterTest >> testPredicate [
+StAbstractFilterTest >> testPredicate [
 	self subclassResponsibility
 ]
diff --git a/...owser-Tests/StFBBitmapFilterTest.class.st → ...Browser-Tests/StBitmapFilterTest.class.st b/...owser-Tests/StFBBitmapFilterTest.class.st → ...Browser-Tests/StBitmapFilterTest.class.st
@@ -2,20 +2,20 @@
 A FDBitmapFilterTest is a test class for testing the behavior of FDBitmapFilter
 "
 Class {
-	#name : 'StFBBitmapFilterTest',
-	#superclass : 'StFBExtensionsFilterTest',
+	#name : 'StBitmapFilterTest',
+	#superclass : 'StExtensionsFilterTest',
 	#category : 'NewTools-FileBrowser-Tests-Filtering',
 	#package : 'NewTools-FileBrowser-Tests',
 	#tag : 'Filtering'
 }
 
 { #category : 'accessing' }
-StFBBitmapFilterTest >> actualClass [
-	^ StFBBitmapFilter
+StBitmapFilterTest >> actualClass [
+	^ StBitmapFilter
 ]
 
 { #category : 'tests' }
-StFBBitmapFilterTest >> testPredicate [
+StBitmapFilterTest >> testPredicate [
 	self assert: (filter predicate: (self fileNamed: 'bitmap.bmp')).
 	self assert: (filter predicate: (self fileNamed: 'bitmap.dib')).
 	self deny: (filter predicate: (self fileNamed: 'bitmap.png'))

diff --git a/...ests/StFBWindowPathPresenterTest.class.st → ...-Tests/StBreadcrumbPresenterTest.class.st b/...ests/StFBWindowPathPresenterTest.class.st → ...-Tests/StBreadcrumbPresenterTest.class.st
@@ -1,6 +1,6 @@
 Class {
-	#name : 'StFBWindowPathPresenterTest',
-	#superclass : 'StFBTestCase',
+	#name : 'StBreadcrumbPresenterTest',
+	#superclass : 'StFileBrowserTestCase',
 	#instVars : [
 		'windowPathUI'
 	],
@@ -10,19 +10,21 @@ Class {
 }
 
 { #category : 'running' }
-StFBWindowPathPresenterTest >> setUp [
+StBreadcrumbPresenterTest >> setUp [
 	super setUp.
-	windowPathUI := StFBWindowPathPresenter new
+	windowPathUI := StPathBreadcrumbPresenter 
+		owner: fileSystemPresenter 
+		on: fileSystemModel
 ]
 
 { #category : 'running' }
-StFBWindowPathPresenterTest >> tearDown [
+StBreadcrumbPresenterTest >> tearDown [
 	windowPathUI withWindowDo: [ :window | window close ].
 	super tearDown
 ]
 
 { #category : 'tests' }
-StFBWindowPathPresenterTest >> testRoot [
+StBreadcrumbPresenterTest >> testRoot [
 
 	windowPathUI currentDirectory: FileLocator root.
 	windowPathUI open.

diff --git a/...er-Tests/StFBDirectoryFilterTest.class.st → ...wser-Tests/StDirectoryFilterTest.class.st b/...er-Tests/StFBDirectoryFilterTest.class.st → ...wser-Tests/StDirectoryFilterTest.class.st
@@ -2,19 +2,20 @@
 A FDDirectoryFilterTest is a test class for testing the behavior of FDDirectoryFilter
 "
 Class {
-	#name : 'StFBDirectoryFilterTest',
-	#superclass : 'StFBAbstractFilterTest',
+	#name : 'StDirectoryFilterTest',
+	#superclass : 'StAbstractFilterTest',
 	#category : 'NewTools-FileBrowser-Tests-Filtering',
 	#package : 'NewTools-FileBrowser-Tests',
 	#tag : 'Filtering'
 }
 
 { #category : 'accessing' }
-StFBDirectoryFilterTest >> actualClass [
-	^ StFBDirectoryFilter
+StDirectoryFilterTest >> actualClass [
+
+	^ StDirectoryFilter
 ]
 
 { #category : 'tests' }
-StFBDirectoryFilterTest >> testPredicate [
+StDirectoryFilterTest >> testPredicate [
 	self assertCollection: (filter applyOn: root children) hasSameElements: {self dir . self dirExt . self hiddenDir}
 ]
diff --git a/...r-Tests/StFBExtensionsFilterTest.class.st → ...ser-Tests/StExtensionsFilterTest.class.st b/...r-Tests/StFBExtensionsFilterTest.class.st → ...ser-Tests/StExtensionsFilterTest.class.st
@@ -2,14 +2,14 @@
 A FDExtensionsFilterTest is a test class for testing the behavior of FDExtensionsFilter
 "
 Class {
-	#name : 'StFBExtensionsFilterTest',
-	#superclass : 'StFBAbstractFilterTest',
+	#name : 'StExtensionsFilterTest',
+	#superclass : 'StAbstractFilterTest',
 	#category : 'NewTools-FileBrowser-Tests-Filtering',
 	#package : 'NewTools-FileBrowser-Tests',
 	#tag : 'Filtering'
 }
 
 { #category : 'testing' }
-StFBExtensionsFilterTest class >> isAbstract [
-	^ self = StFBExtensionsFilterTest
+StExtensionsFilterTest class >> isAbstract [
+	^ self = StExtensionsFilterTest
 ]
diff --git a/src/NewTools-FileBrowser-Tests/StFBTestCase.class.st b/src/NewTools-FileBrowser-Tests/StFBTestCase.class.st
diff --git a/src/NewTools-FileBrowser-Tests/StFileBrowserTestCase.class.st b/src/NewTools-FileBrowser-Tests/StFileBrowserTestCase.class.st
@@ -0,0 +1,42 @@
+Class {
+	#name : 'StFileBrowserTestCase',
+	#superclass : 'TestCase',
+	#instVars : [
+		'root',
+		'fileSystemModel',
+		'fileSystemPresenter'
+	],
+	#category : 'NewTools-FileBrowser-Tests-UI',
+	#package : 'NewTools-FileBrowser-Tests',
+	#tag : 'UI'
+}
+
+{ #category : 'testing' }
+StFileBrowserTestCase class >> isAbstract [
+	^ self = StFileBrowserTestCase
+]
+
+{ #category : 'accessing' }
+StFileBrowserTestCase class >> resources [
+	^ {StFileSystemResource}
+]
+
+{ #category : 'testing' }
+StFileBrowserTestCase class >> shouldInheritSelectors [
+	^ true
+]
+
+{ #category : 'instance creation' }
+StFileBrowserTestCase >> inspectRoot [
+	<script: 'self basicNew createRoot asFileReference inspect'>
+
+]
+
+{ #category : 'running' }
+StFileBrowserTestCase >> setUp [
+
+	super setUp.
+	fileSystemModel := StFileSystemModel new.
+	fileSystemPresenter := StFileSystemPresenter on: fileSystemModel.
+	root := StFileSystemResource current root
+]