From 2afff849d5ec5362dffa39c52a93561bc6dd7da2 Mon Sep 17 00:00:00 2001
From: Scott Talbert <swt@techie.net>
Date: Fri, 9 Sep 2016 21:25:40 -0400
Subject: [PATCH] Fix abstract class tests - check for TypeError instead of
 expected failure

---
 unittests/test_headercol.py      |  8 ++++----
 unittests/test_headerctrl.py     |  4 ++--
 unittests/test_richtextbuffer.py | 12 ++++++------
 unittests/test_richtextstyles.py |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/unittests/test_headercol.py b/unittests/test_headercol.py
index cc07242d..60f12249 100644
--- a/unittests/test_headercol.py
+++ b/unittests/test_headercol.py
@@ -45,13 +45,13 @@ class headercol_Tests(wtc.WidgetTestCase):
         wx.COL_HIDDEN      
         wx.COL_DEFAULT_FLAGS
         
-    @unittest.expectedFailure
     def test_headercolAbsClass1(self):
-        hc = wx.HeaderColumn()
+        with self.assertRaises(TypeError):
+            hc = wx.HeaderColumn()
         
-    @unittest.expectedFailure
     def test_headercolAbsClass2(self):
-        hc = wx.SettableHeaderColumn()
+        with self.assertRaises(TypeError):
+            hc = wx.SettableHeaderColumn()
         
 #---------------------------------------------------------------------------
 
diff --git a/unittests/test_headerctrl.py b/unittests/test_headerctrl.py
index d5691f0e..b96340d1 100644
--- a/unittests/test_headerctrl.py
+++ b/unittests/test_headerctrl.py
@@ -40,9 +40,9 @@ class headerctrl_Tests(wtc.WidgetTestCase):
         wx.EVT_HEADER_DRAGGING_CANCELLED
         
         
-    @unittest.expectedFailure  # it's an abstract class
     def test_headerctrl2(self):
-        hc = wx.HeaderCtrl(self.frame)
+        with self.assertRaises(TypeError):
+            hc = wx.HeaderCtrl(self.frame)
         
     def test_headerctrl3(self):
         hc = wx.HeaderCtrlSimple()
diff --git a/unittests/test_richtextbuffer.py b/unittests/test_richtextbuffer.py
index b6975268..e6f0ee64 100644
--- a/unittests/test_richtextbuffer.py
+++ b/unittests/test_richtextbuffer.py
@@ -207,13 +207,13 @@ class richtextbuffer_Tests(wtc.WidgetTestCase):
         c = wx.richtext.RichTextDrawingContext(None)
         
 
-    @unittest.expectedFailure    
     def test_richtextbuffer17(self):
-        o1 = wx.richtext.RichTextObject()  # It's an ABC
+        with self.assertRaises(TypeError):
+            o1 = wx.richtext.RichTextObject()  # It's an ABC
         
-    @unittest.expectedFailure            
     def test_richtextbuffer18(self):
-        o1 = wx.richtext.RichTextCompositeObject()  # It's an ABC
+        with self.assertRaises(TypeError):
+            o1 = wx.richtext.RichTextCompositeObject()  # It's an ABC
         
     def test_richtextbuffer19(self):
         o1 = wx.richtext.RichTextParagraphLayoutBox()
@@ -224,9 +224,9 @@ class richtextbuffer_Tests(wtc.WidgetTestCase):
     def test_richtextbuffer21(self):
         o1 = wx.richtext.RichTextField()
 
-    @unittest.expectedFailure            
     def test_richtextbuffer22(self):
-        o1 = wx.richtext.RichTextFieldType('foo')  # It's an ABC
+        with self.assertRaises(TypeError):
+            o1 = wx.richtext.RichTextFieldType('foo')  # It's an ABC
 
     def test_richtextbuffer23(self):
         o1 = wx.richtext.RichTextFieldTypeStandard()
diff --git a/unittests/test_richtextstyles.py b/unittests/test_richtextstyles.py
index 8e57bdb8..ef85ac78 100644
--- a/unittests/test_richtextstyles.py
+++ b/unittests/test_richtextstyles.py
@@ -16,9 +16,9 @@ class richtextstyles_Tests(wtc.WidgetTestCase):
         ctrl.Create(self.frame)
 
 
-    @unittest.expectedFailure   # RichTextStyleDefinition is abstract
     def test_richtextstyles03(self):
-        sdef = wx.richtext.RichTextStyleDefinition()
+        with self.assertRaises(TypeError):
+            sdef = wx.richtext.RichTextStyleDefinition()
         
 
     def test_richtextstyles04(self):