rf: Move test functions into test file

Author: effigies

src/files/filetree.test.ts

@@ -1,7 +1,25 @@
 import { assert, assertEquals } from '@std/assert'
-import type { FileIgnoreRules } from './ignore.ts'
-import type { BIDSFile, FileTree } from '../types/filetree.ts'
-import { filesToTree, pathsToTree } from './filetree.ts'
+import { FileIgnoreRules } from './ignore.ts'
+import { BIDSFile, type FileOpener, type FileTree } from '../types/filetree.ts'
+import { filesToTree } from './filetree.ts'
+import { asyncStreamFromString } from '../tests/utils.ts'
+
+class NullFileOpener implements FileOpener {
+  size = 0
+  stream = () => asyncStreamFromString('')
+  text = () => Promise.resolve('')
+  readBytes = async (size: number, offset?: number) => new Uint8Array()
+}
+
+export function pathToFile(path: string, ignored: boolean = false): BIDSFile {
+  const name = path.split('/').pop() as string
+  return new BIDSFile(path, new NullFileOpener(), ignored)
+}
+
+export function pathsToTree(paths: string[], ignore?: string[]): FileTree {
+  const ignoreRules = new FileIgnoreRules(ignore ?? [])
+  return filesToTree(paths.map((path) => pathToFile(path, ignoreRules.test(path))))
+}
 
 Deno.test('FileTree generation', async (t) => {
   await t.step('converts a basic list', async () => {

src/files/filetree.ts

@@ -1,25 +1,7 @@
 import { parse, SEPARATOR_PATTERN } from '@std/path'
 import * as posix from '@std/path/posix'
-import { BIDSFile, FileOpener, FileTree } from '../types/filetree.ts'
+import { BIDSFile, FileTree } from '../types/filetree.ts'
 import { FileIgnoreRules } from './ignore.ts'
-import { asyncStreamFromString } from '../tests/utils.ts'
-
-class NullFileOpener implements FileOpener {
-  size = 0
-  stream = () => asyncStreamFromString('')
-  text = () => Promise.resolve('')
-  readBytes = async (size: number, offset?: number) => new Uint8Array()
-}
-
-export function pathToFile(path: string, ignored: boolean = false): BIDSFile {
-  const name = path.split('/').pop() as string
-  return new BIDSFile(path, new NullFileOpener(), ignored)
-}
-
-export function pathsToTree(paths: string[], ignore?: string[]): FileTree {
-  const ignoreRules = new FileIgnoreRules(ignore ?? [])
-  return filesToTree(paths.map((path) => pathToFile(path, ignoreRules.test(path))))
-}
 
 export function filesToTree(fileList: BIDSFile[], ignore?: FileIgnoreRules): FileTree {
   ignore = ignore ?? new FileIgnoreRules([])

src/files/inheritance.test.ts

@@ -1,6 +1,6 @@
 import { assert, assertEquals, assertThrows } from '@std/assert'
 import type { BIDSFile } from '../types/filetree.ts'
-import { pathsToTree } from './filetree.ts'
+import { pathsToTree } from './filetree.test.ts'
 import { walkBack } from './inheritance.ts'
 
 Deno.test('walkback inheritance tests', async (t) => {

src/files/json.test.ts

@@ -3,7 +3,7 @@ import type { BIDSFile } from '../types/filetree.ts'
 import type { FileIgnoreRules } from './ignore.ts'
 import { testAsyncFileAccess } from './access.test.ts'
 
-import { pathsToTree } from '../files/filetree.ts'
+import { pathsToTree } from '../files/filetree.test.ts'
 import { loadJSON } from './json.ts'
 
 function encodeUTF16(text: string) {

src/files/tsv.test.ts

@@ -5,7 +5,7 @@ import {
   assertObjectMatch,
   assertStrictEquals,
 } from '@std/assert'
-import { pathToFile } from './filetree.ts'
+import { pathToFile } from './filetree.test.ts'
 import { BIDSFileDeno } from './deno.ts'
 import { loadTSV, loadTSVGZ } from './tsv.ts'
 import { asyncStreamFromString } from '../tests/utils.ts'

src/issues/datasetIssues.test.ts

@@ -1,5 +1,5 @@
 import { assert, assertEquals, assertThrows } from '@std/assert'
-import { pathsToTree } from '../files/filetree.ts'
+import { pathsToTree } from '../files/filetree.test.ts'
 import { DatasetIssues } from './datasetIssues.ts'
 
 Deno.test('DatasetIssues management class', async (t) => {

src/schema/datatypes.test.ts

@@ -1,7 +1,7 @@
 import { assert, assertObjectMatch } from '@std/assert'
 import { loadSchema } from '../setup/loadSchema.ts'
 import { BIDSContext, BIDSContextDataset } from '../schema/context.ts'
-import { pathsToTree } from '../files/filetree.ts'
+import { pathsToTree } from '../files/filetree.test.ts'
 import type { BIDSFile } from '../types/filetree.ts'
 
 import { findDatatype, modalityTable } from './datatypes.ts'

src/schema/fixtures.test.ts

@@ -1,5 +1,5 @@
 import type { BIDSFile, FileTree } from '../types/filetree.ts'
-import { pathsToTree } from '../files/filetree.ts'
+import { pathsToTree } from '../files/filetree.test.ts'
 import { nullReadBytes } from '../tests/nullReadBytes.ts'
 
 const anatJson = JSON.stringify({

src/schema/walk.test.ts

@@ -3,7 +3,7 @@ import { BIDSContext, BIDSContextDataset } from './context.ts'
 import { walkFileTree } from './walk.ts'
 import type { DatasetIssues } from '../issues/datasetIssues.ts'
 import { simpleDataset, simpleDatasetFileCount } from '../tests/simple-dataset.ts'
-import { pathsToTree } from '../files/filetree.ts'
+import { pathsToTree } from '../files/filetree.test.ts'
 import { loadSchema } from '../setup/loadSchema.ts'
 
 Deno.test('file tree walking', async (t) => {

src/tests/regression.test.ts

@@ -1,5 +1,5 @@
 import { assert } from '@std/assert'
-import { pathsToTree } from '../files/filetree.ts'
+import { pathsToTree } from '../files/filetree.test.ts'
 import { validate } from '../validators/bids.ts'
 import type { BIDSFile } from '../types/filetree.ts'
 import { asyncStreamFromString } from './utils.ts'