mirror of
https://github.com/Ellpeck/DynamicEnums.git
synced 2024-11-11 04:39:09 +01:00
fixed DynamicEnum.GetUniqueValues not returning correct values for out-of-order enums
This commit is contained in:
parent
eb944df3de
commit
bbd723f13c
2 changed files with 13 additions and 13 deletions
|
@ -195,7 +195,7 @@ namespace DynamicEnums {
|
||||||
/// A value counts as explicitly defined if it has been added using <see cref="Add{T}"/>, <see cref="AddValue{T}"/> or <see cref="AddFlag{T}"/>.
|
/// A value counts as explicitly defined if it has been added using <see cref="Add{T}"/>, <see cref="AddValue{T}"/> or <see cref="AddFlag{T}"/>.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <typeparam name="T">The type whose values to get</typeparam>
|
/// <typeparam name="T">The type whose values to get</typeparam>
|
||||||
/// <returns>The defined values for the given type</returns>
|
/// <returns>The defined values for the given type, in the order they were added.</returns>
|
||||||
public static IEnumerable<T> GetValues<T>() where T : DynamicEnum {
|
public static IEnumerable<T> GetValues<T>() where T : DynamicEnum {
|
||||||
return DynamicEnum.GetValues(typeof(T)).Cast<T>();
|
return DynamicEnum.GetValues(typeof(T)).Cast<T>();
|
||||||
}
|
}
|
||||||
|
@ -205,10 +205,10 @@ namespace DynamicEnums {
|
||||||
/// A value counts as explicitly defined if it has been added using <see cref="Add{T}"/>, <see cref="AddValue{T}"/> or <see cref="AddFlag{T}"/>.
|
/// A value counts as explicitly defined if it has been added using <see cref="Add{T}"/>, <see cref="AddValue{T}"/> or <see cref="AddFlag{T}"/>.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <typeparam name="T">The type whose values to get.</typeparam>
|
/// <typeparam name="T">The type whose values to get.</typeparam>
|
||||||
/// <returns>The defined values for the given type, excluding combined flags.</returns>
|
/// <returns>The defined values for the given type, in ascending value order, excluding combined flags.</returns>
|
||||||
public static IEnumerable<T> GetUniqueValues<T>() where T : DynamicEnum {
|
public static IEnumerable<T> GetUniqueValues<T>() where T : DynamicEnum {
|
||||||
var used = BigInteger.Zero;
|
var used = BigInteger.Zero;
|
||||||
foreach (var value in DynamicEnum.GetValues<T>()) {
|
foreach (var value in DynamicEnum.GetValues<T>().OrderBy(DynamicEnum.GetValue)) {
|
||||||
var iValue = DynamicEnum.GetValue(value);
|
var iValue = DynamicEnum.GetValue(value);
|
||||||
if ((used & iValue) == 0) {
|
if ((used & iValue) == 0) {
|
||||||
yield return value;
|
yield return value;
|
||||||
|
@ -222,7 +222,7 @@ namespace DynamicEnums {
|
||||||
/// A value counts as explicitly defined if it has been added using <see cref="Add{T}"/>, <see cref="AddValue{T}"/> or <see cref="AddFlag{T}"/>.
|
/// A value counts as explicitly defined if it has been added using <see cref="Add{T}"/>, <see cref="AddValue{T}"/> or <see cref="AddFlag{T}"/>.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="type">The type whose values to get</param>
|
/// <param name="type">The type whose values to get</param>
|
||||||
/// <returns>The defined values for the given type</returns>
|
/// <returns>The defined values for the given type, in the order they were added.</returns>
|
||||||
public static IEnumerable<DynamicEnum> GetValues(Type type) {
|
public static IEnumerable<DynamicEnum> GetValues(Type type) {
|
||||||
return DynamicEnum.GetStorage(type).Values.Values;
|
return DynamicEnum.GetStorage(type).Values.Values;
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,20 +40,20 @@ public class EnumTests {
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void TestDynamicEnums() {
|
public void TestDynamicEnums() {
|
||||||
|
var combined = DynamicEnum.Add<TestDynamicEnum>("Combined", (1 << 7) | (1 << 13));
|
||||||
var flags = new TestDynamicEnum[100];
|
var flags = new TestDynamicEnum[100];
|
||||||
for (var i = 0; i < flags.Length; i++)
|
for (var i = 0; i < flags.Length; i++)
|
||||||
flags[i] = DynamicEnum.AddFlag<TestDynamicEnum>("Flag" + i);
|
flags[i] = DynamicEnum.AddFlag<TestDynamicEnum>("Flag" + i);
|
||||||
var zero = DynamicEnum.Add<TestDynamicEnum>("Zero", 0);
|
var zero = DynamicEnum.Add<TestDynamicEnum>("Zero", 0);
|
||||||
var combined = DynamicEnum.Add<TestDynamicEnum>("Combined", DynamicEnum.GetValue(DynamicEnum.Or(flags[7], flags[13])));
|
|
||||||
|
|
||||||
var test = DynamicEnum.Add<TestEnumWithConstructor>("Test", 10);
|
DynamicEnum.Add<TestEnumWithConstructor>("Test", 10);
|
||||||
Assert.AreEqual(DynamicEnum.GetEnumValue<TestEnumWithConstructor>(10).ToString(), "TestModified");
|
Assert.AreEqual(DynamicEnum.GetEnumValue<TestEnumWithConstructor>(10).ToString(), "TestModified");
|
||||||
|
|
||||||
Assert.AreEqual(
|
Assert.AreEqual(
|
||||||
flags.Append(zero).Append(combined),
|
flags.Append(zero).Prepend(combined),
|
||||||
DynamicEnum.GetValues<TestDynamicEnum>());
|
DynamicEnum.GetValues<TestDynamicEnum>());
|
||||||
Assert.AreEqual(
|
Assert.AreEqual(
|
||||||
flags.Append(zero),
|
flags.Prepend(zero),
|
||||||
DynamicEnum.GetUniqueValues<TestDynamicEnum>());
|
DynamicEnum.GetUniqueValues<TestDynamicEnum>());
|
||||||
|
|
||||||
Assert.AreEqual(DynamicEnum.GetValue(flags[7]), BigInteger.One << 7);
|
Assert.AreEqual(DynamicEnum.GetValue(flags[7]), BigInteger.One << 7);
|
||||||
|
@ -89,10 +89,10 @@ public class EnumTests {
|
||||||
Assert.False(DynamicEnum.IsDefined(DynamicEnum.Or(combined, flags[49])));
|
Assert.False(DynamicEnum.IsDefined(DynamicEnum.Or(combined, flags[49])));
|
||||||
|
|
||||||
Assert.AreEqual(
|
Assert.AreEqual(
|
||||||
new[] {flags[0], flags[7], flags[13], combined},
|
new[] {combined, flags[0], flags[7], flags[13]},
|
||||||
DynamicEnum.GetFlags(DynamicEnum.Or(DynamicEnum.Or(flags[0], flags[13]), flags[7]), false));
|
DynamicEnum.GetFlags(DynamicEnum.Or(DynamicEnum.Or(flags[0], flags[13]), flags[7]), false));
|
||||||
Assert.AreEqual(
|
Assert.AreEqual(
|
||||||
new[] {flags[0], flags[7], flags[13], zero, combined},
|
new[] {combined, flags[0], flags[7], flags[13], zero},
|
||||||
DynamicEnum.GetFlags(DynamicEnum.Or(DynamicEnum.Or(flags[0], flags[13]), flags[7])));
|
DynamicEnum.GetFlags(DynamicEnum.Or(DynamicEnum.Or(flags[0], flags[13]), flags[7])));
|
||||||
|
|
||||||
Assert.AreEqual(
|
Assert.AreEqual(
|
||||||
|
@ -106,12 +106,12 @@ public class EnumTests {
|
||||||
Zero = 0,
|
Zero = 0,
|
||||||
One = 1,
|
One = 1,
|
||||||
Two = 2,
|
Two = 2,
|
||||||
Eight = 8,
|
|
||||||
Sixteen = 16,
|
|
||||||
EightSixteen = TestEnum.Eight | TestEnum.Sixteen,
|
EightSixteen = TestEnum.Eight | TestEnum.Sixteen,
|
||||||
|
Eight = 8,
|
||||||
|
OneTwentyEightTwoOne = TestEnum.OneTwentyEight | TestEnum.Two | TestEnum.One,
|
||||||
ThirtyTwo = 32,
|
ThirtyTwo = 32,
|
||||||
|
Sixteen = 16,
|
||||||
OneTwentyEight = 128,
|
OneTwentyEight = 128,
|
||||||
OneTwentyEightTwoOne = TestEnum.OneTwentyEight | TestEnum.Two | TestEnum.One
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue