test/test_csv.rb in statsample-0.7.0 vs test/test_csv.rb in statsample-0.8.0

@@ -1,46 +1,41 @@
-$:.unshift(File.dirname(__FILE__)+'/../lib/')
-require 'statsample'
-require "tempfile"
-require 'minitest/unit'
-MiniTest::Unit.autorun
-class StatsampleCSVTestCase < MiniTest::Unit::TestCase
-    def setup
-        @ds=Statsample::CSV.read(File.dirname(__FILE__)+"/test_csv.csv")
-    end
-    def test_read
-        assert_equal(6,@ds.cases)
-        assert_equal(%w{id name age city a1}, @ds.fields)
-        id=[1,2,3,4,5,6].to_vector(:scale)
-        name=["Alex","Claude","Peter","Franz","George","Fernand"].to_vector(:nominal)
-        age=[20,23,25,27,5.5,nil].to_vector(:scale)
-        city=["New York","London","London","Paris","Tome",nil].to_vector(:nominal)
-        a1=["a,b","b,c","a",nil,"a,b,c",nil].to_vector(:nominal)
-        ds_exp=Statsample::Dataset.new({'id'=>id,'name'=>name,'age'=>age,'city'=>city,'a1'=>a1}, %w{id name age city a1})
-        ds_exp.fields.each{|f|
-            assert_equal(ds_exp[f],@ds[f])
-        }
-        assert_equal(ds_exp,@ds)
-        
+require(File.dirname(__FILE__)+'/test_helpers.rb')
 
-    end
-    def test_nil
-        assert_equal(nil,@ds['age'][5])
-    end
-    def test_repeated
-      ds=Statsample::CSV.read(File.dirname(__FILE__)+"/../data/repeated_fields.csv")
-      assert_equal(%w{id name_1 age_1 city a1 name_2 age_2},ds.fields)
-      age=[3,4,5,6,nil,8].to_vector(:scale)
-      assert_equal(age,ds['age_2'])
-    end
-    def test_write
-      filename=Tempfile.new("afile")
-      #  filename=Dir::tmpdir+"/test_write.csv"
-        Statsample::CSV.write(@ds, filename.path)
-        ds2=Statsample::CSV.read(filename.path)
-        i=0
-        ds2.each_array{|row|
-            assert_equal(@ds.case_as_array(i),row)
-               i+=1
-        }
-    end
-end
\ No newline at end of file
+class StatsampleCSVTestCase < MiniTest::Unit::TestCase
+  def setup
+    @ds=Statsample::CSV.read(File.dirname(__FILE__)+"/test_csv.csv")
+  end
+  def test_read
+    assert_equal(6,@ds.cases)
+    assert_equal(%w{id name age city a1}, @ds.fields)
+    id=[1,2,3,4,5,6].to_vector(:scale)
+    name=["Alex","Claude","Peter","Franz","George","Fernand"].to_vector(:nominal)
+    age=[20,23,25,27,5.5,nil].to_vector(:scale)
+    city=["New York","London","London","Paris","Tome",nil].to_vector(:nominal)
+    a1=["a,b","b,c","a",nil,"a,b,c",nil].to_vector(:nominal)
+    ds_exp=Statsample::Dataset.new({'id'=>id,'name'=>name,'age'=>age,'city'=>city,'a1'=>a1}, %w{id name age city a1})
+    ds_exp.fields.each{|f|
+      assert_equal(ds_exp[f],@ds[f])
+    }
+    assert_equal(ds_exp,@ds)
+  end
+  def test_nil
+    assert_equal(nil,@ds['age'][5])
+  end
+  def test_repeated
+    ds=Statsample::CSV.read(File.dirname(__FILE__)+"/../data/repeated_fields.csv")
+    assert_equal(%w{id name_1 age_1 city a1 name_2 age_2},ds.fields)
+    age=[3,4,5,6,nil,8].to_vector(:scale)
+    assert_equal(age,ds['age_2'])
+  end
+  def test_write
+    filename=Tempfile.new("afile")
+    #  filename=Dir::tmpdir+"/test_write.csv"
+    Statsample::CSV.write(@ds, filename.path)
+    ds2=Statsample::CSV.read(filename.path)
+    i=0
+    ds2.each_array{|row|
+      assert_equal(@ds.case_as_array(i),row)
+      i+=1
+    }
+  end
+end