umlaut 3.0.0alpha10 → 3.0.0alpha11

data/test/unit/aleph_patron_test.rb

@@ -1,39 +1,44 @@
 require 'test_helper'
 class AlephPatronTest < Test::Unit::TestCase
-  def setup
-    @primo_config = YAML.load_file("#{Rails.root}/config/primo.yml")
-    @nyu_aleph_config = @primo_config["sources"]["nyu_aleph"]
-    @rest_url = @nyu_aleph_config["rest_url"]
-    @aleph_doc_library = "NYU01"
-    @aleph_doc_number = "000062856"
-    @nyuidn = "N12162279"
-    @aleph_adm_library = "NYU50"
-    @aleph_item_id = "NYU50000062856000010"
-    @aleph_renew_item_id = "NYU50000647049"
-    @pickup_location = "BOBST"
-    @bogus_url = "http://library.nyu.edu/bogus"
-  end
-
-  # Test exception handling for bogus response.
-  def test_bogus_response
-    patron = Exlibris::Aleph::Patron.new(@nyuidn, @bogus_url)
-    assert_raise(MultiXml::ParseError) { patron.loans }
-    assert_raise(MultiXml::ParseError) { patron.renew_loans() }
-    assert_raise(MultiXml::ParseError) { patron.renew_loans(@aleph_renew_item_id) }
-    assert_raise(RuntimeError) { patron.place_hold(@aleph_adm_library, @aleph_doc_library, @aleph_doc_number, @aleph_item_id, {:pickup_location => @pickup_location}) }
-  end
-
-  # Test search for a single Primo document.
-  def test_patron
-    patron = Exlibris::Aleph::Patron.new(@nyuidn, @rest_url)
-    loans = patron.loans
-    assert_nil(patron.error, "Failure in #{patron.class} while getting loans: #{patron.error}")
-    #renew_loans = patron.renew_loans()
-    #assert_nil(patron.error, "Failure in #{patron.class} while renewing all loans: #{patron.error}")
-    #renew_loans = patron.renew_loans(@aleph_renew_item_id)
-    #assert_nil(patron.error, "Failure in #{patron.class} while renewing loan #{@aleph_renew_item_id}: #{patron.error}")
-    assert_raise(RuntimeError) { patron.place_hold(@aleph_adm_library, @aleph_doc_library, @aleph_doc_number, @aleph_item_id, {}) }
-    place_hold = patron.place_hold(@aleph_adm_library, @aleph_doc_library, @aleph_doc_number, @aleph_item_id, {:pickup_location => @pickup_location})
-    assert_nil(patron.error, "Failure in #{patron.class} while placing hold: #{patron.error}")
+  
+  nyu_only_tests(self.name) do
+    
+    def setup
+      @primo_config = YAML.load_file("#{Rails.root}/config/primo.yml")
+      @nyu_aleph_config = @primo_config["sources"]["nyu_aleph"]
+      @rest_url = @nyu_aleph_config["rest_url"]
+      @aleph_doc_library = "NYU01"
+      @aleph_doc_number = "000062856"
+      @nyuidn = "N12162279"
+      @aleph_adm_library = "NYU50"
+      @aleph_item_id = "NYU50000062856000010"
+      @aleph_renew_item_id = "NYU50000647049"
+      @pickup_location = "BOBST"
+      @bogus_url = "http://library.nyu.edu/bogus"
+    end
+  
+    # Test exception handling for bogus response.
+    def test_bogus_response
+      patron = Exlibris::Aleph::Patron.new(@nyuidn, @bogus_url)
+      assert_raise(MultiXml::ParseError) { patron.loans }
+      assert_raise(MultiXml::ParseError) { patron.renew_loans() }
+      assert_raise(MultiXml::ParseError) { patron.renew_loans(@aleph_renew_item_id) }
+      assert_raise(RuntimeError) { patron.place_hold(@aleph_adm_library, @aleph_doc_library, @aleph_doc_number, @aleph_item_id, {:pickup_location => @pickup_location}) }
+    end
+  
+    # Test search for a single Primo document.
+    def test_patron
+      patron = Exlibris::Aleph::Patron.new(@nyuidn, @rest_url)
+      loans = patron.loans
+      assert_nil(patron.error, "Failure in #{patron.class} while getting loans: #{patron.error}")
+      #renew_loans = patron.renew_loans()
+      #assert_nil(patron.error, "Failure in #{patron.class} while renewing all loans: #{patron.error}")
+      #renew_loans = patron.renew_loans(@aleph_renew_item_id)
+      #assert_nil(patron.error, "Failure in #{patron.class} while renewing loan #{@aleph_renew_item_id}: #{patron.error}")
+      assert_raise(RuntimeError) { patron.place_hold(@aleph_adm_library, @aleph_doc_library, @aleph_doc_number, @aleph_item_id, {}) }
+      place_hold = patron.place_hold(@aleph_adm_library, @aleph_doc_library, @aleph_doc_number, @aleph_item_id, {:pickup_location => @pickup_location})
+      assert_nil(patron.error, "Failure in #{patron.class} while placing hold: #{patron.error}")
+    end
+    
   end
 end

