Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improvements in Enum Unit tests #130

Merged
merged 1 commit into from
Apr 13, 2021
Merged

Improvements in Enum Unit tests #130

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 47 additions & 68 deletions Tests/NFUnitTestEnum/UnitTestEnumTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,28 +368,34 @@ public void Enum_enum94_Test()
Assert.True(Enum_TestClass_enum94.testMethod());
}
[TestMethod]
public void Enum_enum_flags01_Test()
public void EnumFlags01_Test()
{
Debug.WriteLine("check FlagAttribute with enum");
Assert.True(Enum_TestClass_enum_flags01.testMethod());
TestClassEnumFlags01.TestMethod();
}
[TestMethod]
public void Enum_enum_flags02_Test()
public void EnumFlags02_Test()
{
Debug.WriteLine("check FlagAttribute with enum");
Assert.True(Enum_TestClass_enum_flags02.testMethod());
TestClassEnumFlags02.TestMethod();
}
[TestMethod]
public void Enum_enum_flags03_Test()
public void EnumFlags03_Test()
{
Debug.WriteLine("check FlagAttribute with enum");
Assert.True(Enum_TestClass_enum_flags03.testMethod());
TestClassEnumFlags03.TestMethod();
}
[TestMethod]
public void Enum_enum_flags04_Test()
public void EnumFlags04_Test()
{
Debug.WriteLine("check FlagAttribute with enum with conversion");
Assert.True(Enum_TestClass_enum_flags04.testMethod());
TestClassEnumFlags04.TestMethod();
}
[TestMethod]
public void EnumFlags05_Test()
{
Debug.WriteLine("check Enum.HasFlag");
TestClassEnumFlags05.TestMethod();
}

//Compiled Test Cases
Expand Down Expand Up @@ -2558,97 +2564,70 @@ public static bool testMethod()
}
}
[Flags]
enum Enum_TestClass_enum_flags01_Flag
enum TestClassEnumFlags
{
Zero = 0x0000,
First = 0x0001,
Second = 0x0002,
Third = 0x0004,
Fourth = 0x0008,
}
public class Enum_TestClass_enum_flags01
public class TestClassEnumFlags01
{
public static int Main_old()
public static bool TestMethod()
{
Enum_TestClass_enum_flags01_Flag r = Enum_TestClass_enum_flags01_Flag.First | Enum_TestClass_enum_flags01_Flag.Fourth;
TestClassEnumFlags r = TestClassEnumFlags.First | TestClassEnumFlags.Fourth;
Debug.WriteLine(r.ToString());
return (int)r == (int)0x0009 ? 0 : 1;
}
public static bool testMethod()
{
return (Main_old() == 0);

return (int)r == 0x0009;
}
}
[Flags]
enum Enum_TestClass_enum_flags02_Flag
{
Zero = 0x0000,
First = 0x0001,
Second = 0x0002,
Third = 0x0004,
Fourth = 0x0008,
}
public class Enum_TestClass_enum_flags02
public class TestClassEnumFlags02
{
public static int Main_old()
public static void TestMethod()
{
Enum_TestClass_enum_flags02_Flag r = Enum_TestClass_enum_flags02_Flag.First | Enum_TestClass_enum_flags02_Flag.Fourth;
r = r | Enum_TestClass_enum_flags02_Flag.Second | Enum_TestClass_enum_flags02_Flag.Third;
TestClassEnumFlags r = TestClassEnumFlags.First | TestClassEnumFlags.Fourth;
r = r | TestClassEnumFlags.Second | TestClassEnumFlags.Third;

Debug.WriteLine(r.ToString());
return (int)r == (int)0x000f ? 0 : 1;
}
public static bool testMethod()
{
return (Main_old() == 0);
Assert.Equal((int)r, 0x000f);
}
}
[Flags]
enum Enum_TestClass_enum_flags03_Flag
{
Zero = 0x0000,
First = 0x0001,
Second = 0x0002,
Third = 0x0004,
Fourth = 0x0008,
}
public class Enum_TestClass_enum_flags03

public class TestClassEnumFlags03
{
public static int Main_old()
public static void TestMethod()
{
Enum_TestClass_enum_flags03_Flag r = Enum_TestClass_enum_flags03_Flag.First | Enum_TestClass_enum_flags03_Flag.Fourth;
TestClassEnumFlags r = TestClassEnumFlags.First | TestClassEnumFlags.Fourth;
r += 0x00f; // out of range
Debug.WriteLine(r.ToString());
return (int)r == (int)24 ? 0 : 1;
}
public static bool testMethod()
{
return (Main_old() == 0);
Assert.Equal((int)r, 24);
}
}
[Flags]
enum Enum_TestClass_enum_flags04_Flag
{
Zero = 0x0000,
First = 0x0001,
Second = 0x0002,
Third = 0x0004,
Fourth = 0x0008,
}
public class Enum_TestClass_enum_flags04

public class TestClassEnumFlags04
{
public static int Main_old()
public static void TestMethod()
{
int i = 0x0f;
Enum_TestClass_enum_flags04_Flag r = (Enum_TestClass_enum_flags04_Flag)i;
TestClassEnumFlags r = (TestClassEnumFlags)i;
Debug.WriteLine(r.ToString());
return (int)r == (int)0x000f ? 0 : 1;
Assert.Equal((int)r, 0x000f);
}
public static bool testMethod()
}

public class TestClassEnumFlags05
{
public static void TestMethod()
{
return (Main_old() == 0);
TestClassEnumFlags e1 = TestClassEnumFlags.First;
Assert.False(e1.HasFlag(TestClassEnumFlags.Second));
Assert.True(e1.HasFlag(TestClassEnumFlags.First));

TestClassEnumFlags e2 = TestClassEnumFlags.Third;
Assert.False(e2.HasFlag(TestClassEnumFlags.Fourth));
Assert.True(e2.HasFlag(TestClassEnumFlags.Third));
}
}

}
}