daniel/deepdrft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 13 Wiki Activity

FileDatabase Refactor and normalization

Browse Source 
Test cleanup
This commit is contained in:
daniel-c-harvey
2025-09-04 17:27:28 -04:00
parent 6fefcbcfb5
commit 97ad4e3ac7
20 changed files with 373 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DeepDrftTests/FileDatabaseTests.cs
+6 -13
View File
@@ -64,12 +64,12 @@ public class FileDatabaseTests
Assert.That(_fileDatabase, Is.Not.Null);
// Act
await _fileDatabase.CreateVaultAsync(TestData.TestKeys.ImageVaultKey);
await _fileDatabase.CreateVaultAsync(TestData.TestKeys.ImageVaultKey, TestData.TestKeys.ImageVaultType);
// Assert
Assert.That(_fileDatabase.GetIndexSize(), Is.EqualTo(1), "Index should contain one element");
var vaultDirectory = Path.Combine(_testDatabasePath, TestData.TestKeys.ImageVaultKey.Key);
var vaultDirectory = Path.Combine(_testDatabasePath, TestData.TestKeys.ImageVaultKey);
Assert.That(Directory.Exists(vaultDirectory), Is.True, "Vault directory should exist");
}
@@ -80,12 +80,11 @@ public class FileDatabaseTests
_fileDatabase = await FileDatabase.FromAsync(_testDatabasePath);
Assert.That(_fileDatabase, Is.Not.Null);
await _fileDatabase.CreateVaultAsync(TestData.TestKeys.ImageVaultKey);
await _fileDatabase.CreateVaultAsync(TestData.TestKeys.ImageVaultKey, TestData.TestKeys.ImageVaultType);
var testImage = TestData.CreateTestImageBinary(1.0);
// Act
await _fileDatabase.RegisterResourceAsync(
MediaVaultType.Image,
TestData.TestKeys.ImageVaultKey,
TestData.TestKeys.TestImageEntry,
testImage);
@@ -104,18 +103,16 @@ public class FileDatabaseTests
_fileDatabase = await FileDatabase.FromAsync(_testDatabasePath);
Assert.That(_fileDatabase, Is.Not.Null);
await _fileDatabase.CreateVaultAsync(TestData.TestKeys.ImageVaultKey);
await _fileDatabase.CreateVaultAsync(TestData.TestKeys.ImageVaultKey, TestData.TestKeys.ImageVaultType);
var testImage = TestData.CreateTestImageBinary(1.0);
await _fileDatabase.RegisterResourceAsync(
MediaVaultType.Image,
TestData.TestKeys.ImageVaultKey,
TestData.TestKeys.TestImageEntry,
testImage);
// Act
var loadedMedia = await _fileDatabase.LoadResourceAsync<ImageBinary>(
MediaVaultType.Image,
TestData.TestKeys.ImageVaultKey,
TestData.TestKeys.TestImageEntry);
@@ -139,7 +136,6 @@ public class FileDatabaseTests
Assert.DoesNotThrowAsync(async () =>
{
await _fileDatabase.LoadResourceAsync<ImageBinary>(
MediaVaultType.Image,
TestData.TestKeys.NonExistentVaultKey,
TestData.TestKeys.NonExistentEntryKey);
}, "Should not throw exceptions when accessing nonexistent vault");
@@ -152,13 +148,12 @@ public class FileDatabaseTests
_fileDatabase = await FileDatabase.FromAsync(_testDatabasePath);
Assert.That(_fileDatabase, Is.Not.Null);
await _fileDatabase.CreateVaultAsync(TestData.TestKeys.ImageVaultKey);
await _fileDatabase.CreateVaultAsync(TestData.TestKeys.ImageVaultKey, TestData.TestKeys.ImageVaultType);
// Act & Assert - Should not throw exception when accessing nonexistent resource
Assert.DoesNotThrowAsync(async () =>
{
await _fileDatabase.LoadResourceAsync<ImageBinary>(
MediaVaultType.Image,
TestData.TestKeys.ImageVaultKey,
TestData.TestKeys.NonExistentEntryKey);
}, "Should not throw exceptions when accessing nonexistent resource");
@@ -171,11 +166,10 @@ public class FileDatabaseTests
_fileDatabase = await FileDatabase.FromAsync(_testDatabasePath);
Assert.That(_fileDatabase, Is.Not.Null);
await _fileDatabase.CreateVaultAsync(TestData.TestKeys.ImageVaultKey);
await _fileDatabase.CreateVaultAsync(TestData.TestKeys.ImageVaultKey, TestData.TestKeys.ImageVaultType);
var testImage = TestData.CreateTestImageBinary(1.0);
await _fileDatabase.RegisterResourceAsync(
MediaVaultType.Image,
TestData.TestKeys.ImageVaultKey,
TestData.TestKeys.TestImageEntry,
testImage);
@@ -198,7 +192,6 @@ public class FileDatabaseTests
// Verify resource can be loaded
var loadedMedia = await reloadedDatabase.LoadResourceAsync<ImageBinary>(
MediaVaultType.Image,
TestData.TestKeys.ImageVaultKey,
TestData.TestKeys.TestImageEntry);
DeepDrftTests/IndexSystemTests.cs
+36 -113
View File
@@ -38,10 +38,10 @@ public class IndexSystemTests
}
/// <summary>
/// Helper method to create test entry keys - DRY principle
/// Helper method to create test entry IDs - DRY principle
/// </summary>
protected static EntryKey CreateTestEntryKey(string key, MediaVaultType type = MediaVaultType.Image)
=> new(key, type);
protected static string CreateTestEntryId(string key)
=> key;
/// <summary>
/// Helper method to create test metadata - DRY principle
@@ -69,7 +69,7 @@ public class IndexSystemTests
public async Task CreateIndexAsync_DirectoryType_CreatesDirectoryIndex()
{
// Act
var index = await _factory.CreateIndexAsync(IndexType.Directory, TestDirectory);
var index = await _factory.CreateDirectoryIndexAsync(TestDirectory);
// Assert
Assert.That(index, Is.Not.Null, "Index should be created");
@@ -81,7 +81,7 @@ public class IndexSystemTests
public async Task CreateIndexAsync_VaultType_CreatesVaultIndex()
{
// Act
var index = await _factory.CreateIndexAsync(IndexType.Vault, TestDirectory);
var index = await _factory.CreateVaultIndexAsync(TestDirectory, MediaVaultType.Media);
// Assert
Assert.That(index, Is.Not.Null, "Index should be created");
@@ -89,23 +89,12 @@ public class IndexSystemTests
Assert.That(File.Exists(IndexPath), Is.True, "Index file should be created");
}
[Test]
public void CreateIndexAsync_InvalidType_ThrowsArgumentException()
{
// Arrange
var invalidType = (IndexType)999;
// Act & Assert
Assert.ThrowsAsync<ArgumentException>(async () =>
await _factory.CreateIndexAsync(invalidType, TestDirectory),
"Should throw for invalid index type");
}
[Test]
public async Task LoadIndexAsync_ExistingDirectoryIndex_LoadsSuccessfully()
{
// Arrange - Create an index first
await _factory.CreateIndexAsync(IndexType.Directory, TestDirectory);
await _factory.CreateDirectoryIndexAsync(TestDirectory);
// Act
var loadedIndex = await _factory.LoadIndexAsync(IndexType.Directory, TestDirectory);
@@ -119,7 +108,7 @@ public class IndexSystemTests
public async Task LoadIndexAsync_ExistingVaultIndex_LoadsSuccessfully()
{
// Arrange - Create an index first
await _factory.CreateIndexAsync(IndexType.Vault, TestDirectory);
await _factory.CreateVaultIndexAsync(TestDirectory, MediaVaultType.Media);
// Act
var loadedIndex = await _factory.LoadIndexAsync(IndexType.Vault, TestDirectory);
@@ -142,11 +131,11 @@ public class IndexSystemTests
public async Task LoadOrCreateIndexAsync_ExistingIndex_LoadsExisting()
{
// Arrange - Create an index with data
var originalIndex = await _factory.CreateIndexAsync(IndexType.Directory, TestDirectory);
var originalIndex = await _factory.CreateDirectoryIndexAsync(TestDirectory);
Assert.That(originalIndex, Is.TypeOf<DirectoryIndex>(), "Should create DirectoryIndex");
var directoryIndex = (DirectoryIndex)originalIndex!;
var testKey = CreateTestEntryKey("test-entry");
var testKey = CreateTestEntryId("test-entry");
directoryIndex.PutEntry(testKey);
// Save the modified index
@@ -154,30 +143,28 @@ public class IndexSystemTests
await FileUtils.PutObjectAsync(IndexPath, indexData);
// Act
var loadedIndex = await _factory.LoadOrCreateIndexAsync(IndexType.Directory, TestDirectory);
var loadedIndex = await _factory.LoadOrCreateDirectoryIndexAsync(TestDirectory);
// Assert
Assert.That(loadedIndex, Is.Not.Null, "Index should be loaded");
Assert.That(loadedIndex, Is.TypeOf<DirectoryIndex>(), "Should load DirectoryIndex");
Assert.That(loadedIndex, Is.InstanceOf<IEntryQueryable>(), "Should implement IEntryQueryable");
var queryableIndex = (IEntryQueryable)loadedIndex!;
Assert.That(queryableIndex.GetEntriesSize(), Is.EqualTo(1), "Should preserve existing entries");
Assert.That(loadedIndex.GetEntriesSize(), Is.EqualTo(1), "Should preserve existing entries");
}
[Test]
public async Task LoadOrCreateIndexAsync_NonExistentIndex_CreatesNew()
{
// Act
var index = await _factory.LoadOrCreateIndexAsync(IndexType.Directory, TestDirectory);
var index = await _factory.LoadOrCreateDirectoryIndexAsync(TestDirectory);
// Assert
Assert.That(index, Is.Not.Null, "Index should be created");
Assert.That(index, Is.TypeOf<DirectoryIndex>(), "Should create DirectoryIndex");
Assert.That(index, Is.InstanceOf<IEntryQueryable>(), "Should implement IEntryQueryable");
var queryableIndex = (IEntryQueryable)index!;
Assert.That(queryableIndex.GetEntriesSize(), Is.EqualTo(0), "New index should be empty");
Assert.That(index.GetEntriesSize(), Is.EqualTo(0), "New index should be empty");
}
[Test]
@@ -185,7 +172,7 @@ public class IndexSystemTests
{
// Arrange
var directoryIndex = new DirectoryIndex(new DirectoryIndexData("test"));
var testKey = CreateTestEntryKey("test-entry");
var testKey = CreateTestEntryId("test-entry");
directoryIndex.PutEntry(testKey);
// Act
@@ -202,7 +189,7 @@ public class IndexSystemTests
{
// Arrange
var vaultIndex = new VaultIndex(new VaultIndexData("test"));
var testKey = CreateTestEntryKey("test-entry");
var testKey = CreateTestEntryId("test-entry");
var testMetaData = CreateTestMetaData("test-entry");
vaultIndex.PutEntry(testKey, testMetaData);
@@ -273,7 +260,7 @@ public class IndexSystemTests
public void PutEntry_NewEntry_AddsSuccessfully()
{
// Arrange
var testKey = CreateTestEntryKey("new-entry");
var testKey = CreateTestEntryId("new-entry");
// Act
_directoryIndex.PutEntry(testKey);
@@ -288,7 +275,7 @@ public class IndexSystemTests
public void PutEntry_DuplicateEntry_DoesNotDuplicate()
{
// Arrange
var testKey = CreateTestEntryKey("duplicate-entry");
var testKey = CreateTestEntryId("duplicate-entry");
_directoryIndex.PutEntry(testKey);
// Act
@@ -304,9 +291,9 @@ public class IndexSystemTests
// Arrange
var keys = new[]
{
CreateTestEntryKey("entry1"),
CreateTestEntryKey("entry2"),
CreateTestEntryKey("entry3")
CreateTestEntryId("entry1"),
CreateTestEntryId("entry2"),
CreateTestEntryId("entry3")
};
// Act
@@ -327,7 +314,7 @@ public class IndexSystemTests
public void HasEntry_ExistingEntry_ReturnsTrue()
{
// Arrange
var testKey = CreateTestEntryKey("existing-entry");
var testKey = CreateTestEntryId("existing-entry");
_directoryIndex.PutEntry(testKey);
// Act & Assert
@@ -338,7 +325,7 @@ public class IndexSystemTests
public void HasEntry_NonExistentEntry_ReturnsFalse()
{
// Arrange
var testKey = CreateTestEntryKey("non-existent");
var testKey = CreateTestEntryId("non-existent");
// Act & Assert
Assert.That(_directoryIndex.HasEntry(testKey), Is.False, "Should not find non-existent entry");
@@ -350,9 +337,9 @@ public class IndexSystemTests
// Arrange
var keys = new[]
{
CreateTestEntryKey("entry1"),
CreateTestEntryKey("entry2"),
CreateTestEntryKey("entry3")
CreateTestEntryId("entry1"),
CreateTestEntryId("entry2"),
CreateTestEntryId("entry3")
};
foreach (var key in keys)
@@ -399,7 +386,7 @@ public class IndexSystemTests
public void PutEntry_NewEntryWithMetadata_AddsSuccessfully()
{
// Arrange
var testKey = CreateTestEntryKey("new-entry");
var testKey = CreateTestEntryId("new-entry");
var testMetaData = CreateTestMetaData("new-entry");
// Act
@@ -415,7 +402,7 @@ public class IndexSystemTests
public void PutEntry_DuplicateEntry_UpdatesMetadata()
{
// Arrange
var testKey = CreateTestEntryKey("duplicate-entry");
var testKey = CreateTestEntryId("duplicate-entry");
var originalMetaData = CreateTestMetaData("original");
var updatedMetaData = CreateTestMetaData("updated");
@@ -433,7 +420,7 @@ public class IndexSystemTests
public void GetEntry_ExistingEntry_ReturnsMetadata()
{
// Arrange
var testKey = CreateTestEntryKey("existing-entry");
var testKey = CreateTestEntryId("existing-entry");
var testMetaData = CreateTestMetaData("existing-entry");
_vaultIndex.PutEntry(testKey, testMetaData);
@@ -448,7 +435,7 @@ public class IndexSystemTests
public void GetEntry_NonExistentEntry_ReturnsNull()
{
// Arrange
var testKey = CreateTestEntryKey("non-existent");
var testKey = CreateTestEntryId("non-existent");
// Act
var retrievedMetaData = _vaultIndex.GetEntry(testKey);
@@ -463,9 +450,9 @@ public class IndexSystemTests
// Arrange
var entries = new[]
{
(CreateTestEntryKey("entry1"), CreateTestMetaData("entry1", ".png")),
(CreateTestEntryKey("entry2"), CreateTestMetaData("entry2", ".jpg")),
(CreateTestEntryKey("entry3"), CreateTestMetaData("entry3", ".gif"))
(CreateTestEntryId("entry1"), CreateTestMetaData("entry1", ".png")),
(CreateTestEntryId("entry2"), CreateTestMetaData("entry2", ".jpg")),
(CreateTestEntryId("entry3"), CreateTestMetaData("entry3", ".gif"))
};
// Act
@@ -484,70 +471,6 @@ public class IndexSystemTests
}
}
/// <summary>
/// Tests for IndexFactory - Single Responsibility Principle
/// </summary>
[TestFixture]
public class IndexFactoryTests : IndexTestBase
{
[Test]
public async Task IndexFactory_DirectoryType_BuildsDirectoryIndex()
{
// Arrange
var factory = new IndexFactory(TestDirectory, IndexType.Directory);
// Act
var index = await factory.BuildIndexAsync();
// Assert
Assert.That(index, Is.Not.Null, "Index should be built");
Assert.That(index, Is.TypeOf<DirectoryIndex>(), "Should build DirectoryIndex");
Assert.That(File.Exists(IndexPath), Is.True, "Index file should be created");
}
[Test]
public async Task IndexFactory_VaultType_BuildsVaultIndex()
{
// Arrange
var factory = new IndexFactory(TestDirectory, IndexType.Vault);
// Act
var index = await factory.BuildIndexAsync();
// Assert
Assert.That(index, Is.Not.Null, "Index should be built");
Assert.That(index, Is.TypeOf<VaultIndex>(), "Should build VaultIndex");
Assert.That(File.Exists(IndexPath), Is.True, "Index file should be created");
}
[Test]
public async Task IndexFactory_ExistingIndex_LoadsExistingData()
{
// Arrange - Create index with data
var factory = new IndexFactory(TestDirectory, IndexType.Directory);
var originalIndex = await factory.BuildIndexAsync();
var directoryIndex = (DirectoryIndex)originalIndex!;
var testKey = CreateTestEntryKey("persisted-entry");
directoryIndex.PutEntry(testKey);
// Save the index manually
var factoryService = new IndexFactoryService();
var indexData = factoryService.CreateIndexData(IndexType.Directory, directoryIndex);
await FileUtils.PutObjectAsync(IndexPath, indexData);
// Act - Create new factory and build
var newFactory = new IndexFactory(TestDirectory, IndexType.Directory);
var loadedIndex = await newFactory.BuildIndexAsync();
// Assert
Assert.That(loadedIndex, Is.Not.Null, "Index should be loaded");
Assert.That(loadedIndex, Is.InstanceOf<IEntryQueryable>(), "Should implement IEntryQueryable");
var queryableIndex = (IEntryQueryable)loadedIndex!;
Assert.That(queryableIndex.GetEntriesSize(), Is.EqualTo(1), "Should load existing entry");
Assert.That(queryableIndex.HasEntry(testKey), Is.True, "Should contain persisted entry");
}
}
/// <summary>
/// Integration tests for IndexDirectory classes - Open/Closed Principle
@@ -563,10 +486,10 @@ public class IndexSystemTests
// Arrange
var database = await FileDatabase.FromAsync(TestDirectory);
var testVaultKey = CreateTestEntryKey("test-vault");
var testVaultKey = CreateTestEntryId("test-vault");
// Act - This internally uses DirectoryIndexDirectory.AddToIndexAsync
await database!.CreateVaultAsync(testVaultKey);
await database!.CreateVaultAsync(testVaultKey, MediaVaultType.Image);
// Assert
Assert.That(database.HasIndexEntry(testVaultKey), Is.True, "Should contain added entry");
@@ -586,11 +509,11 @@ public class IndexSystemTests
// Arrange
var vault = await ImageVault.FromAsync(TestDirectory);
var testKey = CreateTestEntryKey("test-entry");
var testKey = CreateTestEntryId("test-entry");
var testImage = TestData.CreateTestImageBinary(1.0);
// Act - This internally uses VaultIndexDirectory.AddToIndexAsync
await vault!.AddEntryAsync(MediaVaultType.Image, testKey, testImage);
await vault!.AddEntryAsync(testKey, testImage);
// Assert
Assert.That(vault.HasIndexEntry(testKey), Is.True, "Should contain added entry");
DeepDrftTests/MediaVaultTests.cs
+55 -55
View File
@@ -38,10 +38,10 @@ public class MediaVaultTests
}
/// <summary>
/// Helper method to create test entry keys - DRY principle
/// Helper method to create test entry IDs - DRY principle
/// </summary>
protected static EntryKey CreateTestEntryKey(string key, MediaVaultType type = MediaVaultType.Image)
=> new(key, type);
protected static string CreateTestEntryId(string key)
=> key;
/// <summary>
/// Helper method to create test media files - DRY principle
@@ -113,11 +113,11 @@ public class MediaVaultTests
public async Task AddEntryAsync_ImageBinary_AddsToIndexAndCreatesFile()
{
// Arrange
var entryKey = CreateTestEntryKey("test-image");
var entryKey = CreateTestEntryId("test-image");
var imageBinary = TestData.CreateTestImageBinary(1.5);
// Act
await _imageVault.AddEntryAsync(MediaVaultType.Image, entryKey, imageBinary);
await _imageVault.AddEntryAsync(entryKey, imageBinary);
// Assert
Assert.That(_imageVault.HasIndexEntry(entryKey), Is.True, "Should add to index");
@@ -132,15 +132,15 @@ public class MediaVaultTests
// Arrange
var entries = new[]
{
(CreateTestEntryKey("image1"), TestData.CreateTestImageBinary(1.0)),
(CreateTestEntryKey("image2"), TestData.CreateTestImageBinary(1.5)),
(CreateTestEntryKey("image3"), TestData.CreateTestImageBinary(2.0))
(CreateTestEntryId("image1"), TestData.CreateTestImageBinary(1.0)),
(CreateTestEntryId("image2"), TestData.CreateTestImageBinary(1.5)),
(CreateTestEntryId("image3"), TestData.CreateTestImageBinary(2.0))
};
// Act
foreach (var (key, binary) in entries)
{
await _imageVault.AddEntryAsync(MediaVaultType.Image, key, binary);
await _imageVault.AddEntryAsync(key, binary);
}
// Assert
@@ -149,7 +149,7 @@ public class MediaVaultTests
foreach (var (key, binary) in entries)
{
Assert.That(_imageVault.HasIndexEntry(key), Is.True, $"Should contain {key} in index");
var expectedFilePath = Path.Combine(TestDirectory, $"{key.Key}.png");
var expectedFilePath = Path.Combine(TestDirectory, $"{key}.png");
AssertMediaFileExists(expectedFilePath, binary.Buffer);
}
}
@@ -158,12 +158,12 @@ public class MediaVaultTests
public async Task GetEntryAsync_ExistingImage_ReturnsImageBinary()
{
// Arrange
var entryKey = CreateTestEntryKey("existing-image");
var entryKey = CreateTestEntryId("existing-image");
var originalImage = TestData.CreateTestImageBinary(1.77);
await _imageVault.AddEntryAsync(MediaVaultType.Image, entryKey, originalImage);
await _imageVault.AddEntryAsync(entryKey, originalImage);
// Act
var retrievedImage = await _imageVault.GetEntryAsync<ImageBinary>(MediaVaultType.Image, entryKey);
var retrievedImage = await _imageVault.GetEntryAsync<ImageBinary>(entryKey);
// Assert
Assert.That(retrievedImage, Is.Not.Null, "Should retrieve image");
@@ -176,10 +176,10 @@ public class MediaVaultTests
public async Task GetEntryAsync_NonExistentImage_ReturnsNull()
{
// Arrange
var nonExistentKey = CreateTestEntryKey("non-existent");
var nonExistentKey = CreateTestEntryId("non-existent");
// Act
var retrievedImage = await _imageVault.GetEntryAsync<ImageBinary>(MediaVaultType.Image, nonExistentKey);
var retrievedImage = await _imageVault.GetEntryAsync<ImageBinary>(nonExistentKey);
// Assert
Assert.That(retrievedImage, Is.Null, "Should return null for non-existent image");
@@ -189,16 +189,16 @@ public class MediaVaultTests
public async Task GetEntryAsync_IndexEntryExistsButFileDeleted_ReturnsNull()
{
// Arrange
var entryKey = CreateTestEntryKey("deleted-file");
var entryKey = CreateTestEntryId("deleted-file");
var imageBinary = TestData.CreateTestImageBinary(1.0);
await _imageVault.AddEntryAsync(MediaVaultType.Image, entryKey, imageBinary);
await _imageVault.AddEntryAsync(entryKey, imageBinary);
// Delete the physical file but leave index entry
var filePath = Path.Combine(TestDirectory, "deleted-file.png");
File.Delete(filePath);
// Act
var retrievedImage = await _imageVault.GetEntryAsync<ImageBinary>(MediaVaultType.Image, entryKey);
var retrievedImage = await _imageVault.GetEntryAsync<ImageBinary>(entryKey);
// Assert
Assert.That(retrievedImage, Is.Null, "Should return null when file is missing");
@@ -208,18 +208,18 @@ public class MediaVaultTests
public async Task AddEntryAsync_DuplicateKey_UpdatesExistingEntry()
{
// Arrange
var entryKey = CreateTestEntryKey("duplicate-key");
var entryKey = CreateTestEntryId("duplicate-key");
var originalImage = TestData.CreateTestImageBinary(1.0);
var updatedImage = TestData.CreateTestImageBinary(2.0);
// Act
await _imageVault.AddEntryAsync(MediaVaultType.Image, entryKey, originalImage);
await _imageVault.AddEntryAsync(MediaVaultType.Image, entryKey, updatedImage);
await _imageVault.AddEntryAsync(entryKey, originalImage);
await _imageVault.AddEntryAsync(entryKey, updatedImage);
// Assert
Assert.That(_imageVault.GetIndexSize(), Is.EqualTo(1), "Should still have only one entry");
var retrievedImage = await _imageVault.GetEntryAsync<ImageBinary>(MediaVaultType.Image, entryKey);
var retrievedImage = await _imageVault.GetEntryAsync<ImageBinary>(entryKey);
Assert.That(retrievedImage, Is.Not.Null, "Should retrieve updated image");
Assert.That(retrievedImage!.AspectRatio, Is.EqualTo(2.0), "Should have updated aspect ratio");
}
@@ -257,11 +257,11 @@ public class MediaVaultTests
public async Task AddEntryAsync_AudioBinary_AddsToIndexAndCreatesFile()
{
// Arrange
var entryKey = CreateTestEntryKey("test-audio", MediaVaultType.Audio);
var entryKey = CreateTestEntryId("test-audio");
var audioBinary = TestData.CreateTestAudioBinary(120.0, 320);
// Act
await _audioVault.AddEntryAsync(MediaVaultType.Audio, entryKey, audioBinary);
await _audioVault.AddEntryAsync(entryKey, audioBinary);
// Assert
Assert.That(_audioVault.HasIndexEntry(entryKey), Is.True, "Should add to index");
@@ -274,12 +274,12 @@ public class MediaVaultTests
public async Task GetEntryAsync_ExistingAudio_ReturnsAudioBinary()
{
// Arrange
var entryKey = CreateTestEntryKey("existing-audio", MediaVaultType.Audio);
var entryKey = CreateTestEntryId("existing-audio");
var originalAudio = TestData.CreateTestAudioBinary(180.5, 256);
await _audioVault.AddEntryAsync(MediaVaultType.Audio, entryKey, originalAudio);
await _audioVault.AddEntryAsync(entryKey, originalAudio);
// Act
var retrievedAudio = await _audioVault.GetEntryAsync<AudioBinary>(MediaVaultType.Audio, entryKey);
var retrievedAudio = await _audioVault.GetEntryAsync<AudioBinary>(entryKey);
// Assert
Assert.That(retrievedAudio, Is.Not.Null, "Should retrieve audio");
@@ -337,9 +337,9 @@ public class MediaVaultTests
return (string)method!.Invoke(_vault, new object[] { mediaKey })!;
}
public bool HasIndexEntry(EntryKey entryKey) => _vault.HasIndexEntry(entryKey);
public Task AddEntryAsync(MediaVaultType vaultType, EntryKey entryKey, object media) =>
_vault.AddEntryAsync(vaultType, entryKey, media);
public bool HasIndexEntry(string entryId) => _vault.HasIndexEntry(entryId);
public Task AddEntryAsync(string entryId, FileBinary media) =>
_vault.AddEntryAsync(entryId, media);
}
[Test]
@@ -394,19 +394,19 @@ public class MediaVaultTests
}
[Test]
public async Task AddEntryAsync_UnsupportedMediaType_ThrowsArgumentException()
public async Task AddEntryAsync_BaseFileBinary_ThrowsArgumentException()
{
// Arrange
var vault = await TestMediaVaultWrapper.FromAsync(TestDirectory);
Assert.That(vault, Is.Not.Null, "Vault should be created");
var entryKey = CreateTestEntryKey("test");
var unsupportedMedia = new object(); // Not a supported media type
var entryKey = CreateTestEntryId("test");
var baseFileBinary = new FileBinary(new FileBinaryParams(TestData.TestPngBytes, TestData.TestPngBytes.Length)); // Base FileBinary, not a specific media type
// Act & Assert
Assert.ThrowsAsync<ArgumentException>(async () =>
await vault!.AddEntryAsync(MediaVaultType.Image, entryKey, unsupportedMedia),
"Should throw for unsupported media type");
await vault!.AddEntryAsync(entryKey, baseFileBinary),
"Should throw for base FileBinary type - must be specific media type");
}
[Test]
@@ -416,11 +416,11 @@ public class MediaVaultTests
var vault = await TestMediaVaultWrapper.FromAsync(TestDirectory);
Assert.That(vault, Is.Not.Null, "Vault should be created");
var entryKey = CreateTestEntryKey("test-media");
var entryKey = CreateTestEntryId("test-media");
var imageBinary = TestData.CreateTestImageBinary(1.0); // Use existing test data helper
// Act
await vault!.AddEntryAsync(MediaVaultType.Image, entryKey, imageBinary);
await vault!.AddEntryAsync(entryKey, imageBinary);
// Assert
Assert.That(vault.HasIndexEntry(entryKey), Is.True, "Should add entry to index");
@@ -456,10 +456,10 @@ public class MediaVaultTests
{
// Arrange
var vault = await ImageVault.FromAsync(TestDirectory);
var entryKey = CreateTestEntryKey("corrupted-file");
var entryKey = CreateTestEntryId("corrupted-file");
var imageBinary = TestData.CreateTestImageBinary(1.0);
await vault!.AddEntryAsync(MediaVaultType.Image, entryKey, imageBinary);
await vault!.AddEntryAsync(entryKey, imageBinary);
// Corrupt the media file
var filePath = Path.Combine(TestDirectory, "corrupted-file.png");
@@ -468,7 +468,7 @@ public class MediaVaultTests
// Act & Assert - Should not throw, but behavior may vary
Assert.DoesNotThrowAsync(async () =>
{
await vault.GetEntryAsync<ImageBinary>(MediaVaultType.Image, entryKey);
await vault.GetEntryAsync<ImageBinary>(entryKey);
}, "Should handle corrupted files gracefully");
}
@@ -480,7 +480,7 @@ public class MediaVaultTests
// Arrange
var vault = await ImageVault.FromAsync(TestDirectory);
var entryKey = CreateTestEntryKey("large-file");
var entryKey = CreateTestEntryId("large-file");
// Create a reasonably large buffer (not too large to cause test issues)
var largeBuffer = new byte[1024 * 1024]; // 1MB
@@ -491,7 +491,7 @@ public class MediaVaultTests
// Act & Assert - Should not throw exceptions
Assert.DoesNotThrowAsync(async () =>
{
await vault!.AddEntryAsync(MediaVaultType.Image, entryKey, largeBinary);
await vault!.AddEntryAsync(entryKey, largeBinary);
}, "Should handle large files gracefully");
}
@@ -500,16 +500,16 @@ public class MediaVaultTests
{
// Arrange
var vault = await ImageVault.FromAsync(TestDirectory);
var entryKey = CreateTestEntryKey("concurrent-test");
var entryKey = CreateTestEntryId("concurrent-test");
var imageBinary = TestData.CreateTestImageBinary(1.0);
await vault!.AddEntryAsync(MediaVaultType.Image, entryKey, imageBinary);
await vault!.AddEntryAsync(entryKey, imageBinary);
// Act - Multiple concurrent reads
var tasks = new List<Task<ImageBinary?>>();
for (int i = 0; i < 10; i++)
{
tasks.Add(vault.GetEntryAsync<ImageBinary>(MediaVaultType.Image, entryKey));
tasks.Add(vault.GetEntryAsync<ImageBinary>(entryKey));
}
var results = await Task.WhenAll(tasks);
@@ -537,14 +537,14 @@ public class MediaVaultTests
// Arrange
var database = await FileDatabase.FromAsync(TestDirectory);
var vaultKey = new EntryKey("test-vault", MediaVaultType.Image);
var entryKey = new EntryKey("test-image", MediaVaultType.Image);
var vaultKey = "test-vault";
var entryKey = "test-image";
var imageBinary = TestData.CreateTestImageBinary(1.5);
// Act
await database!.CreateVaultAsync(vaultKey);
await database.RegisterResourceAsync(MediaVaultType.Image, vaultKey, entryKey, imageBinary);
var retrievedImage = await database.LoadResourceAsync<ImageBinary>(MediaVaultType.Image, vaultKey, entryKey);
await database!.CreateVaultAsync(vaultKey, MediaVaultType.Image);
await database.RegisterResourceAsync(vaultKey, entryKey, imageBinary);
var retrievedImage = await database.LoadResourceAsync<ImageBinary>(vaultKey, entryKey);
// Assert
Assert.That(retrievedImage, Is.Not.Null, "Should retrieve image through database");
@@ -564,16 +564,16 @@ public class MediaVaultTests
// Arrange - Create and populate vault
var database1 = await FileDatabase.FromAsync(TestDirectory);
var vaultKey = new EntryKey("persistent-vault", MediaVaultType.Image);
var entryKey = new EntryKey("persistent-image", MediaVaultType.Image);
var vaultKey = "persistent-vault";
var entryKey = "persistent-image";
var imageBinary = TestData.CreateTestImageBinary(2.0);
await database1!.CreateVaultAsync(vaultKey);
await database1.RegisterResourceAsync(MediaVaultType.Image, vaultKey, entryKey, imageBinary);
await database1!.CreateVaultAsync(vaultKey, MediaVaultType.Image);
await database1.RegisterResourceAsync(vaultKey, entryKey, imageBinary);
// Act - Reload database
var database2 = await FileDatabase.FromAsync(TestDirectory);
var retrievedImage = await database2!.LoadResourceAsync<ImageBinary>(MediaVaultType.Image, vaultKey, entryKey);
var retrievedImage = await database2!.LoadResourceAsync<ImageBinary>(vaultKey, entryKey);
// Assert
Assert.That(retrievedImage, Is.Not.Null, "Should retrieve image after database reload");
DeepDrftTests/ModelTests.cs
-32
View File
@@ -8,38 +8,6 @@ namespace DeepDrftTests;
[TestFixture]
public class ModelTests
{
[TestFixture]
public class EntryKeyTests
{
[Test]
public void EntryKey_CanBeCreated()
{
// Arrange
var key = "test-key";
var type = MediaVaultType.Image;
// Act
var entryKey = new EntryKey(key, type);
// Assert
Assert.That(entryKey.Key, Is.EqualTo(key), "Key should match");
Assert.That(entryKey.Type, Is.EqualTo(type), "Type should match");
}
[Test]
public void EntryKey_SupportsStructuralEquality()
{
// Arrange
var key1 = new EntryKey("test", MediaVaultType.Image);
var key2 = new EntryKey("test", MediaVaultType.Image);
var key3 = new EntryKey("different", MediaVaultType.Image);
// Act & Assert
Assert.That(key1, Is.EqualTo(key2), "Structurally equal keys should be equal");
Assert.That(key1, Is.Not.EqualTo(key3), "Different keys should not be equal");
Assert.That(key1.GetHashCode(), Is.EqualTo(key2.GetHashCode()), "Equal keys should have same hash code");
}
}
[TestFixture]
public class MediaModelTests
DeepDrftTests/TestData.cs
+8 -5
View File
@@ -51,14 +51,17 @@ public static class TestData
}
/// <summary>
/// Test entry keys used across tests
/// Test keys used across tests - now using simple strings and separate vault types
/// </summary>
public static class TestKeys
{
public static readonly EntryKey TestImageEntry = new("test", MediaVaultType.Image);
public static readonly EntryKey ImageVaultKey = new("img", MediaVaultType.Image);
public static readonly EntryKey NonExistentVaultKey = new("i-do-not-exist", MediaVaultType.Image);
public static readonly EntryKey NonExistentEntryKey = new("i-do-not-exist", MediaVaultType.Image);
public const string TestImageEntry = "test";
public const string ImageVaultKey = "img";
public const string NonExistentVaultKey = "i-do-not-exist";
public const string NonExistentEntryKey = "i-do-not-exist";
// Vault type for image-related tests
public const MediaVaultType ImageVaultType = MediaVaultType.Image;
}
/// <summary>
DeepDrftTests/UtilityTests.cs
+22 -22
View File
@@ -16,8 +16,8 @@ public class UtilityTests
public void StructuralMap_CanAddAndRetrieveEntries()
{
// Arrange
var map = new StructuralMap<EntryKey, string>();
var key = new EntryKey("test", MediaVaultType.Image);
var map = new StructuralMap<string, string>();
var key = "test";
var value = "test-value";
// Act
@@ -33,9 +33,9 @@ public class UtilityTests
public void StructuralMap_HandlesStructuralEquality()
{
// Arrange
var map = new StructuralMap<EntryKey, string>();
var key1 = new EntryKey("test", MediaVaultType.Image);
var key2 = new EntryKey("test", MediaVaultType.Image); // Same values, different instance
var map = new StructuralMap<string, string>();
var key1 = "test";
var key2 = "test"; // Same values
var value = "test-value";
// Act
@@ -50,8 +50,8 @@ public class UtilityTests
public void StructuralMap_CanRemoveEntries()
{
// Arrange
var map = new StructuralMap<EntryKey, string>();
var key = new EntryKey("test", MediaVaultType.Image);
var map = new StructuralMap<string, string>();
var key = "test";
var value = "test-value";
map.Set(key, value);
@@ -68,12 +68,12 @@ public class UtilityTests
public void StructuralMap_CanEnumerateEntries()
{
// Arrange
var map = new StructuralMap<EntryKey, string>();
var map = new StructuralMap<string, string>();
var entries = new[]
{
(new EntryKey("key1", MediaVaultType.Image), "value1"),
(new EntryKey("key2", MediaVaultType.Media), "value2"),
(new EntryKey("key3", MediaVaultType.Image), "value3")
("key1", "value1"),
("key2", "value2"),
("key3", "value3")
};
foreach (var (key, value) in entries)
@@ -102,8 +102,8 @@ public class UtilityTests
public void StructuralSet_CanAddAndContainEntries()
{
// Arrange
var set = new StructuralSet<EntryKey>();
var key = new EntryKey("test", MediaVaultType.Image);
var set = new StructuralSet<string>();
var key = "test";
// Act
set.Add(key);
@@ -117,9 +117,9 @@ public class UtilityTests
public void StructuralSet_HandlesStructuralEquality()
{
// Arrange
var set = new StructuralSet<EntryKey>();
var key1 = new EntryKey("test", MediaVaultType.Image);
var key2 = new EntryKey("test", MediaVaultType.Image); // Same values, different instance
var set = new StructuralSet<string>();
var key1 = "test";
var key2 = "test"; // Same values
// Act
set.Add(key1);
@@ -134,8 +134,8 @@ public class UtilityTests
public void StructuralSet_CanRemoveEntries()
{
// Arrange
var set = new StructuralSet<EntryKey>();
var key = new EntryKey("test", MediaVaultType.Image);
var set = new StructuralSet<string>();
var key = "test";
set.Add(key);
// Act
@@ -151,12 +151,12 @@ public class UtilityTests
public void StructuralSet_CanEnumerateEntries()
{
// Arrange
var set = new StructuralSet<EntryKey>();
var set = new StructuralSet<string>();
var keys = new[]
{
new EntryKey("key1", MediaVaultType.Image),
new EntryKey("key2", MediaVaultType.Media),
new EntryKey("key3", MediaVaultType.Image)
"key1",
"key2",
"key3"
};
foreach (var key in keys)