data/test/unit/aleph_record_benchmarks.rb

@@ -1,28 +1,32 @@
 require File.dirname(__FILE__) + '/../test_helper'
-class AlephRecordBenchMarks < Test::Unit::TestCase
-  def setup
-    @primo_config = YAML.load_file("#{Rails.root}/config/umlaut_config/primo.yml")
-    @nyu_aleph_config = @primo_config["sources"]["nyu_aleph"]
-    @rest_url = @nyu_aleph_config["rest_url"]
-    @aleph_doc_library = "NYU01"
-    @aleph_doc_number = "000062856"
-    @bogus_url = "http://library.nyu.edu/bogus"
-    @TESTS = 10
-  end
-
-  # Get benchmarks for calls to the Aleph API.
-  def test_benchmarks
-    # Display performance benchmarks.
-    time = Benchmark.bmbm do |results|
-      results.report("Aleph items:") { @TESTS.times { 
-        aleph_record = Exlibris::Aleph::Record.new(@aleph_doc_library, @aleph_doc_number, @rest_url)
-        items = aleph_record.items 
-      } }    
-      results.report("Aleph bib and holdings:") { @TESTS.times { 
-        aleph_record = Exlibris::Aleph::Record.new(@aleph_doc_library, @aleph_doc_number, @rest_url)
-        items = aleph_record.bib 
-        items = aleph_record.holdings 
-      } }    
+class AlephRecordBenchMarks < Test::Unit::TestCase    
+  nyu_only_tests(self.name) do
+    
+    def setup
+      @primo_config = YAML.load_file("#{Rails.root}/config/primo.yml")
+      @nyu_aleph_config = @primo_config["sources"]["nyu_aleph"]
+      @rest_url = @nyu_aleph_config["rest_url"]
+      @aleph_doc_library = "NYU01"
+      @aleph_doc_number = "000062856"
+      @bogus_url = "http://library.nyu.edu/bogus"
+      @TESTS = 10
+    end
+  
+    # Get benchmarks for calls to the Aleph API.
+    def test_benchmarks
+      # Display performance benchmarks.
+      time = Benchmark.bmbm do |results|
+        results.report("Aleph items:") { @TESTS.times { 
+          aleph_record = Exlibris::Aleph::Record.new(@aleph_doc_library, @aleph_doc_number, @rest_url)
+          items = aleph_record.items 
+        } }    
+        results.report("Aleph bib and holdings:") { @TESTS.times { 
+          aleph_record = Exlibris::Aleph::Record.new(@aleph_doc_library, @aleph_doc_number, @rest_url)
+          items = aleph_record.bib 
+          items = aleph_record.holdings 
+        } }    
+      end
     end
+    
   end
 end

data/test/unit/aleph_record_test.rb

@@ -1,30 +1,35 @@
 require 'test_helper'
 class AlephRecordTest < Test::Unit::TestCase
