Skip to content

Commit 33e0959

Browse files
committed
Read using @reader_input, and expect it to be valid and yield @reader_count statements.
1 parent 2ce22d2 commit 33e0959

1 file changed

Lines changed: 8 additions & 16 deletions

File tree

lib/rdf/spec/reader.rb

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ module RDF_Reader
2222

2323
describe ".open" do
2424
before(:each) do
25-
RDF::Util::File.stub(:open_file).and_yield(StringIO.new("foo"))
25+
RDF::Util::File.stub(:open_file).and_yield(StringIO.new(@reader_input))
2626
end
2727

2828
it "yields reader given file_name" do
@@ -41,7 +41,6 @@ module RDF_Reader
4141

4242
it "yields reader given symbol" do
4343
@reader_class.format.each do |f|
44-
RDF::Util::File.stub(:open_file).and_yield(StringIO.new("foo"))
4544
sym = f.to_sym # Like RDF::NTriples::Format => :ntriples
4645
reader_mock = double("reader")
4746
expect(reader_mock).to receive(:got_here)
@@ -55,7 +54,6 @@ module RDF_Reader
5554

5655
it "yields reader given {:file_name => file_name}" do
5756
@reader_class.format.each do |f|
58-
RDF::Util::File.stub(:open_file).and_yield(StringIO.new("foo"))
5957
f.file_extensions.each_pair do |sym, content_type|
6058
reader_mock = double("reader")
6159
expect(reader_mock).to receive(:got_here)
@@ -70,7 +68,6 @@ module RDF_Reader
7068

7169
it "yields reader given {:content_type => 'a/b'}" do
7270
@reader_class.format.each do |f|
73-
RDF::Util::File.stub(:open_file).and_yield(StringIO.new("foo"))
7471
f.content_types.each_pair do |content_type, formats|
7572
reader_mock = double("reader")
7673
expect(reader_mock).to receive(:got_here)
@@ -95,7 +92,7 @@ module RDF_Reader
9592
it "sets @input to StringIO given a string" do
9693
reader_mock = double("reader")
9794
expect(reader_mock).to receive(:got_here)
98-
@reader_class.new("string") do |r|
95+
@reader_class.new(@reader_input) do |r|
9996
reader_mock.got_here
10097
expect(r.instance_variable_get(:@input)).to be_a(StringIO)
10198
end
@@ -104,28 +101,23 @@ module RDF_Reader
104101
it "sets @input to input given something other than a string" do
105102
reader_mock = double("reader")
106103
expect(reader_mock).to receive(:got_here)
107-
file = StringIO.new("")
104+
file = StringIO.new(@reader_input)
108105
@reader_class.new(file) do |r|
109106
reader_mock.got_here
110107
expect(r.instance_variable_get(:@input)).to eq file
111108
end
112109
end
113110

114111
it "sets validate given :validate => true" do
115-
# Either set validate, or through error, due to invalid input (null input may be invalid)
116-
begin
117-
@reader_class.new("string", :validate => true) do |r|
118-
expect(r).to be_valid
119-
end
120-
rescue
121-
expect($!).to be_a(RDF::ReaderError) # An error is acceptable
112+
@reader_class.new(@reader_input, :validate => true) do |r|
113+
expect(r).to be_valid
122114
end
123115
end
124116

125117
it "sets canonicalize given :canonicalize => true" do
126118
reader_mock = double("reader")
127119
expect(reader_mock).to receive(:got_here)
128-
@reader_class.new("string", :canonicalize => true) do |r|
120+
@reader_class.new(@reader_input, :canonicalize => true) do |r|
129121
reader_mock.got_here
130122
expect(r).to be_canonicalize
131123
end
@@ -134,7 +126,7 @@ module RDF_Reader
134126
it "sets intern given :intern => true" do
135127
reader_mock = double("reader")
136128
expect(reader_mock).to receive(:got_here)
137-
@reader_class.new("string", :intern => true) do |r|
129+
@reader_class.new(@reader_input, :intern => true) do |r|
138130
reader_mock.got_here
139131
expect(r).to be_intern
140132
end
@@ -143,7 +135,7 @@ module RDF_Reader
143135
it "sets prefixes given :prefixes => {}" do
144136
reader_mock = double("reader")
145137
expect(reader_mock).to receive(:got_here)
146-
@reader_class.new("string", :prefixes => {:a => "b"}) do |r|
138+
@reader_class.new(@reader_input, :prefixes => {:a => "b"}) do |r|
147139
reader_mock.got_here
148140
expect(r.prefixes).to eq({:a => "b"})
149141
end

0 commit comments

Comments
 (0)