Skip to content

Commit 5aedbf7

Browse files
committed
remove use of instance_variable_set in tests
- fixes #98
1 parent 8324688 commit 5aedbf7

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

test/provider/tc_functional_tokens.rb

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@ class ResumptionTokenFunctionalTest < Test::Unit::TestCase
55

66
def setup
77
@provider = ComplexProvider.new
8-
@provider.model.instance_variable_set(:@limit, 120)
9-
end
10-
11-
def teardown
12-
@provider.model.instance_variable_set(:@limit, 100)
138
end
149

1510
def test_resumption_tokens
@@ -26,28 +21,31 @@ def test_resumption_tokens
2621
end
2722

2823
def test_from_and_until_with_resumption_tokens
29-
# Should return 300 records broken into 3 groups of 120, 120, and 60.
24+
# Should return 550 records broken into 5 groups of 100, and a final group of 50.
25+
# checked elements under ListRecords are limit + 1, accounting for the resumptionToken element
3026
assert_nothing_raised do
3127
Document.new(@provider.list_records(:metadata_prefix => 'oai_dc'))
3228
end
3329
doc = Document.new(
3430
@provider.list_records(
3531
:metadata_prefix => 'oai_dc',
3632
:from => Time.parse("September 1 2004"),
37-
:until => Time.parse("November 30 2004"))
33+
:until => Time.parse("December 25 2005"))
3834
)
3935
assert_equal (@provider.model.limit + 1), doc.elements["/OAI-PMH/ListRecords"].to_a.size
4036
assert_not_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"]
4137
token = doc.elements["/OAI-PMH/ListRecords/resumptionToken"].text
4238

43-
doc = Document.new(@provider.list_records(:resumption_token => token))
44-
assert_not_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"]
45-
assert_equal (@provider.model.limit + 1), doc.elements["/OAI-PMH/ListRecords"].to_a.size
46-
token = doc.elements["/OAI-PMH/ListRecords/resumptionToken"].text
39+
4.times do
40+
doc = Document.new(@provider.list_records(:resumption_token => token))
41+
assert_not_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"]
42+
assert_equal (@provider.model.limit + 1), doc.elements["/OAI-PMH/ListRecords"].to_a.size
43+
token = doc.elements["/OAI-PMH/ListRecords/resumptionToken"].text
44+
end
4745

4846
doc = Document.new(@provider.list_records(:resumption_token => token))
4947
# assert that ListRecords includes remaining records and an empty resumption token
50-
assert_equal (301 % @provider.model.limit), doc.elements["/OAI-PMH/ListRecords"].to_a.size
48+
assert_equal (551 % @provider.model.limit), doc.elements["/OAI-PMH/ListRecords"].to_a.size
5149
assert_not_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"]
5250
assert_nil doc.elements["/OAI-PMH/ListRecords/resumptionToken"].text
5351
end

0 commit comments

Comments
 (0)