-  def setup
-    @primo_config = YAML.load_file("#{Rails.root}/config/primo.yml")
-    @nyu_aleph_config = @primo_config["sources"]["nyu_aleph"]
-    @rest_url = @nyu_aleph_config["rest_url"]
-    @aleph_doc_library = "NYU01"
-    @aleph_doc_number = "000062856"
-    @bogus_url = "http://library.nyu.edu/bogus"
-  end
-
-  # Test exception handling for bogus response.
-  def test_bogus_response
-    aleph_record = Exlibris::Aleph::Record.new(@aleph_doc_library, @aleph_doc_number, @bogus_url)
-    assert_raise(RuntimeError) { aleph_record.bib }
-    assert_raise(RuntimeError) { aleph_record.holdings }
-    assert_raise(MultiXml::ParseError) { aleph_record.items }
-  end
-
-  # Test search for a single Primo document.
-  def test_record
-    aleph_record = Exlibris::Aleph::Record.new(@aleph_doc_library, @aleph_doc_number, @rest_url)
-    bib = aleph_record.bib
-    assert_nil(aleph_record.error, "Failure in #{aleph_record.class} while calling bib: #{aleph_record.error}")
-    holdings = aleph_record.holdings
-    assert_nil(aleph_record.error, "Failure in #{aleph_record.class} while calling holdings: #{aleph_record.error}")
-    items = aleph_record.items
-    assert_nil(aleph_record.error, "Failure in #{aleph_record.class} while calling items: #{aleph_record.error}")
+  
+  nyu_only_tests(self.name) do
+    
+    def setup
+      @primo_config = YAML.load_file("#{Rails.root}/config/primo.yml")
+      @nyu_aleph_config = @primo_config["sources"]["nyu_aleph"]
+      @rest_url = @nyu_aleph_config["rest_url"]
+      @aleph_doc_library = "NYU01"
+      @aleph_doc_number = "000062856"
+      @bogus_url = "http://library.nyu.edu/bogus"
+    end
+  
+    
+    # Test exception handling for bogus response.
+    def test_bogus_response
+      aleph_record = Exlibris::Aleph::Record.new(@aleph_doc_library, @aleph_doc_number, @bogus_url)
+      assert_raise(RuntimeError) { aleph_record.bib }
+      assert_raise(RuntimeError) { aleph_record.holdings }
+      assert_raise(MultiXml::ParseError) { aleph_record.items }
+    end
+  
+    # Test search for a single Primo document.
+    def test_record
+      aleph_record = Exlibris::Aleph::Record.new(@aleph_doc_library, @aleph_doc_number, @rest_url)
+      bib = aleph_record.bib
+      assert_nil(aleph_record.error, "Failure in #{aleph_record.class} while calling bib: #{aleph_record.error}")
+      holdings = aleph_record.holdings
+      assert_nil(aleph_record.error, "Failure in #{aleph_record.class} while calling holdings: #{aleph_record.error}")
+      items = aleph_record.items
+      assert_nil(aleph_record.error, "Failure in #{aleph_record.class} while calling items: #{aleph_record.error}")
+    end
   end
 end

data/test/unit/collection_test.rb

@@ -2,30 +2,29 @@ require File.dirname(__FILE__) + '/../test_helper'
 
 class CollectionTest < ActiveSupport::TestCase
     fixtures :requests, :referents, :referent_values, :sfx_urls
-
-    def setup      
-      # Make something that looks like a session hash type thing, so we
-      # can init a collection with it. 
-      @fake_session = Hash.new
-      class << @fake_session
-         def session_id ; "000001" ; end
-      end
-    end
-
      
+    def setup
+      # will get from ./config/services.yml. You want to test a different
+      # set of services? Have to set em in ServiceStore too, as in general
+      # things passed to new Collection are expected to be in ServiceStore
+      @services = ServiceStore.config["default"]["services"]
+      @request = requests(:simple_request)
+    end
+    
     def test_collection_instantiate
-      collection = Collection.new(requests(:simple_request) , @fake_session)
+      collection = Collection.new(@request , @services)
 
       new_services = collection.instantiate_services!
+
       assert_not_nil new_services
-      assert new_services.length > 0
+      assert new_services.length > 0, "no services returned"
       new_services.each do |s|
         assert_kind_of Service, s
       end
     end
 
     def test_instantiate_creates_new
-      collection = Collection.new(requests(:simple_request) , @fake_session)
+      collection = Collection.new(@request , @services)
       
       s1 = collection.instantiate_services!
       s2 = collection.instantiate_services!
@@ -35,7 +34,7 @@ class CollectionTest < ActiveSupport::TestCase
     end
 
     def test_service_level
-      collection = Collection.new(requests(:simple_request) , @fake_session)
+      collection = Collection.new(@request , @services)
 
       services = collection.instantiate_services!(:level => 'c')
       
@@ -43,7 +42,7 @@ class CollectionTest < ActiveSupport::TestCase
     end
 
     def test_requests_set
-      collection = Collection.new(requests(:simple_request) , @fake_session)
+      collection = Collection.new(@request , @services)
 
       services = collection.instantiate_services!(:level => 'c')
 
@@ -53,16 +52,16 @@ class CollectionTest < ActiveSupport::TestCase
     end
 
     def test_get_single_service
-      collection = Collection.new(requests(:simple_request) , @fake_session)
+      collection = Collection.new(@request , @services)
 
-      service = collection.instantiate_service!("UlrichsCover")
+      service = collection.instantiate_services!(:ids => ["UlrichsCover"]).first
 
       assert_not_nil service, "Service for UlrichsCover not returned"
       assert_not_nil service.request, "Service for UlrichsCover does not have request set."      
     end
 
     def test_get_nonexisting_task
-      collection = Collection.new(requests(:simple_request) , @fake_session)
+      collection = Collection.new(@request , @services)
 
       null_services = collection.instantiate_services!(:task => :no_such_task)
 

data/test/unit/google_book_search_test.rb

@@ -14,54 +14,23 @@ require 'rubygems'
 
 require 'yaml'
 
