Merge branch 'vadz-add-nested-in-template-test'
* vadz-add-nested-in-template-test: Avoid comparing doubles in nested_in_template.i unit test Add recently added nested_in_template to the list of test cases
This commit is contained in:
commit
525c757322
4 changed files with 7 additions and 6 deletions
|
|
@ -321,6 +321,7 @@ CPP_TEST_CASES += \
|
|||
nested_directors \
|
||||
nested_comment \
|
||||
nested_ignore \
|
||||
nested_in_template \
|
||||
nested_scope \
|
||||
nested_template_base \
|
||||
nested_workaround \
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ using nested_in_templateNamespace;
|
|||
|
||||
public class runme {
|
||||
static void Main() {
|
||||
var cd = new OuterTemplate1.ConcreteDerived(8.8);
|
||||
if (cd.m_value != 8.8)
|
||||
var cd = new OuterTemplate1.ConcreteDerived(88);
|
||||
if (cd.m_value != 88)
|
||||
throw new Exception("ConcreteDerived not created correctly");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@ struct OuterTemplate<1>
|
|||
struct ConcreteDerived : AbstractBase
|
||||
{
|
||||
ConcreteDerived() : m_value(0.) {}
|
||||
explicit ConcreteDerived(double value) : m_value(value) {}
|
||||
explicit ConcreteDerived(int value) : m_value(value) {}
|
||||
|
||||
virtual bool IsSameAs(const AbstractBase& other) const {
|
||||
return m_value == static_cast<const ConcreteDerived&>(other).m_value;
|
||||
}
|
||||
|
||||
double m_value;
|
||||
int m_value;
|
||||
};
|
||||
};
|
||||
%}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
from nested_in_template import *
|
||||
|
||||
cd = ConcreteDerived(8.8)
|
||||
if cd.m_value != 8.8:
|
||||
cd = ConcreteDerived(88)
|
||||
if cd.m_value != 88:
|
||||
raise RuntimeError("ConcreteDerived not created correctly")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue