diff --git a/test/TC_FXAccelTable.rb b/test/TC_FXAccelTable.rb
index 5f69f2b55973282fe65e3141a56a5ba51aefb81e..17039747f0dca3741e2e7d02ed0d5e17a7fbb059 100755
--- a/test/TC_FXAccelTable.rb
+++ b/test/TC_FXAccelTable.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXAccelTable < Test::Unit::TestCase
+ include Fox
+
def setup
@accelTable = FXAccelTable.new
@hotKey = fxparseHotKey('&q')
diff --git a/test/TC_FXApp.rb b/test/TC_FXApp.rb
index 717f1e5472b9aadf288f3fd8f1684b30b04e74ad..555e41c40b1c07488cdd93b08c583c6f59fa018c 100755
--- a/test/TC_FXApp.rb
+++ b/test/TC_FXApp.rb
@@ -3,9 +3,9 @@ require 'fox16'
require 'testcase'
require 'socket'
-include Fox
-
class TC_FXApp < Test::Unit::TestCase
+ include Fox
+
def test_exception_for_second_app
app = FXApp.new
mainWindow = FXMainWindow.new(app, "")
@@ -16,7 +16,9 @@ class TC_FXApp < Test::Unit::TestCase
end
end
-class TC_FXApp2 < TestCase
+class TC_FXApp2 < Fox::TestCase
+ include Fox
+
def setup
super(self.class.name)
end
diff --git a/test/TC_FXArc.rb b/test/TC_FXArc.rb
index 0bded73ece839f097541e69493b82432cdf89406..5cb2af36f704c5af095bf939eb144ed85e3d0921 100755
--- a/test/TC_FXArc.rb
+++ b/test/TC_FXArc.rb
@@ -1,9 +1,9 @@
require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXArc < Test::Unit::TestCase
+ include Fox
+
def test_new
anArc = FXArc.new
assert_equal(0, anArc.x)
diff --git a/test/TC_FXBMPIcon.rb b/test/TC_FXBMPIcon.rb
index 25b3006dedf7bf2c11517da2a0864b4cb415c9a2..480f50c551cb9160aef09ca4403f091036191f32 100755
--- a/test/TC_FXBMPIcon.rb
+++ b/test/TC_FXBMPIcon.rb
@@ -2,9 +2,9 @@ require 'fox16'
require 'test/unit'
require 'testcase'
-include Fox
+class TC_FXBMPIcon < Fox::TestCase
+ include Fox
-class TC_FXBMPIcon < TestCase
def setup
super(self.class.name)
end
diff --git a/test/TC_FXBMPImage.rb b/test/TC_FXBMPImage.rb
index 1212e0c9fdc90fb3eb2133588711bdcc1114934c..fc95f95480332e615cc5e6ebf6e592a72b2d90da 100755
--- a/test/TC_FXBMPImage.rb
+++ b/test/TC_FXBMPImage.rb
@@ -2,9 +2,9 @@ require 'fox16'
require 'test/unit'
require 'testcase'
-include Fox
+class TC_FXBMPImage < Fox::TestCase
+ include Fox
-class TC_FXBMPImage < TestCase
def setup
super(self.class.name)
end
diff --git a/test/TC_FXButton.rb b/test/TC_FXButton.rb
index ac4484fd724d87531caa6730dcb294a0402a965d..0973f9abee25892b8f377a2e44db52e785a4167a 100755
--- a/test/TC_FXButton.rb
+++ b/test/TC_FXButton.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'fox16'
require 'testcase'
-include Fox
+class TC_FXButton < Fox::TestCase
+ include Fox
-class TC_FXButton < TestCase
def setup
super("TC_FXButton")
@button = FXButton.new(mainWindow, "buttonText")
diff --git a/test/TC_FXCheckButton.rb b/test/TC_FXCheckButton.rb
index 6189c3389a773ca65c457e8ba39fd4b28217af8a..b2c1f54621698c400f8a6c532deceeac80eb8723 100755
--- a/test/TC_FXCheckButton.rb
+++ b/test/TC_FXCheckButton.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'testcase'
require 'fox16'
-include Fox
+class TC_FXCheckButton < Fox::TestCase
+ include Fox
-class TC_FXCheckButton < TestCase
def setup
super("TC_FXCheckButton")
@checkButton = FXCheckButton.new(mainWindow, "cbText")
diff --git a/test/TC_FXComboBox.rb b/test/TC_FXComboBox.rb
index faaf6aebbd5ce6972a6357cb0fa75768d2a6bf33..9cb63d8179fa6c71857389ef6017182dc2b51835 100755
--- a/test/TC_FXComboBox.rb
+++ b/test/TC_FXComboBox.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'testcase'
require 'fox16'
-include Fox
+class TC_FXComboBox < Fox::TestCase
+ include Fox
-class TC_FXComboBox < TestCase
def setup
super(self.class.name)
@comboBox = FXComboBox.new(mainWindow, 1)
diff --git a/test/TC_FXDC.rb b/test/TC_FXDC.rb
index e4d25c3d7292307ce71f12995f96c002ef064d2b..cf09f20fb677c64df50d882a51a89b4f8be6a18a 100755
--- a/test/TC_FXDC.rb
+++ b/test/TC_FXDC.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXDC < Test::Unit::TestCase
+ include Fox
+
def setup
if FXApp.instance.nil?
@app = FXApp.new('TC_FXDC', 'FXRuby')
diff --git a/test/TC_FXDCPrint.rb b/test/TC_FXDCPrint.rb
index 3f72299f90c7cbe5995c6ef39ef86188da7b9285..46b2b4d40d17243959ee6cd5ab6e6ce01191cc50 100755
--- a/test/TC_FXDCPrint.rb
+++ b/test/TC_FXDCPrint.rb
@@ -3,9 +3,9 @@ require 'test/unit'
require 'fox16'
require 'fileutils'
-include Fox
-
class TC_FXDCPrint < Test::Unit::TestCase
+ include Fox
+
private
def printJob
job = FXPrinter.new
diff --git a/test/TC_FXDCWindow.rb b/test/TC_FXDCWindow.rb
index 63ff320950268bc8f325eeaedf16d927567704ec..f07f609453e542c124ecd70b5e50f8475347080a 100755
--- a/test/TC_FXDCWindow.rb
+++ b/test/TC_FXDCWindow.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'testcase'
require 'fox16'
-include Fox
+class TC_FXDCWindow < Fox::TestCase
+ include Fox
-class TC_FXDCWindow < TestCase
def setup
super(self.class.name)
app.create
diff --git a/test/TC_FXDataTarget.rb b/test/TC_FXDataTarget.rb
index 65ae3529b6cc02d41a27037ed10151cf91ca6db8..d17c77bdcb4a0650ad4066d5c37608db24e4f16c 100755
--- a/test/TC_FXDataTarget.rb
+++ b/test/TC_FXDataTarget.rb
@@ -1,9 +1,9 @@
require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXDataTarget < Test::Unit::TestCase
+ include Fox
+
def setup
@nilTarget = FXDataTarget.new
@intTarget = FXDataTarget.new(42)
diff --git a/test/TC_FXDialogBox.rb b/test/TC_FXDialogBox.rb
index e65bee693860732fc935d62adeb3a100524975f2..442414cbb173b10dab82d5f9c0474defc5ae9537 100644
--- a/test/TC_FXDialogBox.rb
+++ b/test/TC_FXDialogBox.rb
@@ -1,9 +1,9 @@
require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXDialogBox < Test::Unit::TestCase
+ include Fox
+
def test_nil_app_raises_argument_error
assert_raise ArgumentError do
FXDialogBox.new(nil, "title")
diff --git a/test/TC_FXDirList.rb b/test/TC_FXDirList.rb
index 95718b3bee3d439b407bc745bfe7f624d435b0bb..cd983d0422c8e78f48a69675c613787bc1a31f5e 100755
--- a/test/TC_FXDirList.rb
+++ b/test/TC_FXDirList.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'testcase'
require 'fox16'
-include Fox
+class TC_FXDirList < Fox::TestCase
+ include Fox
-class TC_FXDirList < TestCase
def setup
super(self.class.name)
@dirList = FXDirList.new(mainWindow)
diff --git a/test/TC_FXExtentd.rb b/test/TC_FXExtentd.rb
index 64d37b0fd87111f0c230695df0533154cf380aba..3aee9963167d276d5b3345b4c5e3c45f4d760ac2 100755
--- a/test/TC_FXExtentd.rb
+++ b/test/TC_FXExtentd.rb
@@ -1,9 +1,9 @@
require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXExtentd < Test::Unit::TestCase
+ include Fox
+
def test_lower_always_returns_same_instance
e = FXExtentd.new(0, 1, 0, 1)
assert_same e.lower, e.lower
diff --git a/test/TC_FXExtentf.rb b/test/TC_FXExtentf.rb
index 87a0db656f112a7ffb10d6e727693e6fb3fe9400..b9e52632fcf2afb90f60fed19ef7fcfe8aefc61d 100755
--- a/test/TC_FXExtentf.rb
+++ b/test/TC_FXExtentf.rb
@@ -1,9 +1,9 @@
require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXExtentf < Test::Unit::TestCase
+ include Fox
+
def test_lower_always_returns_same_instance
e = FXExtentf.new(0, 1, 0, 1)
assert_same e.lower, e.lower
diff --git a/test/TC_FXFileAssoc.rb b/test/TC_FXFileAssoc.rb
index 616442c8ad0b7bbd8c515cb70c5c8a0da98e0a6b..d6bcac47444843dbdcbe4b7a330bcc57ef1caca4 100755
--- a/test/TC_FXFileAssoc.rb
+++ b/test/TC_FXFileAssoc.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXFileAssoc < Test::Unit::TestCase
+ include Fox
+
def setup
@app = FXApp.instance || FXApp.new
@icon = FXIcon.new(@app)
diff --git a/test/TC_FXFileStream.rb b/test/TC_FXFileStream.rb
index 22c94883a107acd4ea45a5cd17245f7c55b333b2..fa3ba0d6ca68729450f82ff03cfd756b693e3464 100755
--- a/test/TC_FXFileStream.rb
+++ b/test/TC_FXFileStream.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'fox16'
require 'tempfile'
-include Fox
-
class TC_FXFileStream < Test::Unit::TestCase
+ include Fox
+
def setup
@filestream = FXFileStream.new
end
diff --git a/test/TC_FXFoldingList.rb b/test/TC_FXFoldingList.rb
index 056c2b019b928167ae9724f81a38a3b1f8d01b1a..23d949e9adc664a294830323759e86cd240e8fc8 100755
--- a/test/TC_FXFoldingList.rb
+++ b/test/TC_FXFoldingList.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'testcase'
require 'fox16'
-include Fox
+class TC_FXFoldingList < Fox::TestCase
+ include Fox
-class TC_FXFoldingList < TestCase
def setup
super(self.class.name)
diff --git a/test/TC_FXFont.rb b/test/TC_FXFont.rb
index ed35d86dac1eccb4f588bcc67ea1584309188b4b..b683344e68e0f60264c23d147891b6823529a9bb 100755
--- a/test/TC_FXFont.rb
+++ b/test/TC_FXFont.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXFont < Test::Unit::TestCase
+ include Fox
+
def setup
if FXApp.instance.nil?
@app = FXApp.new('TC_FXFont', 'FoxTest')
diff --git a/test/TC_FXFontDesc.rb b/test/TC_FXFontDesc.rb
index acd7a8002bb24ed53a9fb17adb864956a59d15ff..4d69ad95eddf9eda5ceb339d16e6008d6f8b410d 100755
--- a/test/TC_FXFontDesc.rb
+++ b/test/TC_FXFontDesc.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXFontDesc < Test::Unit::TestCase
+ include Fox
+
def setup
@fontdesc = FXFontDesc.new
end
diff --git a/test/TC_FXGLGroup.rb b/test/TC_FXGLGroup.rb
index 22fd895384abf4fcece35e5bb8b2abdb6b5bab2c..c98fe00ba5c5b382ed459e1098ec43e14a49d703 100755
--- a/test/TC_FXGLGroup.rb
+++ b/test/TC_FXGLGroup.rb
@@ -1,9 +1,9 @@
require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXGLGroup < Test::Unit::TestCase
+ include Fox
+
def setup
@group = FXGLGroup.new
end
diff --git a/test/TC_FXGLShape.rb b/test/TC_FXGLShape.rb
index 6847f9fe0ae479625b20c65b0208d4cd68c630c0..3841125703f1695ef4ff669412f817b34bba006f 100755
--- a/test/TC_FXGLShape.rb
+++ b/test/TC_FXGLShape.rb
@@ -1,9 +1,9 @@
require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXGLShape < Test::Unit::TestCase
+ include Fox
+
DELTA = 1.0e-5
diff --git a/test/TC_FXGLViewer.rb b/test/TC_FXGLViewer.rb
index 13d5cc94792c1094c8749751767072414f245414..36fd5ad2b789c817b3790651a9d26f5155a23710 100755
--- a/test/TC_FXGLViewer.rb
+++ b/test/TC_FXGLViewer.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'fox16'
require 'testcase'
-include Fox
+class TC_FXGLViewer < Fox::TestCase
+ include Fox
-class TC_FXGLViewer < TestCase
def setup
super(self.class.name)
vis = FXGLVisual.new(app, VISUAL_DOUBLEBUFFER)
diff --git a/test/TC_FXGradientBar.rb b/test/TC_FXGradientBar.rb
index 0a957d097e509db75cf756d6ca4a68fba9c56a09..2a3abec1f419b33921319030f6293478dcf536a6 100755
--- a/test/TC_FXGradientBar.rb
+++ b/test/TC_FXGradientBar.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'fox16'
require 'testcase'
-include Fox
+class TC_FXGradientBar < Fox::TestCase
+ include Fox
-class TC_FXGradientBar < TestCase
def setup
super(self.class.name)
@gradientBar = FXGradientBar.new(mainWindow)
diff --git a/test/TC_FXHeader.rb b/test/TC_FXHeader.rb
index 787bea08708d2179b419dda5e94f34f2bc9c8afd..7f0ca8c6630df640a9631b270567660b22dc559a 100755
--- a/test/TC_FXHeader.rb
+++ b/test/TC_FXHeader.rb
@@ -2,9 +2,9 @@ require 'fox16'
require 'test/unit'
require 'testcase'
-include Fox
+class TC_FXHeader < Fox::TestCase
+ include Fox
-class TC_FXHeader < TestCase
def setup
super(self.class.name)
diff --git a/test/TC_FXHiliteStyle.rb b/test/TC_FXHiliteStyle.rb
index 35fe085c5e28c732af66d6588d3ddc0aff000382..63f7e62803e0fbf36387c2a592740ab1f05ec0e2 100755
--- a/test/TC_FXHiliteStyle.rb
+++ b/test/TC_FXHiliteStyle.rb
@@ -1,9 +1,9 @@
require 'fox16'
require 'test/unit'
-include Fox
-
class TC_FXHiliteStyle < Test::Unit::TestCase
+ include Fox
+
def setup
@style = FXHiliteStyle.new
diff --git a/test/TC_FXIconDict.rb b/test/TC_FXIconDict.rb
index 88385a19d207b4797e8773f80c54fdcd90d8d2c9..86573c8eabb570598de271ac9e0da8ae055deb67 100755
--- a/test/TC_FXIconDict.rb
+++ b/test/TC_FXIconDict.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'fox16'
require 'testcase'
-include Fox
+class TC_FXIconDict < Fox::TestCase
+ include Fox
-class TC_FXIconDict < TestCase
def setup
super(self.class.name)
end
diff --git a/test/TC_FXIconList.rb b/test/TC_FXIconList.rb
index 72da05481090b0596d67b18085694211510d6667..6da18f1e52eda28622c0f12f97e1dff2e28b0caf 100755
--- a/test/TC_FXIconList.rb
+++ b/test/TC_FXIconList.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'testcase'
require 'fox16'
-include Fox
+class TC_FXIconList < Fox::TestCase
+ include Fox
-class TC_FXIconList < TestCase
private
diff --git a/test/TC_FXId.rb b/test/TC_FXId.rb
index fae3391d39683ae1d7c408a368c6e01e553c95f3..ed3346573f4f6a7722f6ea8de441df5e4891bb36 100755
--- a/test/TC_FXId.rb
+++ b/test/TC_FXId.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'fox16'
require 'testcase'
-include Fox
+class TC_FXId < Fox::TestCase
+ include Fox
-class TC_FXId < TestCase
def setup
super(self.class.name)
end
diff --git a/test/TC_FXImage.rb b/test/TC_FXImage.rb
index 7b02f771e3245713187ffb7dcc3819283e162b1b..7eccebff8c98466a3abb1147af786f1d4e14c849 100755
--- a/test/TC_FXImage.rb
+++ b/test/TC_FXImage.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'testcase'
require 'fox16'
-include Fox
+class TC_FXImage < Fox::TestCase
+ include Fox
-class TC_FXImage < TestCase
def setup
super(self.class.name)
end
diff --git a/test/TC_FXLight.rb b/test/TC_FXLight.rb
index 1a52c5782241e8cb535ec1adbc4b62f0721400aa..bb572598e74bbeee21a19889279faa9df7dd6b7c 100755
--- a/test/TC_FXLight.rb
+++ b/test/TC_FXLight.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXLight < Test::Unit::TestCase
+ include Fox
+
def setup
@light = FXLight.new
end
diff --git a/test/TC_FXList.rb b/test/TC_FXList.rb
index 56d27b8f7ad82050385fefc439f18e655d7c6c08..2628f1c47aa62b722f1617ffd58152f24e0f4852 100755
--- a/test/TC_FXList.rb
+++ b/test/TC_FXList.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'testcase'
require 'fox16'
-include Fox
+class TC_FXList < Fox::TestCase
+ include Fox
-class TC_FXList < TestCase
def setup
super(self.class.name)
@list = FXList.new(mainWindow)
diff --git a/test/TC_FXListBox.rb b/test/TC_FXListBox.rb
index bb3a5242b12ffd5199a956ff90b8b2f6c77e822b..526f191b0b111e2483652662b4a43843fb2aca05 100755
--- a/test/TC_FXListBox.rb
+++ b/test/TC_FXListBox.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'testcase'
require 'fox16'
-include Fox
+class TC_FXListBox < Fox::TestCase
+ include Fox
-class TC_FXListBox < TestCase
def setup
super(self.class.name)
@listBox = FXListBox.new(mainWindow)
diff --git a/test/TC_FXMainWindow.rb b/test/TC_FXMainWindow.rb
index aa88b1d7a98f1ba957e4717d667e2195c537f242..67ebdb4bd2010e403de2d4000dfb53b327031ac8 100644
--- a/test/TC_FXMainWindow.rb
+++ b/test/TC_FXMainWindow.rb
@@ -1,9 +1,9 @@
require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXMainWindow < Test::Unit::TestCase
+ include Fox
+
def test_nil_app_raises_argument_error
assert_raise ArgumentError do
FXMainWindow.new(nil, "title")
diff --git a/test/TC_FXMat4f.rb b/test/TC_FXMat4f.rb
index a9e25bf31897a94c9af6383d0cf175342ff63bb5..b48c3c3cf5ea72038946240443c7d6398a918767 100755
--- a/test/TC_FXMat4f.rb
+++ b/test/TC_FXMat4f.rb
@@ -1,9 +1,9 @@
require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXMat4f < Test::Unit::TestCase
+ include Fox
+
def setup
@hmat = FXMat4f.new
end
diff --git a/test/TC_FXMaterial.rb b/test/TC_FXMaterial.rb
index 3ba26627ca93d7b8ed848f1d83cbefff771ab376..4908dea1ce0c5107368afbb775b8562f524f0337 100755
--- a/test/TC_FXMaterial.rb
+++ b/test/TC_FXMaterial.rb
@@ -3,9 +3,9 @@ require 'test/unit'
require 'fox16'
require 'fox16/glshapes'
-include Fox
-
class TC_FXMaterial < Test::Unit::TestCase
+ include Fox
+
DELTA = 1.0e-6
diff --git a/test/TC_FXMemoryStream.rb b/test/TC_FXMemoryStream.rb
index 569f2d51e8407785b469a20954140aac05722d2e..78abce7b53437b9b224b32be89a9e42604145809 100755
--- a/test/TC_FXMemoryStream.rb
+++ b/test/TC_FXMemoryStream.rb
@@ -1,9 +1,9 @@
require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXMemoryStream < Test::Unit::TestCase
+ include Fox
+
DEFAULT_BUFFER_SIZE = 16
diff --git a/test/TC_FXMenuCheck.rb b/test/TC_FXMenuCheck.rb
index cdc7d753dd06f0062f36fe24571476100fcb246c..86237d5e2696d0e3c3751d7fb033a770936fd465 100755
--- a/test/TC_FXMenuCheck.rb
+++ b/test/TC_FXMenuCheck.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'testcase'
require 'fox16'
-include Fox
+class TC_FXMenuCheck < Fox::TestCase
+ include Fox
-class TC_FXMenuCheck < TestCase
def setup
super(self.class.name)
@menuCheck = FXMenuCheck.new(mainWindow, "menuCheck")
diff --git a/test/TC_FXMenuCommand.rb b/test/TC_FXMenuCommand.rb
index 5a404dbf368f507c8f6a4a07f0a8f0142f982d99..a70361d3b924e9870e47be6fd30d217f843b1282 100755
--- a/test/TC_FXMenuCommand.rb
+++ b/test/TC_FXMenuCommand.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'testcase'
require 'fox16'
-include Fox
+class TC_FXMenuCommand < Fox::TestCase
+ include Fox
-class TC_FXMenuCommand < TestCase
def setup
super(self.class.name)
@menuCommand = FXMenuCommand.new(mainWindow, "menuCommand")
diff --git a/test/TC_FXMenuRadio.rb b/test/TC_FXMenuRadio.rb
index 43abc8e5bd7f05ff9156649455d7c49d57754258..8dc67cd5123c61b4056213409aa4c27cfd53b154 100755
--- a/test/TC_FXMenuRadio.rb
+++ b/test/TC_FXMenuRadio.rb
@@ -2,14 +2,14 @@ require 'test/unit'
require 'testcase'
require 'fox16'
-include Fox
+class TC_FXMenuRadio < Fox::TestCase
+ include Fox
-class TC_FXMenuRadio < TestCase
def setup
super(self.class.name)
@menuRadio = FXMenuRadio.new(mainWindow, "menuRadio")
end
-
+
def test_setCheck_TRUE
@menuRadio.check = Fox::TRUE
assert_equal(true, @menuRadio.check)
@@ -18,7 +18,7 @@ class TC_FXMenuRadio < TestCase
assert(!@menuRadio.unchecked?)
assert(!@menuRadio.maybe?)
end
-
+
def test_setCheck_FALSE
@menuRadio.check = Fox::FALSE
assert_equal(false, @menuRadio.check)
@@ -27,7 +27,7 @@ class TC_FXMenuRadio < TestCase
assert(@menuRadio.unchecked?)
assert(!@menuRadio.maybe?)
end
-
+
def test_setCheck_MAYBE
@menuRadio.check = Fox::MAYBE
assert_equal(true, @menuRadio.check) # this is not a typo!
@@ -36,7 +36,7 @@ class TC_FXMenuRadio < TestCase
assert(!@menuRadio.unchecked?)
assert(@menuRadio.maybe?)
end
-
+
def test_setCheck_true
@menuRadio.check = true
assert_equal(true, @menuRadio.check)
@@ -45,7 +45,7 @@ class TC_FXMenuRadio < TestCase
assert(!@menuRadio.unchecked?)
assert(!@menuRadio.maybe?)
end
-
+
def test_setCheck_false
@menuRadio.check = false
assert_equal(false, @menuRadio.check)
diff --git a/test/TC_FXMessageBox.rb b/test/TC_FXMessageBox.rb
index f926d29a66f7ee0253dff79f6bf773b067f4586e..b8ebcc35c9b99cc29989478d3df4c1a11dfabc15 100755
--- a/test/TC_FXMessageBox.rb
+++ b/test/TC_FXMessageBox.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'testcase'
require 'fox16'
-include Fox
+class TC_FXMessageBox < Fox::TestCase
+ include Fox
-class TC_FXMessageBox < TestCase
def setup
super(self.class.name)
end
diff --git a/test/TC_FXPoint.rb b/test/TC_FXPoint.rb
index 8c00830eba492a269b275216ed66a7d8a1e39404..7a129bb589b3b94b76b9581b3c9cb1c58b01f404 100755
--- a/test/TC_FXPoint.rb
+++ b/test/TC_FXPoint.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXPoint < Test::Unit::TestCase
+ include Fox
+
def setup
@point1 = FXPoint.new
@point2 = FXPoint.new(300, 200)
diff --git a/test/TC_FXQuatf.rb b/test/TC_FXQuatf.rb
index d2a5b62c4790bf40eac6c7bd176c70b4810c7693..6fedb3b945c8f8b97d8efeb937aab848d789ba30 100755
--- a/test/TC_FXQuatf.rb
+++ b/test/TC_FXQuatf.rb
@@ -1,9 +1,9 @@
require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXQuatf < Test::Unit::TestCase
+ include Fox
+
def setup
@quat = FXQuatf.new
end
diff --git a/test/TC_FXRadioButton.rb b/test/TC_FXRadioButton.rb
index 732cef29768506193397ec886bab82e3940690d7..0ee23c272c5acba670f139ebfb80d46633259a64 100755
--- a/test/TC_FXRadioButton.rb
+++ b/test/TC_FXRadioButton.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'testcase'
require 'fox16'
-include Fox
+class TC_FXRadioButton < Fox::TestCase
+ include Fox
-class TC_FXRadioButton < TestCase
def setup
super(self.class.name)
@radioButton = FXRadioButton.new(mainWindow, "cbText")
diff --git a/test/TC_FXRanged.rb b/test/TC_FXRanged.rb
index 1cf193cca9c72b37c8e0884543188a59c4450bcc..03087117d9e05b1d10f53626594babaca851128c 100755
--- a/test/TC_FXRanged.rb
+++ b/test/TC_FXRanged.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXRanged < Test::Unit::TestCase
+ include Fox
+
WIDTH, HEIGHT, DEPTH = 2, 4, 6
diff --git a/test/TC_FXRangef.rb b/test/TC_FXRangef.rb
index f302d95408d091545422de35fd29e25a1a1881c2..2353efdd06525f2b060dbe8766959c1bed4acfb2 100755
--- a/test/TC_FXRangef.rb
+++ b/test/TC_FXRangef.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXRangef < Test::Unit::TestCase
+ include Fox
+
WIDTH, HEIGHT, DEPTH = 2, 4, 6
diff --git a/test/TC_FXRectangle.rb b/test/TC_FXRectangle.rb
index 55b91edc5bd21e9d34e7d81a7fce4b2102f7b2be..fc9a62a8fb2fafbe3cf6e717bdfc355532df6a2e 100755
--- a/test/TC_FXRectangle.rb
+++ b/test/TC_FXRectangle.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXRectangle < Test::Unit::TestCase
+ include Fox
+
def setup
@rect1 = FXRectangle.new
@rect2 = FXRectangle.new(5, 5, 300, 200)
diff --git a/test/TC_FXRegion.rb b/test/TC_FXRegion.rb
index 64fa47ba932f772262581dc6a5d73e0e0d5566cd..058fa73067cf3769a655fa408782171269c0ba74 100755
--- a/test/TC_FXRegion.rb
+++ b/test/TC_FXRegion.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXRegion < Test::Unit::TestCase
+ include Fox
+
def setup
@region = FXRegion.new(5, 5, 10, 10)
diff --git a/test/TC_FXRegistry.rb b/test/TC_FXRegistry.rb
index 4c9ed0ce90040a707c31dbd15f5ec62f167df305..fe99af108909f9102868f83bab61979c1d788f3a 100755
--- a/test/TC_FXRegistry.rb
+++ b/test/TC_FXRegistry.rb
@@ -1,9 +1,9 @@
require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXRegistry < Test::Unit::TestCase
+ include Fox
+
def setup
@reg = FXRegistry.new("TC_FXRegistry", "FXRuby")
end
diff --git a/test/TC_FXScrollArea.rb b/test/TC_FXScrollArea.rb
index 870ad7e1b296a960785ac4e5e6804ed563c33756..b64e28e844472b6691b2c3d40cc8da6cba1a4ea2 100755
--- a/test/TC_FXScrollArea.rb
+++ b/test/TC_FXScrollArea.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'fox16'
require 'testcase'
-include Fox
+class TC_FXScrollArea < Fox::TestCase
+ include Fox
-class TC_FXScrollArea < TestCase
def setup
super(self.class.name)
@scrollArea = FXScrollArea.new(mainWindow)
diff --git a/test/TC_FXScrollWindow.rb b/test/TC_FXScrollWindow.rb
index 397ff0d79b1c7fc7872f00ddc61d48b0cf73aabb..f4ca6157e237e4601a5918f6d335c445190ac4aa 100755
--- a/test/TC_FXScrollWindow.rb
+++ b/test/TC_FXScrollWindow.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'fox16'
require 'testcase'
-include Fox
+class TC_FXScrollWindow < Fox::TestCase
+ include Fox
-class TC_FXScrollWindow < TestCase
def setup
super(self.class.name)
@scrollWindow = FXScrollWindow.new(mainWindow)
diff --git a/test/TC_FXSegment.rb b/test/TC_FXSegment.rb
index 2643cbbc4b0a28ed07c0522e6f5d3e71e7f4bb19..a789e12014c29cf436ef0de6c824693a559623ea 100755
--- a/test/TC_FXSegment.rb
+++ b/test/TC_FXSegment.rb
@@ -1,9 +1,9 @@
require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXSegment < Test::Unit::TestCase
+ include Fox
+
def test_new
aSeg = FXSegment.new
assert_equal(0, aSeg.x1)
diff --git a/test/TC_FXSettings.rb b/test/TC_FXSettings.rb
index c9eb5a0aadef55be0ebbe1b8e39f5dce05017f8a..a5b962a3799d089238c2eade982cb7c6395ca8ca 100755
--- a/test/TC_FXSettings.rb
+++ b/test/TC_FXSettings.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'fox16'
require 'testcase'
-include Fox
+class TC_FXSettings < Fox::TestCase
+ include Fox
-class TC_FXSettings < TestCase
def setup
super(self.class.name)
diff --git a/test/TC_FXShell.rb b/test/TC_FXShell.rb
index 16fb0f4732bb486b5ddc1cec5b9cc14dcd702c7d..dd9c2e1db6aa1cd70aba267c352b03783591efff 100755
--- a/test/TC_FXShell.rb
+++ b/test/TC_FXShell.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXShell < Test::Unit::TestCase
+ include Fox
+
def setup
if FXApp.instance.nil?
@app = FXApp.new('TC_FXShell', 'FXRuby')
diff --git a/test/TC_FXSize.rb b/test/TC_FXSize.rb
index 8b642aeb481e4571002a979cbd9425b23a28e123..4865b7f52c51af4233d63a0b4710a8f19f9185f0 100755
--- a/test/TC_FXSize.rb
+++ b/test/TC_FXSize.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXSize < Test::Unit::TestCase
+ include Fox
+
def setup
@size1 = FXSize.new
@size2 = FXSize.new(300, 200)
diff --git a/test/TC_FXStream.rb b/test/TC_FXStream.rb
index 762e7a468fb4d610b8069e369649b11a34c6a791..937b4efb9e7962a8015579718496c450efec6382 100755
--- a/test/TC_FXStream.rb
+++ b/test/TC_FXStream.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'fox16'
require 'testcase'
-include Fox
+class TC_FXStream < Fox::TestCase
+ include Fox
-class TC_FXStream < TestCase
def setup
super(self.class.name)
end
diff --git a/test/TC_FXTable.rb b/test/TC_FXTable.rb
index 8cfb16938a3ae6dfb8b62fc91e130f25931e10e0..b9d66cc3a89274094bf2fb9cacf13477ef8ba57a 100755
--- a/test/TC_FXTable.rb
+++ b/test/TC_FXTable.rb
@@ -2,12 +2,10 @@ require 'test/unit'
require 'testcase'
require 'fox16'
-include Fox
-
class OverrideError < Exception
end
-class CustomTable < FXTable
+class CustomTable < Fox::FXTable
def setColumnWidth(col, cwidth)
raise OverrideError
end
@@ -25,7 +23,9 @@ class CustomTable < FXTable
end
end
-class TC_FXTable < TestCase
+class TC_FXTable < Fox::TestCase
+ include Fox
+
private
@@ -39,13 +39,13 @@ private
item = nil
nr = @table.numRows
nc = @table.numColumns
-
+
(1..nc-2).each { |c|
item = @table.getItem(nr-1, c)
item.button = false
item.justify = FXTableItem::RIGHT
}
-
+
unless extending
(1..nr-2).each { |r|
item = @table.getItem(r, nc-1)
@@ -161,7 +161,7 @@ private
end
public
-
+
def setup
super(self.class.name)
@table = FXTable.new(mainWindow)
@@ -174,7 +174,7 @@ public
100.times { loadLog } # this should be enough to do it
end
=end
-
+
def test_getCellColor
assert_nothing_raised {
@table.getCellColor(0, 0)
@@ -232,7 +232,7 @@ public
@table.setCellColor(0, 2, FXRGB(0, 0, 0))
}
end
-
+
def test_updateRange
@table.setTableSize(5, 5)
assert_nothing_raised {
@@ -251,7 +251,7 @@ public
@table.updateRange(0, 0, 0, 5) # endCol >= numColumns
}
end
-
+
def test_insertRows
@table.setTableSize(5, 5)
assert_nothing_raised {
@@ -283,7 +283,7 @@ public
@table.insertColumns(@table.numColumns+1) # column > numColumns
}
end
-
+
def test_removeRows
@table.setTableSize(8, 5)
assert_raises(IndexError) {
@@ -299,7 +299,7 @@ public
@table.removeRows(@table.numRows)
}
end
-
+
def test_removeColumns
@table.setTableSize(5, 8)
assert_raises(IndexError) {
@@ -331,7 +331,7 @@ public
@table.getColumnX(5)
}
end
-
+
def test_getRowY
@table.setTableSize(5, 5)
assert_raises(IndexError) {
@@ -356,7 +356,7 @@ public
@table.setItemText(1, 1, "(1, 1)")
assert_equal("(0, 0)\t(0, 1)\n(1, 0)\t(1, 1)\n", @table.extractText(0, 1, 0, 1))
end
-
+
def test_overlayText
@table.setTableSize(2, 2)
@table.overlayText(0, 1, 0, 1, "(0, 0)\t(0, 1)\n(1, 0)\t(1, 1)\n")
@@ -365,196 +365,196 @@ public
assert_equal("(1, 0)", @table.getItemText(1, 0))
assert_equal("(1, 1)", @table.getItemText(1, 1))
end
-
+
def test_set_column_icon_negative_index_raises_index_error
assert_raises(IndexError) {
- @table.setColumnIcon(-1, nil)
+ @table.setColumnIcon(-1, nil)
}
end
def test_set_column_icon_large_index_raises_index_error
assert_raises(IndexError) {
- @table.setColumnIcon(@table.numColumns, nil)
+ @table.setColumnIcon(@table.numColumns, nil)
}
end
def test_get_column_icon_negative_index_raises_index_error
assert_raises(IndexError) {
- @table.getColumnIcon(-1)
+ @table.getColumnIcon(-1)
}
end
def test_get_column_icon_large_index_raises_index_error
assert_raises(IndexError) {
- @table.getColumnIcon(@table.numColumns)
+ @table.getColumnIcon(@table.numColumns)
}
end
def test_set_column_icon_position_negative_index_raises_index_error
assert_raises(IndexError) {
- @table.setColumnIconPosition(-1, 0)
+ @table.setColumnIconPosition(-1, 0)
}
end
def test_set_column_icon_position_large_index_raises_index_error
assert_raises(IndexError) {
- @table.setColumnIconPosition(@table.numColumns, 0)
+ @table.setColumnIconPosition(@table.numColumns, 0)
}
end
def test_get_column_icon_position_negative_index_raises_index_error
assert_raises(IndexError) {
- @table.getColumnIconPosition(-1)
+ @table.getColumnIconPosition(-1)
}
end
def test_get_column_icon_position_large_index_raises_index_error
assert_raises(IndexError) {
- @table.getColumnIconPosition(@table.numColumns)
+ @table.getColumnIconPosition(@table.numColumns)
}
end
def test_set_column_justify_negative_index_raises_index_error
assert_raises(IndexError) {
- @table.setColumnJustify(-1, 0)
+ @table.setColumnJustify(-1, 0)
}
end
def test_set_column_justify_large_index_raises_index_error
assert_raises(IndexError) {
- @table.setColumnJustify(@table.numColumns, 0)
+ @table.setColumnJustify(@table.numColumns, 0)
}
end
def test_get_column_justify_negative_index_raises_index_error
assert_raises(IndexError) {
- @table.getColumnJustify(-1)
+ @table.getColumnJustify(-1)
}
end
def test_get_column_justify_large_index_raises_index_error
assert_raises(IndexError) {
- @table.getColumnJustify(@table.numColumns)
+ @table.getColumnJustify(@table.numColumns)
}
end
def test_set_column_text_negative_index_raises_index_error
assert_raises(IndexError) {
- @table.setColumnText(-1, "")
+ @table.setColumnText(-1, "")
}
end
def test_set_column_text_large_index_raises_index_error
assert_raises(IndexError) {
- @table.setColumnText(@table.numColumns, "")
+ @table.setColumnText(@table.numColumns, "")
}
end
def test_get_column_text_negative_index_raises_index_error
assert_raises(IndexError) {
- @table.getColumnText(-1)
+ @table.getColumnText(-1)
}
end
def test_get_column_text_large_index_raises_index_error
assert_raises(IndexError) {
- @table.getColumnText(@table.numColumns)
+ @table.getColumnText(@table.numColumns)
}
end
def test_set_row_icon_negative_index_raises_index_error
assert_raises(IndexError) {
- @table.setRowIcon(-1, nil)
+ @table.setRowIcon(-1, nil)
}
end
def test_set_row_icon_large_index_raises_index_error
assert_raises(IndexError) {
- @table.setRowIcon(@table.numRows, nil)
+ @table.setRowIcon(@table.numRows, nil)
}
end
def test_get_row_icon_negative_index_raises_index_error
assert_raises(IndexError) {
- @table.getRowIcon(-1)
+ @table.getRowIcon(-1)
}
end
def test_get_row_icon_large_index_raises_index_error
assert_raises(IndexError) {
- @table.getRowIcon(@table.numRows)
+ @table.getRowIcon(@table.numRows)
}
end
def test_set_row_icon_position_negative_index_raises_index_error
assert_raises(IndexError) {
- @table.setRowIconPosition(-1, 0)
+ @table.setRowIconPosition(-1, 0)
}
end
def test_set_row_icon_position_large_index_raises_index_error
assert_raises(IndexError) {
- @table.setRowIconPosition(@table.numRows, 0)
+ @table.setRowIconPosition(@table.numRows, 0)
}
end
def test_get_row_icon_position_negative_index_raises_index_error
assert_raises(IndexError) {
- @table.getRowIconPosition(-1)
+ @table.getRowIconPosition(-1)
}
end
def test_get_row_icon_position_large_index_raises_index_error
assert_raises(IndexError) {
- @table.getRowIconPosition(@table.numRows)
+ @table.getRowIconPosition(@table.numRows)
}
end
def test_set_row_justify_negative_index_raises_index_error
assert_raises(IndexError) {
- @table.setRowJustify(-1, 0)
+ @table.setRowJustify(-1, 0)
}
end
def test_set_row_justify_large_index_raises_index_error
assert_raises(IndexError) {
- @table.setRowJustify(@table.numRows, 0)
+ @table.setRowJustify(@table.numRows, 0)
}
end
def test_get_row_justify_negative_index_raises_index_error
assert_raises(IndexError) {
- @table.getRowJustify(-1)
+ @table.getRowJustify(-1)
}
end
def test_get_row_justify_large_index_raises_index_error
assert_raises(IndexError) {
- @table.getRowJustify(@table.numRows)
+ @table.getRowJustify(@table.numRows)
}
end
def test_set_row_text_negative_index_raises_index_error
assert_raises(IndexError) {
- @table.setRowText(-1, "")
+ @table.setRowText(-1, "")
}
end
def test_set_row_text_large_index_raises_index_error
assert_raises(IndexError) {
- @table.setRowText(@table.numRows, "")
+ @table.setRowText(@table.numRows, "")
}
end
def test_get_row_text_negative_index_raises_index_error
assert_raises(IndexError) {
- @table.getRowText(-1)
+ @table.getRowText(-1)
}
end
def test_get_row_text_large_index_raises_index_error
assert_raises(IndexError) {
- @table.getRowText(@table.numRows)
+ @table.getRowText(@table.numRows)
}
end
diff --git a/test/TC_FXTableItem.rb b/test/TC_FXTableItem.rb
index fde5620aa197f4ce57dd93b18b4670272847bd36..2c74eae3ff48f73c4e8dcd2205b6e2e91eb89d07 100755
--- a/test/TC_FXTableItem.rb
+++ b/test/TC_FXTableItem.rb
@@ -2,12 +2,10 @@ require 'test/unit'
require 'testcase'
require 'fox16'
-include Fox
-
class OverrideError < Exception
end
-class CustomTableItem < FXTableItem
+class CustomTableItem < Fox::FXTableItem
def getText
raise OverrideError
end
@@ -16,7 +14,9 @@ class CustomTableItem < FXTableItem
end
end
-class TC_FXTableItem < TestCase
+class TC_FXTableItem < Fox::TestCase
+ include Fox
+
def setup
super(self.class.name)
@table = FXTable.new(mainWindow)
diff --git a/test/TC_FXText.rb b/test/TC_FXText.rb
index bd38766f20adb847891521bb2dcc8810ebee7121..894edb219d7a947f1d103fbcd45e6b56dda513e0 100755
--- a/test/TC_FXText.rb
+++ b/test/TC_FXText.rb
@@ -3,11 +3,11 @@ require 'fox16'
require 'fox16/colors'
require 'testcase'
-include Fox
-
SAMPLE = "The quick brown fox jumped over the lazy dog"
-class TC_FXText < TestCase
+class TC_FXText < Fox::TestCase
+ include Fox
+
private
@@ -71,7 +71,7 @@ public
def test_getText
assert_equal(SAMPLE, @text.text)
end
-
+
def test_find_text
@text.text = "99 bottles of beer"
startIndex, endIndex = @text.findText("bottles")
diff --git a/test/TC_FXTopWindow.rb b/test/TC_FXTopWindow.rb
index a5e98aede261555d58f496578a4e6299e42951e1..849aabc5d4a94bd65cf14c139185e72e97830141 100755
--- a/test/TC_FXTopWindow.rb
+++ b/test/TC_FXTopWindow.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXTopWindow < Test::Unit::TestCase
+ include Fox
+
def setup
if FXApp.instance.nil?
@app = FXApp.new('TC_FXTopWindow', 'FXRuby')
diff --git a/test/TC_FXTreeList.rb b/test/TC_FXTreeList.rb
index ef5543cd8e1c081a4e994897ac9b4311e94ddbca..38cfe61e63c557a71ee07ff46974b09ccaa00c74 100755
--- a/test/TC_FXTreeList.rb
+++ b/test/TC_FXTreeList.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'testcase'
require 'fox16'
-include Fox
+class TC_FXTreeList < Fox::TestCase
+ include Fox
-class TC_FXTreeList < TestCase
def setup
super(self.class.name)
@treeList = FXTreeList.new(mainWindow, nil, 0,
diff --git a/test/TC_FXTreeListBox.rb b/test/TC_FXTreeListBox.rb
index b54dbaf31562d46a7b0f52a07fcf151da67b8215..8f054c55a090dfd7c8d8853b8c0bf58959092489 100755
--- a/test/TC_FXTreeListBox.rb
+++ b/test/TC_FXTreeListBox.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'testcase'
require 'fox16'
-include Fox
+class TC_FXTreeListBox < Fox::TestCase
+ include Fox
-class TC_FXTreeListBox < TestCase
def setup
super(self.class.name)
diff --git a/test/TC_FXUndoList.rb b/test/TC_FXUndoList.rb
index 94de9b5bb4ce2969f3ac5377355502b996062081..c5f510ecb7d8569bdc89fa7bde84fa7f5a1b548d 100755
--- a/test/TC_FXUndoList.rb
+++ b/test/TC_FXUndoList.rb
@@ -2,9 +2,7 @@ require 'test/unit'
require 'fox16'
require 'fox16/undolist'
-include Fox
-
-class DummyCommand < FXCommand
+class DummyCommand < Fox::FXCommand
def undo ; end
def redo ; end
def undoName
@@ -16,6 +14,8 @@ class DummyCommand < FXCommand
end
class TC_FXUndoList < Test::Unit::TestCase
+ include Fox
+
def test_cut_with_nil_marker
undoList = FXUndoList.new
assert_nothing_raised {
diff --git a/test/TC_FXVec2d.rb b/test/TC_FXVec2d.rb
index 8b93a070e390df882ad6bb912f884675e05eab25..5edd199dd9e3e24e725a6892a9561819fa91810e 100755
--- a/test/TC_FXVec2d.rb
+++ b/test/TC_FXVec2d.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXVec2d < Test::Unit::TestCase
+ include Fox
+
def test_default_constructor
FXVec4f.new
diff --git a/test/TC_FXVec2f.rb b/test/TC_FXVec2f.rb
index 1d2f777909374d47b71df6791c476f7dc236622a..b8e60c8811af61f11540b71a3d2cc0e58da62a04 100755
--- a/test/TC_FXVec2f.rb
+++ b/test/TC_FXVec2f.rb
@@ -1,9 +1,9 @@
require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXVec2f < Test::Unit::TestCase
+ include Fox
+
def test_default_constructor
FXVec4f.new
diff --git a/test/TC_FXVec3d.rb b/test/TC_FXVec3d.rb
index 58ac9e6c9dab018d78597367cf9fbd280c63d5d9..df1a6508e4d4dda2b119e55a7893177e69bf158a 100755
--- a/test/TC_FXVec3d.rb
+++ b/test/TC_FXVec3d.rb
@@ -1,9 +1,9 @@
require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXVec3d < Test::Unit::TestCase
+ include Fox
+
def test_default_constructor
FXVec3d.new
diff --git a/test/TC_FXVec3f.rb b/test/TC_FXVec3f.rb
index f67e8d0cf73cca82280feb03381f56ff512ba116..b85d490fd9f7e4b68a52eaf3bf08cc63b1d42444 100755
--- a/test/TC_FXVec3f.rb
+++ b/test/TC_FXVec3f.rb
@@ -1,9 +1,9 @@
require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXVec3f < Test::Unit::TestCase
+ include Fox
+
def test_default_constructor
FXVec3f.new
diff --git a/test/TC_FXVec4f.rb b/test/TC_FXVec4f.rb
index fb2678edab3579345d45e3dfa22ec52c9e0aabbf..8f0f5812cdb72ee85f85f928dc38ea0089ea3388 100755
--- a/test/TC_FXVec4f.rb
+++ b/test/TC_FXVec4f.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXVec4f < Test::Unit::TestCase
+ include Fox
+
def test_new
FXVec4f.new
diff --git a/test/TC_FXViewport.rb b/test/TC_FXViewport.rb
index 9ac5ef998fb3e594be092c69e387ef19c1888fcc..68e1a686afa40bb27cdc3f2acfc05fc25a69b142 100755
--- a/test/TC_FXViewport.rb
+++ b/test/TC_FXViewport.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'fox16'
-include Fox
-
class TC_FXViewport < Test::Unit::TestCase
+ include Fox
+
def setup
@viewport = FXViewport.new
end
diff --git a/test/TC_FXXBMIcon.rb b/test/TC_FXXBMIcon.rb
index 455210e1ad51134e4e0de7e638ffdb24470df1e9..e96da818a132a84cc2229fbfd04727b0d6f026b8 100755
--- a/test/TC_FXXBMIcon.rb
+++ b/test/TC_FXXBMIcon.rb
@@ -2,9 +2,9 @@ require 'fox16'
require 'test/unit'
require 'testcase'
-include Fox
+class TC_FXXBMIcon < Fox::TestCase
+ include Fox
-class TC_FXXBMIcon < TestCase
def setup
super(self.class.name)
end
diff --git a/test/TC_FXXBMImage.rb b/test/TC_FXXBMImage.rb
index e4c7efda0f906957729638e9d49578b1d66b9170..154bee47536c912df83e34adc93a364f0cde1173 100755
--- a/test/TC_FXXBMImage.rb
+++ b/test/TC_FXXBMImage.rb
@@ -2,9 +2,9 @@ require 'fox16'
require 'test/unit'
require 'testcase'
-include Fox
+class TC_FXXBMImage < Fox::TestCase
+ include Fox
-class TC_FXXBMImage < TestCase
def setup
super(self.class.name)
end
diff --git a/test/TC_FXXPMIcon.rb b/test/TC_FXXPMIcon.rb
index 525f6c95f337bb5c602518cef157ad36051b4783..eb392e684e8548d2831042b21d44d089b20d13a8 100755
--- a/test/TC_FXXPMIcon.rb
+++ b/test/TC_FXXPMIcon.rb
@@ -2,9 +2,9 @@ require 'fox16'
require 'test/unit'
require 'testcase'
-include Fox
+class TC_FXXPMIcon < Fox::TestCase
+ include Fox
-class TC_FXXPMIcon < TestCase
def setup
super(self.class.name)
end
diff --git a/test/TC_FXXPMImage.rb b/test/TC_FXXPMImage.rb
index 27e9ed945d7dfafd26b28f04849c356c3862eeaf..ab7c179fbbf6e91eb824adb0bd3f61a9e2f71e49 100755
--- a/test/TC_FXXPMImage.rb
+++ b/test/TC_FXXPMImage.rb
@@ -2,9 +2,9 @@ require 'fox16'
require 'test/unit'
require 'testcase'
-include Fox
+class TC_FXXPMImage < Fox::TestCase
+ include Fox
-class TC_FXXPMImage < TestCase
def setup
super(self.class.name)
end
diff --git a/test/TC_downcast.rb b/test/TC_downcast.rb
index 421457b2ff5ebddb8a9c4d7d3e9b3d466d555841..b93a06f9026da505e5c9e721a407fdd65342f661 100755
--- a/test/TC_downcast.rb
+++ b/test/TC_downcast.rb
@@ -2,9 +2,9 @@ require 'test/unit'
require 'fox16'
require 'testcase'
-include Fox
+class TC_downcast < Fox::TestCase
+ include Fox
-class TC_downcast < TestCase
def setup
super(self.class.name)
end