-class GoogleBookSearchTest < Test::Unit::TestCase
+class GoogleBookSearchTest < ActiveSupport::TestCase  
+  fixtures :requests, :referents
   
-  
-  
-  def setup
-    
-    
-    @gbs_default = ServiceList.instance.instantiate!("GoogleBookSearch", nil)
-    @gbs_minimum = GoogleBookSearch.new({"priority"=>1})
+  def setup    
+    @gbs_default = ServiceStore.instantiate_service!("GoogleBookSearch", nil)
     
-    # Bunch of responses in the proper format somtimes followed by the hash that
-    # will result. The values here are not necessarily true/real.
-    # For instance the preview value is likely faked to test methods
-    # Only those currently used are uncommented.
-    @response_one = 'gbscallback({"ISBN:030905382X":{"bib_key":"ISBN:030905382X","info_url":"http://books.google.com/books?id=XiiYq5U1qEUC\x26source=gbs_ViewAPI","preview_url":"http://books.google.com/books?id=XiiYq5U1qEUC\x26printsec=frontcover\x26sig=9-7ypznOwL_rECoKJLizCBpodds\x26source=gbs_ViewAPI","thumbnail_url":"http://bks7.books.google.com/books?id=XiiYq5U1qEUC\x26pg=PP1\x26img=1\x26zoom=5\x26sig=2XmDi4HEhbqply9YjIsuopFQLAk","preview":"noview"}});'
-    #@one_full_view = 'gbscallback({"ISBN:1582183392":{"bib_key":"ISBN:1582183392","info_url":"http://books.google.com/books?id=bFGPoGrAXbwC\x26source=gbs_ViewAPI","preview_url":"http://books.google.com/books?id=bFGPoGrAXbwC\x26printsec=frontcover\x26sig=kYnPnuSmFdbm5rJfxNUN0_Qa3Zk\x26source=gbs_ViewAPI","thumbnail_url":"http://bks8.books.google.com/books?id=bFGPoGrAXbwC\x26pg=PP1\x26img=1\x26zoom=5\x26sig=bBu6nZ_q8k5uKZ43RrdBOElOCiA","preview":"full"}});'
-    #@one_partial_view = 'gbscallback({"ISBN:9780618680009":{"bib_key":"ISBN:9780618680009","info_url":"http://books.google.com/books?id=yq1xDpicghkC\x26source=gbs_ViewAPI","preview_url":"http://books.google.com/books?id=yq1xDpicghkC\x26printsec=frontcover\x26sig=wuZrXklCy_Duenlw3Ea0MTgIhYQ\x26source=gbs_ViewAPI","thumbnail_url":"http://bks8.books.google.com/books?id=yq1xDpicghkC\x26pg=PP1\x26img=1\x26zoom=5\x26sig=3sezA1j1-qzTTtI5E8PTdHJDkHw","preview":"partial"}});'
-    @response_three_duplicate_no_view = 'gbscallback({"ISBN:0393044548":{"bib_key":"ISBN:0393044548","info_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","preview_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","thumbnail_url":"http://bks3.books.google.com/books?id=E4R9AQAACAAJ\x26printsec=frontcover\x26img=1\x26zoom=5\x26sig=32ieZbDQYbQAeCNfW-vek8SfOxc","preview":"noview"},"OCLC:2985768":{"bib_key":"OCLC:2985768","info_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","preview_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","thumbnail_url":"http://bks4.books.google.com/books?id=E4R9AQAACAAJ\x26printsec=frontcover\x26img=1\x26zoom=5\x26sig=Z98qalA95yde4XY6VO-1ZF0tKlE","preview":"noview"},"LCCN:76030648":{"bib_key":"LCCN:76030648","info_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","preview_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","thumbnail_url":"http://bks5.books.google.com/books?id=E4R9AQAACAAJ\x26printsec=frontcover\x26img=1\x26zoom=5\x26sig=_qfxqS7dLZ7Oi48sFIBssQUbd4E","preview":"noview"}});'
-    @a_three_duplicate_no_view = [{
-        "info_url"=>
-          "http://books.google.com/books?id=E4R9AQAACAAJ&source=gbs_ViewAPI",
-        "preview_url"=>
-          "http://books.google.com/books?id=E4R9AQAACAAJ&source=gbs_ViewAPI",
-        "preview"=>"noview",
-        "bib_key"=>"ISBN:0393044548, OCLC:2985768, LCCN:76030648",
-        "thumbnail_url"=>
-          "http://bks3.books.google.com/books?id=E4R9AQAACAAJ&printsec=frontcover&img=1&zoom=5&sig=32ieZbDQYbQAeCNfW-vek8SfOxc"
-      }]
-   
+    @data_frankenstein = 
+      {"totalItems"=>1, "kind"=>"books#volumes", "items"=>[{"accessInfo"=>{"embeddable"=>true, "webReaderLink"=>"http://books.google.com/books/reader?id=QKgVAAAAYAAJ&as_pt=BOOKS&printsec=frontcover&output=reader&source=gbs_api", "epub"=>{"isAvailable"=>true, "downloadLink"=>"http://books.google.com/books/download/Frankenstein.epub?id=QKgVAAAAYAAJ&output=epub&source=gbs_api"}, "viewability"=>"ALL_PAGES", "publicDomain"=>true, "country"=>"US", "pdf"=>{"isAvailable"=>true, "downloadLink"=>"http://books.google.com/books/download/Frankenstein.pdf?id=QKgVAAAAYAAJ&output=pdf&sig=ACfU3U3nhOFhUroWh_b-nMaAulaAV6kjlw&source=gbs_api"}, "textToSpeechPermission"=>"ALLOWED", "accessViewStatus"=>"FULL_PUBLIC_DOMAIN"}, "searchInfo"=>{"textSnippet"=>"FRANKENSTEIN or The Modern Prometheus CHAPTER I. I Am by birth a Genevese; and <br>  my family is one of the most distinguished of that republic. My ancestors had <br>  been for many years counselors and syndics; and my father had filled several <b>...</b>"}, "etag"=>"TUqYf+e+c9k", "kind"=>"books#volume", "volumeInfo"=>{"infoLink"=>"http://books.google.com/books?id=QKgVAAAAYAAJ&dq=OCLC2364071&as_pt=BOOKS&source=gbs_api", "contentVersion"=>"0.0.1.0.full.3", "categories"=>["Fiction"], "title"=>"Frankenstein", "printType"=>"BOOK", "ratingsCount"=>279, "subtitle"=>"or, the Modern Prometheus", "previewLink"=>"http://books.google.com/books?id=QKgVAAAAYAAJ&printsec=frontcover&dq=OCLC2364071&as_pt=BOOKS&cd=1&source=gbs_api", "imageLinks"=>{"smallThumbnail"=>"http://bks6.books.google.com/books?id=QKgVAAAAYAAJ&printsec=frontcover&img=1&zoom=5&edge=curl&source=gbs_api", "thumbnail"=>"http://bks6.books.google.com/books?id=QKgVAAAAYAAJ&printsec=frontcover&img=1&zoom=1&edge=curl&source=gbs_api"}, "pageCount"=>332, "language"=>"en", "canonicalVolumeLink"=>"http://books.google.com/books/about/Frankenstein.html?id=QKgVAAAAYAAJ", "averageRating"=>4.0, "authors"=>["Mary Wollstonecraft Shelley"], "industryIdentifiers"=>[{"type"=>"OTHER", "identifier"=>"PRNC:32101064790353"}], "publishedDate"=>"1922"}, "saleInfo"=>{"isEbook"=>true, "saleability"=>"FREE", "country"=>"US"}, "id"=>"QKgVAAAAYAAJ", "selfLink"=>"https://www.googleapis.com/books/v1/volumes/QKgVAAAAYAAJ"}]}      
     
