Added test for typedef of unsigned short.

3 files changed, 9 insertions, 0 deletions

diff --git a/tests/libsample/size.h b/tests/libsample/size.h
index 3915bf502..f13319007 100644
--- a/tests/libsample/size.h
+++ b/tests/libsample/size.h
@@ -183,12 +183,14 @@ inline const Size operator/(const Size& s, double div)
 }
 
 typedef double real;
+typedef unsigned short ushort;
 class LIBSAMPLE_API SizeF
 {
 public:
     SizeF(real width, real height) : m_width(width), m_height(height) {}
     real width() { return m_width; }
     real height() { return m_height; }
+    static inline ushort passTypedefOfUnsignedShort(ushort value) { return value; }
 private:
     real m_width;
     real m_height;
diff --git a/tests/samplebinding/numericaltypedef_test.py b/tests/samplebinding/numericaltypedef_test.py
index 094b4f9fc..c896609b4 100644
--- a/tests/samplebinding/numericaltypedef_test.py
+++ b/tests/samplebinding/numericaltypedef_test.py
@@ -42,5 +42,10 @@ class NumericalTypedefTest(unittest.TestCase):
         self.assertEqual(size.width(), float(width))
         self.assertEqual(size.height(), float(height))
 
+    def testNumericalTypedefOfUnsignedShort(self):
+        self.assertEqual(SizeF.passTypedefOfUnsignedShort(123), 123)
+        self.assertEqual(SizeF.passTypedefOfUnsignedShort(321), 321)
+        self.assertNotEqual(SizeF.passTypedefOfUnsignedShort(123), 0)
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/samplebinding/typesystem_sample.xml b/tests/samplebinding/typesystem_sample.xml
index 56ef0d6cf..91771699f 100644
--- a/tests/samplebinding/typesystem_sample.xml
+++ b/tests/samplebinding/typesystem_sample.xml
@@ -8,6 +8,8 @@
     <primitive-type name="real"/>
     <primitive-type name="int"/>
     <primitive-type name="short"/>
+    <primitive-type name="unsigned short"/>
+    <primitive-type name="ushort"/>
     <primitive-type name="unsigned int" />
     <primitive-type name="signed int" />
     <primitive-type name="char"/>