Browse Source

Fix test case

pull/1836/head
Salvage 2 years ago
parent
commit
8524aac1a5
No known key found for this signature in database
GPG Key ID: 1362C7A680BA7451
  1. 3
      src/Generator/Library.cs
  2. 23
      tests/dotnet/CSharp/CSharp.Tests.cs

3
src/Generator/Library.cs

@ -202,8 +202,7 @@ namespace CppSharp
} }
catch (Exception ex) catch (Exception ex)
{ {
// TODO: This should just throw, but we have a pre-existing behavior that expects malformed // TODO: There should be a toggle to just throw here instead.
// macro expressions to default to 0, see CSharp.h (MY_MACRO_TEST2_0), so do it for now.
// Like other paths, we can however, write a diagnostic message to the console. // Like other paths, we can however, write a diagnostic message to the console.

23
tests/dotnet/CSharp/CSharp.Tests.cs

@ -1524,18 +1524,17 @@ public unsafe class CSharpTests
[Test] [Test]
public void TestMyMacro2TestEnum() public void TestMyMacro2TestEnum()
{ {
var a = (MyMacroTest2Enum)0; var a = (MyMacroTest2Enum)1;
var b = (MyMacroTest2Enum)1; var b = (MyMacroTest2Enum)0x2;
var c = (MyMacroTest2Enum)0x2; var c = (MyMacroTest2Enum)(1 << 2);
var d = (MyMacroTest2Enum)(1 << 2); var d = (MyMacroTest2Enum)(b | c);
var e = (MyMacroTest2Enum)(b | c); var e = (MyMacroTest2Enum)(b | c | d);
var f = (MyMacroTest2Enum)(b | c | d); var f = (MyMacroTest2Enum)(1 << 3);
var g = (MyMacroTest2Enum)(1 << 3); var g = (MyMacroTest2Enum)((1 << 4) - 1);
var h = (MyMacroTest2Enum)((1 << 4) - 1); Assert.IsTrue(a == MyMacroTest2Enum.MY_MACRO_TEST2_1 && b == MyMacroTest2Enum.MY_MACRO_TEST2_2 &&
Assert.IsTrue(a == MyMacroTest2Enum.MY_MACRO_TEST2_0 && b == MyMacroTest2Enum.MY_MACRO_TEST2_1 && c == MyMacroTest2Enum.MY_MACRO_TEST2_3 && d == MyMacroTest2Enum.MY_MACRO_TEST2_1_2 &&
c == MyMacroTest2Enum.MY_MACRO_TEST2_2 && d == MyMacroTest2Enum.MY_MACRO_TEST2_3 && e == MyMacroTest2Enum.MY_MACRO_TEST2_1_2_3 && f == MyMacroTest2Enum.MY_MACRO_TEST2_4 &&
e == MyMacroTest2Enum.MY_MACRO_TEST2_1_2 && f == MyMacroTest2Enum.MY_MACRO_TEST2_1_2_3 && g == MyMacroTest2Enum.MY_MACRO_TEST2ALL);
g == MyMacroTest2Enum.MY_MACRO_TEST2_4 && h == MyMacroTest2Enum.MY_MACRO_TEST2ALL);
} }
[Test] [Test]

Loading…
Cancel
Save