-    @data_frankenstein = Hpricot.XML("<?xml version=\"1.0\" encoding=\"UTF-8\"?><feed xmlns:gd=\"http://schemas.google.com/g/2005\" xmlns:dc=\"http://purl.org/dc/terms\" xmlns:gbs=\"http://schemas.google.com/books/2008\" xmlns:openSearch=\"http://a9.com/-/spec/opensearchrss/1.0/\" xmlns=\"http://www.w3.org/2005/Atom\"><id>http://www.google.com/books/feeds/volumes</id><updated>2009-04-29T22:02:42.000Z</updated><category term=\"http://schemas.google.com/books/2008#volume\" scheme=\"http://schemas.google.com/g/2005#kind\"></category><title type=\"text\">Search results for ISBN9780393964585 OR OCLC33045872</title><link href=\"http://www.google.com\" rel=\"alternate\" type=\"text/html\" /><link href=\"http://www.google.com/books/feeds/volumes\" rel=\"http://schemas.google.com/g/2005#feed\" type=\"application/atom+xml\" /><link href=\"http://www.google.com/books/feeds/volumes?q=ISBN9780393964585+OR+OCLC33045872\" rel=\"self\" type=\"application/atom+xml\" /><author><name>Google Books Search</name><uri>http://www.google.com</uri></author><generator version=\"beta\">Google Book Search data API</generator><openSearch:totalResults>1</openSearch:totalResults><openSearch:startIndex>1</openSearch:startIndex><openSearch:itemsPerPage>20</openSearch:itemsPerPage><entry><id>http://www.google.com/books/feeds/volumes/92EbHgAACAAJ</id><updated>2009-04-29T22:02:42.000Z</updated><category term=\"http://schemas.google.com/books/2008#volume\" scheme=\"http://schemas.google.com/g/2005#kind\"></category><title type=\"text\">Frankenstein</title><link href=\"http://bks5.books.google.com/books?id=92EbHgAACAAJ&amp;printsec=frontcover&amp;img=1&amp;zoom=5&amp;sig=ACfU3U10W3ycsrdiB-udzUYGnYtkVIp5tQ&amp;source=gbs_gdata\" rel=\"http://schemas.google.com/books/2008/thumbnail\" type=\"image/x-unknown\" /><link href=\"http://books.google.com/books?id=92EbHgAACAAJ&amp;dq=ISBN9780393964585+OR+OCLC33045872&amp;ie=ISO-8859-1&amp;source=gbs_gdata\" rel=\"http://schemas.google.com/books/2008/info\" type=\"text/html\" /><link href=\"http://books.google.com/books?id=92EbHgAACAAJ&amp;dq=ISBN9780393964585+OR+OCLC33045872&amp;ie=ISO-8859-1&amp;source=gbs_gdata\" rel=\"http://schemas.google.com/books/2008/preview\" type=\"text/html\" /><link href=\"http://www.google.com/books/feeds/users/me/volumes\" rel=\"http://schemas.google.com/books/2008/annotation\" type=\"application/atom+xml\" /><link href=\"http://books.google.com/books?id=92EbHgAACAAJ&amp;dq=ISBN9780393964585+OR+OCLC33045872&amp;ie=ISO-8859-1\" rel=\"alternate\" type=\"text/html\" /><link href=\"http://www.google.com/books/feeds/volumes/92EbHgAACAAJ\" rel=\"self\" type=\"application/atom+xml\" /><gbs:embeddability value=\"http://schemas.google.com/books/2008#not_embeddable\"></gbs:embeddability><gbs:openAccess value=\"http://schemas.google.com/books/2008#disabled\"></gbs:openAccess><gbs:viewability value=\"http://schemas.google.com/books/2008#view_no_pages\"></gbs:viewability><dc:creator>Mary Wollstonecraft Shelley</dc:creator><dc:creator>J. Paul Hunter</dc:creator><dc:date>1996-02-23</dc:date><dc:description>... ISBN9780393964585 9780393964585 LCCN95037928 OXFORD503855446 \r\nBIBoxford_UkOxUb11900853 BIBloc_95037928 OCLC78250571 OCLC33045872 ...</dc:description><dc:format>339 pages</dc:format><dc:identifier>92EbHgAACAAJ</dc:identifier><dc:identifier>ISBN:0393964582</dc:identifier><dc:identifier>ISBN:9780393964585</dc:identifier><dc:publisher>W. W. Norton &amp; Company</dc:publisher><dc:subject>Juvenile Fiction</dc:subject><dc:title>Frankenstein</dc:title><dc:title>The 1818 Text, Contexts, Nineteenth-century Responses, Modern Criticism</dc:title></entry></feed>")
-    
-    #@one_fake_full_fake_partial = 'gbscallback({"ISBN:0393044548":{"bib_key":"ISBN:0393044548","info_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","preview_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","thumbnail_url":"http://bks3.books.google.com/books?id=E4R9AQAACAAJ\x26printsec=frontcover\x26img=1\x26zoom=5\x26sig=32ieZbDQYbQAeCNfW-vek8SfOxc","preview":"full"},"OCLC:2985768":{"bib_key":"OCLC:2985768","info_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","preview_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","thumbnail_url":"http://bks4.books.google.com/books?id=E4R9AQAACAAJ\x26printsec=frontcover\x26img=1\x26zoom=5\x26sig=Z98qalA95yde4XY6VO-1ZF0tKlE","preview":"noview"},"LCCN:76030648":{"bib_key":"LCCN:76030648","info_url":"http://books.google.com/books?id=E4R9AQAACAAJx\x26source=gbs_ViewAPI","preview_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","thumbnail_url":"http://bks5.books.google.com/books?id=E4R9AQAACAAJ\x26printsec=frontcover\x26img=1\x26zoom=5\x26sig=_qfxqS7dLZ7Oi48sFIBssQUbd4E","preview":"partial"}});'
-    #@two_fake_full = 'gbscallback({"ISBN:0393044548":{"bib_key":"ISBN:0393044548","info_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","preview_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","thumbnail_url":"http://bks3.books.google.com/books?id=E4R9AQAACAAJ\x26printsec=frontcover\x26img=1\x26zoom=5\x26sig=32ieZbDQYbQAeCNfW-vek8SfOxc","preview":"full"},"OCLC:2985768":{"bib_key":"OCLC:2985768","info_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","preview_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","thumbnail_url":"http://bks4.books.google.com/books?id=E4R9AQAACAAJ\x26printsec=frontcover\x26img=1\x26zoom=5\x26sig=Z98qalA95yde4XY6VO-1ZF0tKlE","preview":"noview"},"LCCN:76030648":{"bib_key":"LCCN:76030648","info_url":"http://books.google.com/books?id=E4R9AQAACAAJx\x26source=gbs_ViewAPI","preview_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","thumbnail_url":"http://bks5.books.google.com/books?id=E4R9AQAACAAJ\x26printsec=frontcover\x26img=1\x26zoom=5\x26sig=_qfxqS7dLZ7Oi48sFIBssQUbd4E","preview":"full"}});'
-    #@one_fake_full_one_fake_noview = 'gbscallback({"ISBN:0393044548":{"bib_key":"ISBN:0393044548","info_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","preview_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","thumbnail_url":"http://bks3.books.google.com/books?id=E4R9AQAACAAJ\x26printsec=frontcover\x26img=1\x26zoom=5\x26sig=32ieZbDQYbQAeCNfW-vek8SfOxc","preview":"full"},"OCLC:2985768":{"bib_key":"OCLC:2985768","info_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","preview_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","thumbnail_url":"http://bks4.books.google.com/books?id=E4R9AQAACAAJ\x26printsec=frontcover\x26img=1\x26zoom=5\x26sig=Z98qalA95yde4XY6VO-1ZF0tKlE","preview":"noview"},"LCCN:76030648":{"bib_key":"LCCN:76030648","info_url":"http://books.google.com/books?id=E4R9AQAACAAJx\x26source=gbs_ViewAPI","preview_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","thumbnail_url":"http://bks5.books.google.com/books?id=E4R9AQAACAAJ\x26printsec=frontcover\x26img=1\x26zoom=5\x26sig=_qfxqS7dLZ7Oi48sFIBssQUbd4E","preview":"noview"}});'
-    #@one_fake_partial_one_fake_noview = 'gbscallback({"ISBN:0393044548":{"bib_key":"ISBN:0393044548","info_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","preview_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","thumbnail_url":"http://bks3.books.google.com/books?id=E4R9AQAACAAJ\x26printsec=frontcover\x26img=1\x26zoom=5\x26sig=32ieZbDQYbQAeCNfW-vek8SfOxc","preview":"partial"},"OCLC:2985768":{"bib_key":"OCLC:2985768","info_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","preview_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","thumbnail_url":"http://bks4.books.google.com/books?id=E4R9AQAACAAJ\x26printsec=frontcover\x26img=1\x26zoom=5\x26sig=Z98qalA95yde4XY6VO-1ZF0tKlE","preview":"noview"},"LCCN:76030648":{"bib_key":"LCCN:76030648","info_url":"http://books.google.com/books?id=E4R9AQAACAAJx\x26source=gbs_ViewAPI","preview_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","thumbnail_url":"http://bks5.books.google.com/books?id=E4R9AQAACAAJ\x26printsec=frontcover\x26img=1\x26zoom=5\x26sig=_qfxqS7dLZ7Oi48sFIBssQUbd4E","preview":"noview"}});'
-    #@two_no_view_one_fake_partial = 'gbscallback({"ISBN:0393044548":{"bib_key":"ISBN:0393044548","info_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","preview_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","thumbnail_url":"http://bks3.books.google.com/books?id=E4R9AQAACAAJ\x26printsec=frontcover\x26img=1\x26zoom=5\x26sig=32ieZbDQYbQAeCNfW-vek8SfOxc","preview":"noview"},"OCLC:2985768":{"bib_key":"OCLC:2985768","info_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","preview_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","thumbnail_url":"http://bks4.books.google.com/books?id=E4R9AQAACAAJ\x26printsec=frontcover\x26img=1\x26zoom=5\x26sig=Z98qalA95yde4XY6VO-1ZF0tKlE","preview":"noview"},"LCCN:76030648":{"bib_key":"LCCN:76030648","info_url":"http://books.google.com/books?id=E4R9AQAACAAJx\x26source=gbs_ViewAPI","preview_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","thumbnail_url":"http://bks5.books.google.com/books?id=E4R9AQAACAAJ\x26printsec=frontcover\x26img=1\x26zoom=5\x26sig=_qfxqS7dLZ7Oi48sFIBssQUbd4E","preview":"partial"}});'
-    #@two_full_one_fake_partial = 'gbscallback({"ISBN:0393044548":{"bib_key":"ISBN:0393044548","info_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","preview_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","thumbnail_url":"http://bks3.books.google.com/books?id=E4R9AQAACAAJ\x26printsec=frontcover\x26img=1\x26zoom=5\x26sig=32ieZbDQYbQAeCNfW-vek8SfOxc","preview":"full"},"OCLC:2985768":{"bib_key":"OCLC:2985768","info_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","preview_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","thumbnail_url":"http://bks4.books.google.com/books?id=E4R9AQAACAAJ\x26printsec=frontcover\x26img=1\x26zoom=5\x26sig=Z98qalA95yde4XY6VO-1ZF0tKlE","preview":"full"},"LCCN:76030648":{"bib_key":"LCCN:76030648","info_url":"http://books.google.com/books?id=E4R9AQAACAAJx\x26source=gbs_ViewAPI","preview_url":"http://books.google.com/books?id=E4R9AQAACAAJ\x26source=gbs_ViewAPI","thumbnail_url":"http://bks5.books.google.com/books?id=E4R9AQAACAAJ\x26printsec=frontcover\x26img=1\x26zoom=5\x26sig=_qfxqS7dLZ7Oi48sFIBssQUbd4E","preview":"partial"}});'
-    #@one_partial_view = 'gbscallback({"ISBN:030905382X":{"bib_key":"ISBN:030905382X","info_url":"http://books.google.com/books?id=XiiYq5U1qEUC\x26source=gbs_ViewAPI","preview_url":"http://books.google.com/books?id=XiiYq5U1qEUC\x26printsec=frontcover\x26sig=9-7ypznOwL_rECoKJLizCBpodds\x26source=gbs_ViewAPI","thumbnail_url":"http://bks7.books.google.com/books?id=XiiYq5U1qEUC\x26pg=PP1\x26img=1\x26zoom=5\x26sig=2XmDi4HEhbqply9YjIsuopFQLAk","preview":"partial"}});'
-    #@one_fake_noview = 'gbscallback({"ISBN:030905382X":{"bib_key":"ISBN:030905382X","info_url":"http://books.google.com/books?id=XiiYq5U1qEUC\x26source=gbs_ViewAPI","preview_url":"http://books.google.com/books?id=XiiYq5U1qEUC\x26printsec=frontcover\x26sig=9-7ypznOwL_rECoKJLizCBpodds\x26source=gbs_ViewAPI","thumbnail_url":"http://bks7.books.google.com/books?id=XiiYq5U1qEUC\x26pg=PP1\x26img=1\x26zoom=5\x26sig=2XmDi4HEhbqply9YjIsuopFQLAk","preview":"noview"}});'
   end
   
 
   
   def test_initialize_minimum
     gbs = GoogleBookSearch.new({"priority"=>1})
