From 1fd3fa8907645923ff2b8587e0d578278130c7d2 Mon Sep 17 00:00:00 2001 From: Gleb Koval Date: Wed, 20 Dec 2023 15:12:56 +0000 Subject: [PATCH] Linting --- .editorconfig | 5 +- src/main/kotlin/filesystem/FSCreator.kt | 8 +- src/main/kotlin/filesystem/FSEntry.kt | 4 +- src/test/kotlin/filesystem/FSCreatorTest.kt | 96 ++++++++++++++------- 4 files changed, 79 insertions(+), 34 deletions(-) diff --git a/.editorconfig b/.editorconfig index e515871..ddafa2d 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,4 +10,7 @@ max_line_length = 120 tab_width = 4 [{*.yaml,*.yml}] -indent_size = 2 \ No newline at end of file +indent_size = 2 + +[{*.kt,*.kts}] +ij_kotlin_packages_to_use_import_on_demand = org.junit.jupiter.api \ No newline at end of file diff --git a/src/main/kotlin/filesystem/FSCreator.kt b/src/main/kotlin/filesystem/FSCreator.kt index 3c277f0..51ef381 100644 --- a/src/main/kotlin/filesystem/FSCreator.kt +++ b/src/main/kotlin/filesystem/FSCreator.kt @@ -8,7 +8,10 @@ import java.nio.file.Path class FSCreator { // Create entry, leaving existing folders' contents, but overwriting existing files. @Throws(FileSystemException::class) - fun create(entryToCreate: FSEntry, destination: String) { + fun create( + entryToCreate: FSEntry, + destination: String, + ) { val queue = ArrayDeque>() queue.add(entryToCreate to Path.of(destination)) @@ -20,7 +23,8 @@ class FSCreator { is FSFile -> Files.createFile(path) is FSFolder -> Files.createDirectory(path) } - } catch (_: FileAlreadyExistsException) {} // Allow files/folders to already exist. + } catch (_: FileAlreadyExistsException) { + } // Allow files/folders to already exist. when (entry) { is FSFile -> Files.write(path, entry.content.toByteArray()) is FSFolder -> queue.addAll(entry.entries.map { it to path }) diff --git a/src/main/kotlin/filesystem/FSEntry.kt b/src/main/kotlin/filesystem/FSEntry.kt index 6e158b0..531da2a 100644 --- a/src/main/kotlin/filesystem/FSEntry.kt +++ b/src/main/kotlin/filesystem/FSEntry.kt @@ -4,6 +4,6 @@ package filesystem // (as we expect), and it also makes the class abstract as required. sealed class FSEntry(val name: String) -class FSFile(name: String, val content: String): FSEntry(name) +class FSFile(name: String, val content: String) : FSEntry(name) -class FSFolder(name: String, val entries: List): FSEntry(name) \ No newline at end of file +class FSFolder(name: String, val entries: List) : FSEntry(name) \ No newline at end of file diff --git a/src/test/kotlin/filesystem/FSCreatorTest.kt b/src/test/kotlin/filesystem/FSCreatorTest.kt index 249c0bf..7cc3fe1 100644 --- a/src/test/kotlin/filesystem/FSCreatorTest.kt +++ b/src/test/kotlin/filesystem/FSCreatorTest.kt @@ -29,19 +29,36 @@ class FSCreatorTest { fun `create entries`() { val readme = FSFile("README", "Hello World!") val gomod = FSFile("go.mod", "module example.com/hello-world\n\ngo1.21.5") - val maingo = FSFile("main.go", "package main\n\nimport \"example.com/hello-world/utils\"\n\n" + - "func main() {\n\tprintln(\"Hello World!\")\n}") - val helloworldgo = FSFile("hello-world.go", "package utils\n\nfunc PrintHelloWorld() {\n" + - "\tprintln(\"Hello World!\")\n}") + val maingo = + FSFile( + "main.go", + "package main\n\nimport \"example.com/hello-world/utils\"\n\n" + + "func main() {\n\tprintln(\"Hello World!\")\n}", + ) + val helloworldgo = + FSFile( + "hello-world.go", + "package utils\n\nfunc PrintHelloWorld() {\n" + + "\tprintln(\"Hello World!\")\n}", + ) assertDoesNotThrow("should create entries") { - creator.create(FSFolder("folder", listOf( - readme, - gomod, - maingo, - FSFolder("utils", listOf( - helloworldgo - )) - )), "_tmp") + creator.create( + FSFolder( + "folder", + listOf( + readme, + gomod, + maingo, + FSFolder( + "utils", + listOf( + helloworldgo, + ), + ), + ), + ), + "_tmp", + ) } // If objects don't exist, these functions will throw anyway, so don't explicitly check for existence. // Similarly, don't explicitly check if an object is a directory. @@ -54,25 +71,46 @@ class FSCreatorTest { @Test fun `create existing entries`() { assertDoesNotThrow("creation one") { - creator.create(FSFolder("folder", listOf( - FSFolder("sub-folder", listOf( - FSFile("hi", "hi") - )), - FSFolder("another-folder", listOf()), - FSFile("1.txt", "One!"), - FSFile("2.txt", "Two!") - )), "_tmp") + creator.create( + FSFolder( + "folder", + listOf( + FSFolder( + "sub-folder", + listOf( + FSFile("hi", "hi"), + ), + ), + FSFolder("another-folder", listOf()), + FSFile("1.txt", "One!"), + FSFile("2.txt", "Two!"), + ), + ), + "_tmp", + ) } assertDoesNotThrow("creation two") { - creator.create(FSFolder("folder", listOf( - FSFolder("another-folder", listOf( - FSFolder("secrets", listOf( - FSFile("secret", "P4ssW0rd") - )) - )), - FSFile("1.txt", "One is a good number"), - FSFile("3.txt", "Three!") - )), "_tmp") + creator.create( + FSFolder( + "folder", + listOf( + FSFolder( + "another-folder", + listOf( + FSFolder( + "secrets", + listOf( + FSFile("secret", "P4ssW0rd"), + ), + ), + ), + ), + FSFile("1.txt", "One is a good number"), + FSFile("3.txt", "Three!"), + ), + ), + "_tmp", + ) } assertEquals("hi", Files.readString(Path.of("_tmp/folder/sub-folder/hi"))) assertEquals("P4ssW0rd", Files.readString(Path.of("_tmp/folder/another-folder/secrets/secret")))