Browse Source

Merge pull request #484 from ddobrev/master

Added a test for protected members in secondary bases
pull/485/head
João Matos 10 years ago
parent
commit
580a96953f
  1. 8
      tests/CSharpTemp/CSharpTemp.Tests.cs
  2. 4
      tests/CSharpTemp/CSharpTemp.cpp
  3. 2
      tests/CSharpTemp/CSharpTemp.h

8
tests/CSharpTemp/CSharpTemp.Tests.cs

@ -8,6 +8,14 @@ using Foo = CSharpTemp.Foo;
public class CSharpTempTests : GeneratorTestFixture public class CSharpTempTests : GeneratorTestFixture
{ {
public class ExtendsWrapper : TestOverrideFromSecondaryBase
{
public ExtendsWrapper()
{
ProtectedFunction();
}
}
[Test] [Test]
public void TestIndexer() public void TestIndexer()
{ {

4
tests/CSharpTemp/CSharpTemp.cpp

@ -487,6 +487,10 @@ void SecondaryBase::function()
{ {
} }
void SecondaryBase::protectedFunction()
{
}
void TestOverrideFromSecondaryBase::VirtualMember() void TestOverrideFromSecondaryBase::VirtualMember()
{ {
} }

2
tests/CSharpTemp/CSharpTemp.h

@ -497,6 +497,8 @@ public:
int property(); int property();
void setProperty(int value); void setProperty(int value);
void function(); void function();
protected:
void protectedFunction();
}; };
class DLL_API TestOverrideFromSecondaryBase : public Foo, public SecondaryBase class DLL_API TestOverrideFromSecondaryBase : public Foo, public SecondaryBase

Loading…
Cancel
Save