-    assert_equal(1, gbs.priority)
-    assert_equal('Google Book Search', gbs.display_name)
+    assert_equal(1, gbs.priority)    
+    assert_equal('Google Books', gbs.display_name)
     assert_equal(1, gbs.num_full_views)
     assert_equal(1, gbs.priority)
     assert_equal('standard', gbs.task)
@@ -70,7 +39,7 @@ class GoogleBookSearchTest < Test::Unit::TestCase
   def test_get_bibkeys
     f = referents(:frankenstein)
     keys = @gbs_default.get_bibkeys(f)
-    expected = CGI.escape('ISBN9780393964585 OR OCLC33045872')
+    expected = CGI.escape('isbn:9780393964585 OR "OCLC33045872"')
     assert_equal(expected, keys)
   end
 
@@ -79,17 +48,22 @@ class GoogleBookSearchTest < Test::Unit::TestCase
   # something back. The server for the thumbnail changes, so we can't do a 
   # simple match and a huge regexp was making my head hurt.
   def test_do_query
-    hpricot_response = @gbs_default.do_query('OCLC02364071', requests(:frankenstein))
+    hashified_response = @gbs_default.do_query('OCLC2364071', requests(:frankenstein))
+
+    assert_not_nil hashified_response
+    
+    assert_not_nil hashified_response["totalItems"]
     
-    assert hpricot_response.at("dc:identifier")
+    assert_operator hashified_response["totalItems"], :>, 0 
   end
 
   
-  def test_create_fulltext_service_response_nil
+  def test_create_fulltext_service_response
+    # frankenstein's got fulltext now. 
     request = requests(:frankenstein)
     fulltext_shown = @gbs_default.create_fulltext_service_response(request, 
       @data_frankenstein)
-    assert_nil(fulltext_shown)
+    assert(true, fulltext_shown)
   end
 
   def test_find_thumbnail_url