From e49692818ebcf5c56807fb7ca85b02358dcc18a0 Mon Sep 17 00:00:00 2001 From: Robert Vokac Date: Sat, 12 Oct 2024 09:11:14 +0200 Subject: [PATCH] Storage was replaced by FileSystem --- .../backend/libgdx/AudioLibGDXImpl.java | 6 +-- .../backend/libgdx/FilesLibGDXImpl.java | 28 +++++------ ...oidStorage.java => AndroidFileSystem.java} | 6 +-- ...orage.java => AssetsLibGDXFileSystem.java} | 12 ++--- ...age.java => DesktopAndroidFileSystem.java} | 28 +++++------ ...topStorage.java => DesktopFileSystem.java} | 6 +-- ...ageFactory.java => FileSystemFactory.java} | 30 ++++++------ ...torage.java => PreferencesFileSystem.java} | 12 ++--- ...java => DesktopAndroidFileSystemTest.java} | 49 +++++++++---------- 9 files changed, 88 insertions(+), 89 deletions(-) rename src/main/java/com/pixelgamelibrary/backend/libgdx/files/{AndroidStorage.java => AndroidFileSystem.java} (89%) rename src/main/java/com/pixelgamelibrary/backend/libgdx/files/{AssetsLibGDXStorage.java => AssetsLibGDXFileSystem.java} (95%) rename src/main/java/com/pixelgamelibrary/backend/libgdx/files/{DesktopAndroidStorage.java => DesktopAndroidFileSystem.java} (91%) rename src/main/java/com/pixelgamelibrary/backend/libgdx/files/{DesktopStorage.java => DesktopFileSystem.java} (89%) rename src/main/java/com/pixelgamelibrary/backend/libgdx/files/{StorageFactory.java => FileSystemFactory.java} (70%) rename src/main/java/com/pixelgamelibrary/backend/libgdx/files/{PreferencesStorage.java => PreferencesFileSystem.java} (80%) rename src/test/java/com/pixelgamelibrary/backend/libgdx/files/{DesktopAndroidStorageTest.java => DesktopAndroidFileSystemTest.java} (89%) diff --git a/src/main/java/com/pixelgamelibrary/backend/libgdx/AudioLibGDXImpl.java b/src/main/java/com/pixelgamelibrary/backend/libgdx/AudioLibGDXImpl.java index 8a6a03e..04ca7a0 100644 --- a/src/main/java/com/pixelgamelibrary/backend/libgdx/AudioLibGDXImpl.java +++ b/src/main/java/com/pixelgamelibrary/backend/libgdx/AudioLibGDXImpl.java @@ -22,7 +22,7 @@ package com.pixelgamelibrary.backend.libgdx; import com.pixelgamelibrary.api.audio.Music; import com.pixelgamelibrary.api.audio.Sound; import com.pixelgamelibrary.api.interfaces.Audio; -import com.pixelgamelibrary.api.files.FileHandle; +import com.pixelgamelibrary.api.files.File; /** * @@ -31,12 +31,12 @@ import com.pixelgamelibrary.api.files.FileHandle; public class AudioLibGDXImpl implements Audio { @Override - public Sound newSound(FileHandle fileHandle) { + public Sound newSound(File fileHandle) { throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody } @Override - public Music newMusic(FileHandle fileHandle) { + public Music newMusic(File fileHandle) { throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody } diff --git a/src/main/java/com/pixelgamelibrary/backend/libgdx/FilesLibGDXImpl.java b/src/main/java/com/pixelgamelibrary/backend/libgdx/FilesLibGDXImpl.java index 9c5cb97..2367cb5 100644 --- a/src/main/java/com/pixelgamelibrary/backend/libgdx/FilesLibGDXImpl.java +++ b/src/main/java/com/pixelgamelibrary/backend/libgdx/FilesLibGDXImpl.java @@ -19,47 +19,47 @@ /////////////////////////////////////////////////////////////////////////////////////////////// package com.pixelgamelibrary.backend.libgdx; -import com.pixelgamelibrary.backend.libgdx.files.StorageFactory; -import com.pixelgamelibrary.api.files.Storage; +import com.pixelgamelibrary.backend.libgdx.files.FileSystemFactory; import com.pixelgamelibrary.api.interfaces.Files; -import com.pixelgamelibrary.backend.libgdx.files.AssetsLibGDXStorage; +import com.pixelgamelibrary.backend.libgdx.files.AssetsLibGDXFileSystem; +import com.pixelgamelibrary.api.files.FileSystem; /** * * @author robertvokac */ public class FilesLibGDXImpl implements Files { - Storage assetsStorage = null; + FileSystem assetsFileSystem = null; @Override - public Storage localStorage() { - return StorageFactory.getStorage(); + public FileSystem localFileSystem() { + return FileSystemFactory.getFileSystem(); } @Override - public Storage assetsStorage() { - if(assetsStorage == null) { - assetsStorage = new AssetsLibGDXStorage(); + public FileSystem assetsFileSystem() { + if(assetsFileSystem == null) { + assetsFileSystem = new AssetsLibGDXFileSystem(); } - return assetsStorage; } + return assetsFileSystem; } @Override - public Storage externalStorage() { + public FileSystem externalFileSystem() { throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody } @Override - public Storage relativeStorage() { + public FileSystem relativeFileSystem() { throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody } @Override - public Storage absoluteStorage() { + public FileSystem absoluteFileSystem() { throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody } @Override - public Storage tmpStorage() { + public FileSystem tmpFileSystem() { throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody } diff --git a/src/main/java/com/pixelgamelibrary/backend/libgdx/files/AndroidStorage.java b/src/main/java/com/pixelgamelibrary/backend/libgdx/files/AndroidFileSystem.java similarity index 89% rename from src/main/java/com/pixelgamelibrary/backend/libgdx/files/AndroidStorage.java rename to src/main/java/com/pixelgamelibrary/backend/libgdx/files/AndroidFileSystem.java index ad9dcc8..f731772 100644 --- a/src/main/java/com/pixelgamelibrary/backend/libgdx/files/AndroidStorage.java +++ b/src/main/java/com/pixelgamelibrary/backend/libgdx/files/AndroidFileSystem.java @@ -25,10 +25,10 @@ import com.pixelgamelibrary.api.Platform; * * @author robertvokac */ -public class AndroidStorage extends DesktopAndroidStorage { +public class AndroidFileSystem extends DesktopAndroidFileSystem { - public AndroidStorage(String storageName) { - super(storageName); + public AndroidFileSystem(String FileSystemName) { + super(FileSystemName); } @Override diff --git a/src/main/java/com/pixelgamelibrary/backend/libgdx/files/AssetsLibGDXStorage.java b/src/main/java/com/pixelgamelibrary/backend/libgdx/files/AssetsLibGDXFileSystem.java similarity index 95% rename from src/main/java/com/pixelgamelibrary/backend/libgdx/files/AssetsLibGDXStorage.java rename to src/main/java/com/pixelgamelibrary/backend/libgdx/files/AssetsLibGDXFileSystem.java index e254896..f7baf4d 100644 --- a/src/main/java/com/pixelgamelibrary/backend/libgdx/files/AssetsLibGDXStorage.java +++ b/src/main/java/com/pixelgamelibrary/backend/libgdx/files/AssetsLibGDXFileSystem.java @@ -7,24 +7,24 @@ import com.pixelgamelibrary.api.Pixel; import com.pixelgamelibrary.api.Platform; import com.pixelgamelibrary.api.files.FileType; import com.pixelgamelibrary.api.files.RegularFileType; -import com.pixelgamelibrary.api.files.Storage; -import com.pixelgamelibrary.api.files.StorageType; +import com.pixelgamelibrary.api.files.FileSystemType; import java.util.List; import java.util.stream.Collectors; import lombok.Getter; +import com.pixelgamelibrary.api.files.FileSystem; /** * * @author robertvokac */ -public class AssetsLibGDXStorage implements Storage { +public class AssetsLibGDXFileSystem implements FileSystem { private boolean isProbablyTeaVM = false; @Getter private final AssetsTxt assets; private String workingDirectory = "/"; - public AssetsLibGDXStorage() { + public AssetsLibGDXFileSystem() { assets = new AssetsTxt(readAssetsTxt()); } @@ -231,8 +231,8 @@ public class AssetsLibGDXStorage implements Storage { } @Override - public StorageType getStorageType() { - return StorageType.ASSETS; + public FileSystemType getFileSystemType() { + return FileSystemType.ASSETS; } } diff --git a/src/main/java/com/pixelgamelibrary/backend/libgdx/files/DesktopAndroidStorage.java b/src/main/java/com/pixelgamelibrary/backend/libgdx/files/DesktopAndroidFileSystem.java similarity index 91% rename from src/main/java/com/pixelgamelibrary/backend/libgdx/files/DesktopAndroidStorage.java rename to src/main/java/com/pixelgamelibrary/backend/libgdx/files/DesktopAndroidFileSystem.java index 707b03f..7ef72f1 100644 --- a/src/main/java/com/pixelgamelibrary/backend/libgdx/files/DesktopAndroidStorage.java +++ b/src/main/java/com/pixelgamelibrary/backend/libgdx/files/DesktopAndroidFileSystem.java @@ -23,29 +23,29 @@ import com.badlogic.gdx.Gdx; import com.pixelgamelibrary.api.Pixel; import com.pixelgamelibrary.api.files.FileType; import com.pixelgamelibrary.api.files.RegularFileType; -import com.pixelgamelibrary.api.files.Storage; -import com.pixelgamelibrary.api.files.StorageException; -import com.pixelgamelibrary.api.files.StorageType; +import com.pixelgamelibrary.api.files.FileException; +import com.pixelgamelibrary.api.files.FileSystemType; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; +import com.pixelgamelibrary.api.files.FileSystem; /** * * @author robertvokac */ -public abstract class DesktopAndroidStorage implements Storage { +public abstract class DesktopAndroidFileSystem implements FileSystem { private String workingDirectory = "/"; - private final String storageName; + private final String fileSystemName; - public DesktopAndroidStorage(String storageName) { - if (storageName == null || storageName.trim().isEmpty()) { - var msg = "storageName == null || storageName.trim().isEmpty()"; + public DesktopAndroidFileSystem(String FileSystemName) { + if (FileSystemName == null || FileSystemName.trim().isEmpty()) { + var msg = "fileSystemName == null || fileSystemName.trim().isEmpty()"; Pixel.app().error(msg); - throw new StorageException(msg); + throw new FileException(msg); } - this.storageName = storageName; + this.fileSystemName = FileSystemName; com.badlogic.gdx.files.FileHandle rootFileHandle = createLibGdxFileHandle("/"); if (!rootFileHandle.exists()) { rootFileHandle.mkdirs(); @@ -67,9 +67,9 @@ public abstract class DesktopAndroidStorage implements Storage { com.badlogic.gdx.files.FileHandle createLibGdxFileHandle(String path) { if (path.equals("/")) { - return Gdx.files.local(storageName); + return Gdx.files.local(fileSystemName); } else { - return Gdx.files.local(storageName + "/" + path); + return Gdx.files.local(fileSystemName + "/" + path); } } @@ -145,7 +145,7 @@ public abstract class DesktopAndroidStorage implements Storage { return fileHandle.readBytes(); } catch (Exception ex) { Pixel.app().error(ex.getMessage()); - throw new StorageException(ex.getMessage()); + throw new FileException(ex.getMessage()); } } @@ -277,7 +277,7 @@ public abstract class DesktopAndroidStorage implements Storage { } @Override - public StorageType getStorageType() { + public FileSystemType getFileSystemType() { throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody } diff --git a/src/main/java/com/pixelgamelibrary/backend/libgdx/files/DesktopStorage.java b/src/main/java/com/pixelgamelibrary/backend/libgdx/files/DesktopFileSystem.java similarity index 89% rename from src/main/java/com/pixelgamelibrary/backend/libgdx/files/DesktopStorage.java rename to src/main/java/com/pixelgamelibrary/backend/libgdx/files/DesktopFileSystem.java index 062bbc3..d91ebb3 100644 --- a/src/main/java/com/pixelgamelibrary/backend/libgdx/files/DesktopStorage.java +++ b/src/main/java/com/pixelgamelibrary/backend/libgdx/files/DesktopFileSystem.java @@ -25,10 +25,10 @@ import com.pixelgamelibrary.api.Platform; * * @author robertvokac */ -public class DesktopStorage extends DesktopAndroidStorage { +public class DesktopFileSystem extends DesktopAndroidFileSystem { - public DesktopStorage(String storageName) { - super(storageName); + public DesktopFileSystem(String fileSystemName) { + super(fileSystemName); } @Override diff --git a/src/main/java/com/pixelgamelibrary/backend/libgdx/files/StorageFactory.java b/src/main/java/com/pixelgamelibrary/backend/libgdx/files/FileSystemFactory.java similarity index 70% rename from src/main/java/com/pixelgamelibrary/backend/libgdx/files/StorageFactory.java rename to src/main/java/com/pixelgamelibrary/backend/libgdx/files/FileSystemFactory.java index 3deb741..d9fda44 100644 --- a/src/main/java/com/pixelgamelibrary/backend/libgdx/files/StorageFactory.java +++ b/src/main/java/com/pixelgamelibrary/backend/libgdx/files/FileSystemFactory.java @@ -21,42 +21,42 @@ package com.pixelgamelibrary.backend.libgdx.files; import com.pixelgamelibrary.api.Pixel; import com.pixelgamelibrary.api.Platform; -import com.pixelgamelibrary.api.files.Storage; -import com.pixelgamelibrary.api.files.StorageException; +import com.pixelgamelibrary.api.files.FileException; +import com.pixelgamelibrary.api.files.FileSystem; /** * * @author robertvokac */ -public class StorageFactory { +public class FileSystemFactory { - private StorageFactory() { + private FileSystemFactory() { //Not meant to be instantiated. } - private static Storage storage = null; + private static FileSystem fs = null; - public static Storage getStorage() { + public static FileSystem getFileSystem() { final Platform platform = Pixel.app().getPlatform(); -// if (storage == null) { -// storage = new PreferencesStorage(); +// if (fs == null) { +// fs = new PreferencesFileSystem(); // }//todo fixme - if (storage == null) { + if (fs == null) { final String appName = Pixel.app().getAppName(); if (platform.isDesktop()) { - storage = new DesktopStorage(appName); + fs = new DesktopFileSystem(appName); } if (platform.isAndroid()) { - storage = new AndroidStorage(appName); + fs = new AndroidFileSystem(appName); } if (platform.isWeb()) { - storage = new PreferencesStorage(appName); + fs = new PreferencesFileSystem(appName); } } - if (storage == null) { - throw new StorageException("Platform is not supported: " + platform); + if (fs == null) { + throw new FileException("Platform is not supported: " + platform); } - return storage; + return fs; } } diff --git a/src/main/java/com/pixelgamelibrary/backend/libgdx/files/PreferencesStorage.java b/src/main/java/com/pixelgamelibrary/backend/libgdx/files/PreferencesFileSystem.java similarity index 80% rename from src/main/java/com/pixelgamelibrary/backend/libgdx/files/PreferencesStorage.java rename to src/main/java/com/pixelgamelibrary/backend/libgdx/files/PreferencesFileSystem.java index 3eb6bd2..1d8d09b 100644 --- a/src/main/java/com/pixelgamelibrary/backend/libgdx/files/PreferencesStorage.java +++ b/src/main/java/com/pixelgamelibrary/backend/libgdx/files/PreferencesFileSystem.java @@ -22,28 +22,28 @@ package com.pixelgamelibrary.backend.libgdx.files; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Preferences; import com.pixelgamelibrary.api.Platform; -import com.pixelgamelibrary.api.files.map.MapStorage; +import com.pixelgamelibrary.api.files.map.MapFileSystem; /** * * @author robertvokac */ -public class PreferencesStorage extends MapStorage { +public class PreferencesFileSystem extends MapFileSystem { public Platform getPlatform() { return Platform.WEB; } - public PreferencesStorage() { - this("com.pixelgamelibrary.backend.libgdx.storage.PreferencesStorage"); + public PreferencesFileSystem() { + this("com.pixelgamelibrary.backend.libgdx.files.PreferencesFileSystem"); } - public PreferencesStorage(String preferencesName) { + public PreferencesFileSystem(String preferencesName) { this(Gdx.app.getPreferences(preferencesName)); } - public PreferencesStorage(Preferences preferences) { + public PreferencesFileSystem(Preferences preferences) { super(new SimpleLocalStorageMap(preferences)); } diff --git a/src/test/java/com/pixelgamelibrary/backend/libgdx/files/DesktopAndroidStorageTest.java b/src/test/java/com/pixelgamelibrary/backend/libgdx/files/DesktopAndroidFileSystemTest.java similarity index 89% rename from src/test/java/com/pixelgamelibrary/backend/libgdx/files/DesktopAndroidStorageTest.java rename to src/test/java/com/pixelgamelibrary/backend/libgdx/files/DesktopAndroidFileSystemTest.java index 615e04d..36cb118 100644 --- a/src/test/java/com/pixelgamelibrary/backend/libgdx/files/DesktopAndroidStorageTest.java +++ b/src/test/java/com/pixelgamelibrary/backend/libgdx/files/DesktopAndroidFileSystemTest.java @@ -1,13 +1,12 @@ package com.pixelgamelibrary.backend.libgdx.files; -import com.pixelgamelibrary.backend.libgdx.files.DesktopAndroidStorage; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.files.FileHandle; import com.pixelgamelibrary.api.Pixel; import com.pixelgamelibrary.api.Platform; import com.pixelgamelibrary.api.interfaces.PixelBackend; import com.pixelgamelibrary.api.files.RegularFileType; -import com.pixelgamelibrary.api.files.StorageException; +import com.pixelgamelibrary.api.files.FileException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mockito; @@ -33,9 +32,9 @@ import com.pixelgamelibrary.api.app.ClipBoard; import com.pixelgamelibrary.api.app.LogLevel; import com.pixelgamelibrary.api.app.Preferences; -class DesktopAndroidStorageTest { +class DesktopAndroidFileSystemTest { - private DesktopAndroidStorage storage; + private DesktopAndroidFileSystem fs; private FileHandle mockFileHandle; // @@ -217,7 +216,7 @@ class DesktopAndroidStorageTest { // - storage = new DesktopAndroidStorage("testStorage") { + fs = new DesktopAndroidFileSystem("testFileSystem") { protected FileHandle createLibGdxFileHandle(String path) { return mockFileHandle; } @@ -230,8 +229,8 @@ class DesktopAndroidStorageTest { } @Test - void testConstructor_NullStorageName_ShouldThrowException() { - Exception exception = assertThrows(StorageException.class, () -> new DesktopAndroidStorage(null) { + void testConstructor_NullFileSystemName_ShouldThrowException() { + Exception exception = assertThrows(FileException.class, () -> new DesktopAndroidFileSystem(null) { protected FileHandle createLibGdxFileHandle(String path) { return mock(FileHandle.class); @@ -242,37 +241,37 @@ class DesktopAndroidStorageTest { throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody } }); - assertEquals("storageName == null || storageName.trim().isEmpty()", exception.getMessage()); + assertEquals("fileSystemName == null || fileSystemName.trim().isEmpty()", exception.getMessage()); } @Test void testChangeDirectory_NonExistingDirectory_ShouldReturnErrorMessage() { when(mockFileHandle.exists()).thenReturn(false); - String result = storage.changeDirectory("nonExistingDir"); + String result = fs.changeDirectory("nonExistingDir"); assertEquals("Directory does not exist: nonExistingDir", result); } @Disabled @Test void testCreateDirectory_ExistingDirectory_ShouldReturnWarning() { - when(storage.createLibGdxFileHandle(anyString())).thenReturn(mockFileHandle); + when(fs.createLibGdxFileHandle(anyString())).thenReturn(mockFileHandle); when(mockFileHandle.exists()).thenReturn(true); - String result = storage.createDirectory("existingDir"); + String result = fs.createDirectory("existingDir"); assertEquals("Directory already exists: existingDir", result); } @Test void testCreateDirectory_NewDirectory_ShouldCreateDirectory() { when(mockFileHandle.exists()).thenReturn(false); - String result = storage.createDirectory("newDir"); + String result = fs.createDirectory("newDir"); assertEquals("", result); verify(mockFileHandle, times(2)).mkdirs(); } @Test void testTouch_ShouldCreateFile() { - String result = storage.touch("testFile.txt"); + String result = fs.touch("testFile.txt"); assertEquals("", result); verify(mockFileHandle).writeString("", false); } @@ -280,21 +279,21 @@ class DesktopAndroidStorageTest { @Test void testRemove_ShouldDeleteFile() { when(mockFileHandle.delete()).thenReturn(true); - boolean result = storage.remove("testFile.txt"); + boolean result = fs.remove("testFile.txt"); assertTrue(result); verify(mockFileHandle).delete(); } @Test void testMove_ShouldMoveFile() { - storage.move("sourceFile.txt", "targetFile.txt"); + fs.move("sourceFile.txt", "targetFile.txt"); verify(mockFileHandle).moveTo(mockFileHandle); } @Test void testReadString_ShouldReturnFileContent() { when(mockFileHandle.readString()).thenReturn("File content"); - String result = storage.readString("testFile.txt"); + String result = fs.readString("testFile.txt"); assertEquals("File content", result); } @@ -304,13 +303,13 @@ class DesktopAndroidStorageTest { when(mockFileHandle.read()).thenReturn(mockInputStream); when(mockInputStream.readAllBytes()).thenReturn(new byte[]{1, 2, 3}); - byte[] result = storage.readBytes("testFile.bin"); + byte[] result = fs.readBytes("testFile.bin"); assertArrayEquals(new byte[]{1, 2, 3}, result); } @Test void testWriteString_ShouldWriteToFile() { - String result = storage.writeString("testFile.txt", "Hello World"); + String result = fs.writeString("testFile.txt", "Hello World"); assertEquals("", result); verify(mockFileHandle).writeString("Hello World", false); } @@ -318,19 +317,19 @@ class DesktopAndroidStorageTest { @Test void testExists_ShouldReturnTrueIfFileExists() { when(mockFileHandle.exists()).thenReturn(true); - assertTrue(storage.exists("testFile.txt")); + assertTrue(fs.exists("testFile.txt")); } @Test void testIsDirectory_ShouldReturnTrueForDirectory() { when(mockFileHandle.isDirectory()).thenReturn(true); - assertTrue(storage.isDirectory("testDir")); + assertTrue(fs.isDirectory("testDir")); } @Test void testIsFile_ShouldReturnTrueForFile() { when(mockFileHandle.isDirectory()).thenReturn(false); - assertTrue(storage.isFile("testFile.txt")); + assertTrue(fs.isFile("testFile.txt")); } @Disabled @Test @@ -338,25 +337,25 @@ class DesktopAndroidStorageTest { when(mockFileHandle.isDirectory()).thenReturn(true); when(mockFileHandle.name()).thenReturn("root"); - String result = storage.debug(); + String result = fs.debug(); assertEquals("root\n", result); } @Test void testRemoveDirectory_ShouldReturnTrueIfDirectoryDeleted() { when(mockFileHandle.deleteDirectory()).thenReturn(true); - assertTrue(storage.removeDirectory("testDir")); + assertTrue(fs.removeDirectory("testDir")); } @Test void testGetRegularFileType_ShouldReturnTextForTextFile() { when(mockFileHandle.readString()).thenReturn("This is text"); - assertEquals(RegularFileType.TEXT, storage.getRegularFileType("testFile.txt")); + assertEquals(RegularFileType.TEXT, fs.getRegularFileType("testFile.txt")); } @Disabled @Test void testGetRegularFileType_ShouldReturnBinaryForBinaryFile() { when(mockFileHandle.readString()).thenThrow(new RuntimeException()); - assertEquals(RegularFileType.BINARY, storage.getRegularFileType("testFile.bin")); + assertEquals(RegularFileType.BINARY, fs.getRegularFileType("testFile.bin")); } }