mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-05-31 04:04:19 -04:00
* Updated to net7.0 * Updated GA to .net 7 * Updated System.IO.Abstractions to use New factory. * Converted Regex into SourceGenerator in Parser. * Updated more regex to source generators. * Enabled Nullability and more regex changes throughout codebase. * Parser is 100% GeneratedRegexified * Lots of nullability code * Enabled nullability for all repositories. * Fixed another unit test * Refactored some code around and took care of some todos. * Updating code for nullability and cleaning up methods that aren't used anymore. Refctored all uses of Parser.Normalize() to use new extension * More nullability exercises. 500 warnings to go. * Fixed a bug where custom file uploads for entities wouldn't save in webP. * Nullability is done for all DTOs * Fixed all unit tests and nullability for the project. Only OPDS is left which will be done with an upcoming OPDS enhancement. * Use localization in book service after validating * Code smells * Switched to preview build of swashbuckle for .net7 support * Fixed up merge issues * Disable emulate comic book when on single page reader * Fixed a regression where double page renderer wouldn't layout the images correctly * Updated to swashbuckle which support .net 7 * Fixed a bad GA action * Some code cleanup * More code smells * Took care of most of nullable issues * Fixed a broken test due to having more than one test run in parallel * I'm really not sure why the unit tests are failing or are so extremely slow on .net 7 * Updated all dependencies * Fixed up build and removed hardcoded framework from build scripts. (this merge removes Regex Source generators). Unit tests are completely busted. * Unit tests and code cleanup. Needs shakeout now. * Adjusted Series model since a few fields are not-nullable. Removed dead imports on the project. * Refactored to use Builder pattern for all unit tests. * Switched nullability down to warnings. It wasn't possible to switch due to constraint issues in DB Migration.
294 lines
9.0 KiB
C#
294 lines
9.0 KiB
C#
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using API.Data;
|
|
using API.Data.Misc;
|
|
using API.Entities;
|
|
using API.Entities.Enums;
|
|
using API.Entities.Metadata;
|
|
using API.Extensions;
|
|
using API.Tests.Helpers.Builders;
|
|
using Xunit;
|
|
|
|
namespace API.Tests.Extensions;
|
|
|
|
public class QueryableExtensionsTests
|
|
{
|
|
[Theory]
|
|
[InlineData(true, 2)]
|
|
[InlineData(false, 1)]
|
|
public void RestrictAgainstAgeRestriction_Series_ShouldRestrictEverythingAboveTeen(bool includeUnknowns, int expectedCount)
|
|
{
|
|
var items = new List<Series>()
|
|
{
|
|
new SeriesBuilder("Test 1")
|
|
.WithMetadata( new SeriesMetadata()
|
|
{
|
|
AgeRating = AgeRating.Teen,
|
|
})
|
|
.Build(),
|
|
new SeriesBuilder("Test 2")
|
|
.WithMetadata( new SeriesMetadata()
|
|
{
|
|
AgeRating = AgeRating.Unknown,
|
|
})
|
|
.Build(),
|
|
new SeriesBuilder("Test 3")
|
|
.WithMetadata( new SeriesMetadata()
|
|
{
|
|
AgeRating = AgeRating.X18Plus,
|
|
})
|
|
.Build()
|
|
};
|
|
|
|
var filtered = items.AsQueryable().RestrictAgainstAgeRestriction(new AgeRestriction()
|
|
{
|
|
AgeRating = AgeRating.Teen,
|
|
IncludeUnknowns = includeUnknowns
|
|
});
|
|
Assert.Equal(expectedCount, filtered.Count());
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData(true, 2)]
|
|
[InlineData(false, 1)]
|
|
public void RestrictAgainstAgeRestriction_CollectionTag_ShouldRestrictEverythingAboveTeen(bool includeUnknowns, int expectedCount)
|
|
{
|
|
var items = new List<CollectionTag>()
|
|
{
|
|
new CollectionTag()
|
|
{
|
|
Title = "Test",
|
|
NormalizedTitle = "Test".ToNormalized(),
|
|
SeriesMetadatas = new List<SeriesMetadata>()
|
|
{
|
|
new SeriesMetadata()
|
|
{
|
|
AgeRating = AgeRating.Teen,
|
|
}
|
|
}
|
|
},
|
|
new CollectionTag()
|
|
{
|
|
Title = "Test",
|
|
NormalizedTitle = "Test".ToNormalized(),
|
|
SeriesMetadatas = new List<SeriesMetadata>()
|
|
{
|
|
new SeriesMetadata()
|
|
{
|
|
AgeRating = AgeRating.Unknown,
|
|
},
|
|
new SeriesMetadata()
|
|
{
|
|
AgeRating = AgeRating.Teen,
|
|
}
|
|
}
|
|
},
|
|
new CollectionTag()
|
|
{
|
|
Title = "Test",
|
|
NormalizedTitle = "Test".ToNormalized(),
|
|
SeriesMetadatas = new List<SeriesMetadata>()
|
|
{
|
|
new SeriesMetadata()
|
|
{
|
|
AgeRating = AgeRating.X18Plus,
|
|
}
|
|
}
|
|
},
|
|
};
|
|
|
|
var filtered = items.AsQueryable().RestrictAgainstAgeRestriction(new AgeRestriction()
|
|
{
|
|
AgeRating = AgeRating.Teen,
|
|
IncludeUnknowns = includeUnknowns
|
|
});
|
|
Assert.Equal(expectedCount, filtered.Count());
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData(true, 2)]
|
|
[InlineData(false, 1)]
|
|
public void RestrictAgainstAgeRestriction_Genre_ShouldRestrictEverythingAboveTeen(bool includeUnknowns, int expectedCount)
|
|
{
|
|
var items = new List<Genre>()
|
|
{
|
|
new Genre()
|
|
{
|
|
Title = "A",
|
|
NormalizedTitle = "A".ToNormalized(),
|
|
SeriesMetadatas = new List<SeriesMetadata>()
|
|
{
|
|
new SeriesMetadata()
|
|
{
|
|
AgeRating = AgeRating.Teen,
|
|
}
|
|
}
|
|
},
|
|
new Genre()
|
|
{
|
|
Title = "B",
|
|
NormalizedTitle = "B".ToNormalized(),
|
|
SeriesMetadatas = new List<SeriesMetadata>()
|
|
{
|
|
new SeriesMetadata()
|
|
{
|
|
AgeRating = AgeRating.Unknown,
|
|
},
|
|
new SeriesMetadata()
|
|
{
|
|
AgeRating = AgeRating.Teen,
|
|
}
|
|
}
|
|
},
|
|
new Genre()
|
|
{
|
|
Title = "C",
|
|
NormalizedTitle = "C".ToNormalized(),
|
|
SeriesMetadatas = new List<SeriesMetadata>()
|
|
{
|
|
new SeriesMetadata()
|
|
{
|
|
AgeRating = AgeRating.X18Plus,
|
|
}
|
|
}
|
|
},
|
|
};
|
|
|
|
var filtered = items.AsQueryable().RestrictAgainstAgeRestriction(new AgeRestriction()
|
|
{
|
|
AgeRating = AgeRating.Teen,
|
|
IncludeUnknowns = includeUnknowns
|
|
});
|
|
Assert.Equal(expectedCount, filtered.Count());
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData(true, 2)]
|
|
[InlineData(false, 1)]
|
|
public void RestrictAgainstAgeRestriction_Tag_ShouldRestrictEverythingAboveTeen(bool includeUnknowns, int expectedCount)
|
|
{
|
|
var items = new List<Tag>()
|
|
{
|
|
new Tag()
|
|
{
|
|
Title = "Test 1",
|
|
NormalizedTitle = "Test 1".ToNormalized(),
|
|
SeriesMetadatas = new List<SeriesMetadata>()
|
|
{
|
|
new SeriesMetadata()
|
|
{
|
|
AgeRating = AgeRating.Teen,
|
|
}
|
|
}
|
|
},
|
|
new Tag()
|
|
{
|
|
Title = "Test 2",
|
|
NormalizedTitle = "Test 2".ToNormalized(),
|
|
SeriesMetadatas = new List<SeriesMetadata>()
|
|
{
|
|
new SeriesMetadata()
|
|
{
|
|
AgeRating = AgeRating.Unknown,
|
|
},
|
|
new SeriesMetadata()
|
|
{
|
|
AgeRating = AgeRating.Teen,
|
|
}
|
|
}
|
|
},
|
|
new Tag()
|
|
{
|
|
Title = "Test 3",
|
|
NormalizedTitle = "Test 3".ToNormalized(),
|
|
SeriesMetadatas = new List<SeriesMetadata>()
|
|
{
|
|
new SeriesMetadata()
|
|
{
|
|
AgeRating = AgeRating.X18Plus,
|
|
}
|
|
}
|
|
},
|
|
};
|
|
|
|
var filtered = items.AsQueryable().RestrictAgainstAgeRestriction(new AgeRestriction()
|
|
{
|
|
AgeRating = AgeRating.Teen,
|
|
IncludeUnknowns = includeUnknowns
|
|
});
|
|
Assert.Equal(expectedCount, filtered.Count());
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData(true, 2)]
|
|
[InlineData(false, 1)]
|
|
public void RestrictAgainstAgeRestriction_Person_ShouldRestrictEverythingAboveTeen(bool includeUnknowns, int expectedCount)
|
|
{
|
|
var items = new List<Person>()
|
|
{
|
|
new Person()
|
|
{
|
|
SeriesMetadatas = new List<SeriesMetadata>()
|
|
{
|
|
new SeriesMetadata()
|
|
{
|
|
AgeRating = AgeRating.Teen,
|
|
}
|
|
}
|
|
},
|
|
new Person()
|
|
{
|
|
SeriesMetadatas = new List<SeriesMetadata>()
|
|
{
|
|
new SeriesMetadata()
|
|
{
|
|
AgeRating = AgeRating.Unknown,
|
|
},
|
|
new SeriesMetadata()
|
|
{
|
|
AgeRating = AgeRating.Teen,
|
|
}
|
|
}
|
|
},
|
|
new Person()
|
|
{
|
|
SeriesMetadatas = new List<SeriesMetadata>()
|
|
{
|
|
new SeriesMetadata()
|
|
{
|
|
AgeRating = AgeRating.X18Plus,
|
|
}
|
|
}
|
|
},
|
|
};
|
|
|
|
var filtered = items.AsQueryable().RestrictAgainstAgeRestriction(new AgeRestriction()
|
|
{
|
|
AgeRating = AgeRating.Teen,
|
|
IncludeUnknowns = includeUnknowns
|
|
});
|
|
Assert.Equal(expectedCount, filtered.Count());
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData(true, 2)]
|
|
[InlineData(false, 1)]
|
|
public void RestrictAgainstAgeRestriction_ReadingList_ShouldRestrictEverythingAboveTeen(bool includeUnknowns, int expectedCount)
|
|
{
|
|
|
|
var items = new List<ReadingList>()
|
|
{
|
|
DbFactory.ReadingList("Test List", null, false, AgeRating.Teen),
|
|
DbFactory.ReadingList("Test List", null, false, AgeRating.Unknown),
|
|
DbFactory.ReadingList("Test List", null, false, AgeRating.X18Plus),
|
|
};
|
|
|
|
var filtered = items.AsQueryable().RestrictAgainstAgeRestriction(new AgeRestriction()
|
|
{
|
|
AgeRating = AgeRating.Teen,
|
|
IncludeUnknowns = includeUnknowns
|
|
});
|
|
Assert.Equal(expectedCount, filtered.Count());
|
|
}
|
|
}
|