a bit of structure under test/

jmettraux · Jan 28, 2009 · 7159002 · 7159002
1 parent c9fc1a3
commit 7159002
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 11 deletions.
diff --git a/test/cabinet_0_test.rb → test/cabinet/abstract_0_test.rb b/test/cabinet_0_test.rb → test/cabinet/abstract_0_test.rb
@@ -5,9 +5,8 @@
 # Fri Jan 23 08:31:01 JST 2009
 #
 
-require File.dirname(__FILE__) + '/test_base'
+require File.dirname(__FILE__) + '/../test_base'
 
-#require 'rufus/tokyo'
 require 'rufus/tokyo/cabinet'
 
 

diff --git a/test/cabinet_1_test.rb → test/cabinet/abstract_1_test.rb b/test/cabinet_1_test.rb → test/cabinet/abstract_1_test.rb
@@ -5,7 +5,7 @@
 # Sun Jan 25 12:26:48 JST 2009
 #
 
-require File.dirname(__FILE__) + '/test_base'
+require File.dirname(__FILE__) + '/../test_base'
 
 require 'fileutils'
 require 'rufus/tokyo/cabinet'

diff --git a/test/api_0_test.rb → test/cabinet/api_0_test.rb b/test/api_0_test.rb → test/cabinet/api_0_test.rb
@@ -5,7 +5,7 @@
 # Mon Jan 26 15:10:03 JST 2009
 #
 
-require File.dirname(__FILE__) + '/test_base'
+require File.dirname(__FILE__) + '/../test_base'
 
 require 'rufus/tokyo/base'
 

diff --git a/test/table_0_test.rb → test/cabinet/table_0_test.rb b/test/table_0_test.rb → test/cabinet/table_0_test.rb
@@ -5,7 +5,7 @@
 # Mon Jan 26 15:10:03 JST 2009
 #
 
-require File.dirname(__FILE__) + '/test_base'
+require File.dirname(__FILE__) + '/../test_base'
 
 require 'rufus/tokyo/cabinet/table'
 

diff --git a/test/cabinet/test.rb b/test/cabinet/test.rb
@@ -0,0 +1,9 @@
+
+dp = File.dirname(__FILE__)
+
+Dir.new(dp).entries.select { |e|
+  e.match(/\_test.rb$/)
+}.sort.each { |e|
+  require "#{dp}/#{e}"
+}
+
diff --git a/test/util_list_test.rb → test/cabinet/util_list_test.rb b/test/util_list_test.rb → test/cabinet/util_list_test.rb
@@ -5,7 +5,7 @@
 # Tue Jan 27 16:30:34 JST 2009
 #
 
-require File.dirname(__FILE__) + '/test_base'
+require File.dirname(__FILE__) + '/../test_base'
 
 require 'rufus/tokyo/cabinet/util'
 

diff --git a/test/util_map_test.rb → test/cabinet/util_map_test.rb b/test/util_map_test.rb → test/cabinet/util_map_test.rb
@@ -5,7 +5,7 @@
 # Mon Jan 26 15:10:03 JST 2009
 #
 
-require File.dirname(__FILE__) + '/test_base'
+require File.dirname(__FILE__) + '/../test_base'
 
 require 'rufus/tokyo/cabinet/util'
 

diff --git a/test/dystopia/test.rb b/test/dystopia/test.rb
@@ -0,0 +1,9 @@
+
+dp = File.dirname(__FILE__)
+
+Dir.new(dp).entries.select { |e|
+  e.match(/\_test.rb$/)
+}.sort.each { |e|
+  require "#{dp}/#{e}"
+}
+
diff --git a/test/dystopia_0_test.rb → test/dystopia/words_0_test.rb b/test/dystopia_0_test.rb → test/dystopia/words_0_test.rb
@@ -5,7 +5,7 @@
 # Mon Jan 26 12:54:32 JST 2009
 #
 
-require File.dirname(__FILE__) + '/test_base'
+require File.dirname(__FILE__) + '/../test_base'
 
 require 'rufus/tokyo/dystopia/words'
 

diff --git a/test/test.rb b/test/test.rb
@@ -3,8 +3,11 @@
 
 require dirpath + '/test_base'
 
+require dirpath + '/cabinet/test'
+require dirpath + '/dystopia/test'
 
-tests = Dir.new(dirpath).entries.select { |e| e.match(/\_test.rb$/) }.sort
-
-tests.each { |path| load "#{dirpath}/#{path}" }
+#cab_tests = Dir.new(dirpath).entries.collect { |e| "#{dir
+#tests = (cab_tests + dys_tests).select { |e| e.match(/\_test.rb$/) }.sort
+#
+#(cab_tests + dys_tests).each { |path| require "#{dirpath}/#{path}" }