summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-12-28 02:57:25 +0000
committernahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-12-28 02:57:25 +0000
commit83fe8f3240f804bc9489db122a022f761fa34d44 (patch)
tree32d07aa8a03d2ba43cf66559269d108d7a380e1c
parent67f1d099d46d4b555094f6a0c70f50b46732a7bd (diff)
* test/csv/test_csv.rb: generate bom.csv and mac.csv files on the fly.
[ruby-talk:88852] * test/csv/{bom.csv,mac.csv}: removed. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@5326 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--MANIFEST2
-rw-r--r--test/csv/bom.csv2
-rw-r--r--test/csv/mac.csv2
-rw-r--r--test/csv/test_csv.rb12
5 files changed, 17 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 93ee8a45fc..78594c283a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Dec 28 11:55:29 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/csv/test_csv.rb: generate bom.csv and mac.csv files on the fly.
+ [ruby-talk:88852]
+
+ * test/csv/{bom.csv,mac.csv}: removed.
+
Sun Dec 28 08:56:51 2003 Dave Thomas <dave@pragprog.com>
* eval.c: Thead[Group] RDoc (thanks to MG)
diff --git a/MANIFEST b/MANIFEST
index bdb0afa74e..b422e9d327 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -670,8 +670,6 @@ sample/wsdl/googleSearch/sjissearch.sh
sample/wsdl/googleSearch/wsdlDriver.rb
sample/wsdl/raa/raa.wsdl
sample/wsdl/raa/soap4r.rb
-test/csv/bom.csv
-test/csv/mac.csv
test/csv/test_csv.rb
test/digest/test_digest.rb
test/drb/drbtest.rb
diff --git a/test/csv/bom.csv b/test/csv/bom.csv
deleted file mode 100644
index 47ab7a601c..0000000000
--- a/test/csv/bom.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"foo"
-"bar"
diff --git a/test/csv/mac.csv b/test/csv/mac.csv
deleted file mode 100644
index 95b1a1725b..0000000000
--- a/test/csv/mac.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"Avenches","aus Umgebung"
-"Bad Hersfeld","Ausgrabung" \ No newline at end of file
diff --git a/test/csv/test_csv.rb b/test/csv/test_csv.rb
index 6cc4c5cac7..7092470915 100644
--- a/test/csv/test_csv.rb
+++ b/test/csv/test_csv.rb
@@ -275,8 +275,8 @@ public
@infiletsv = File.join(@tmpdir, 'in.tsv')
@emptyfile = File.join(@tmpdir, 'empty.csv')
@outfile = File.join(@tmpdir, 'out.csv')
- @bomfile = File.join(File.dirname(__FILE__), "bom.csv")
- @macfile = File.join(File.dirname(__FILE__), "mac.csv")
+ @bomfile = File.join(@tmpdir, "bom.csv")
+ @macfile = File.join(@tmpdir, "mac.csv")
CSV.open(@infile, "w") do |writer|
@@fullCSVDataArray.each do |row|
@@ -293,6 +293,14 @@ public
CSV.generate(@emptyfile) do |writer|
# Create empty file.
end
+
+ File.open(@bomfile, "wb") do |f|
+ f.write("\357\273\277\"foo\"\r\n\"bar\"\r\n")
+ end
+
+ File.open(@macfile, "wb") do |f|
+ f.write("\"Avenches\",\"aus Umgebung\"\r\"Bad Hersfeld\",\"Ausgrabung\"")
+ end
end
def teardown