oddb2xml 2.5.0 → 2.5.1

data/spec/builder_spec.rb

@@ -2,6 +2,7 @@
 
 require 'spec_helper'
 require "rexml/document"
+require 'webmock/rspec'
 include REXML
 RUN_ALL = true
 
@@ -28,7 +29,7 @@ ARTICLE_MISSING_ELEMENTS =    [
 
 ARTICLE_ZURROSE_ELEMENTS =    [
   ['ARTICLE/ART/REF_DATA', '0'],
-  ['ARTICLE/ART/ARTCOMP/COMPNO', '7601001000858'],
+  ['ARTICLE/ART/ARTCOMP/COMPNO', '7601001000896'],
   ['ARTICLE/ART/ARTPRI/PTYP', 'PEXF'],
   ['ARTICLE/ART/ARTPRI/PTYP', 'PPUB'],
   ['ARTICLE/ART/ARTPRI/PTYP', 'ZURROSE'],
@@ -37,6 +38,28 @@ ARTICLE_ZURROSE_ELEMENTS =    [
   ['ARTICLE/ART/ARTINS/NINCD', '20'],
 ]
 
+ARTICLE_NAROPIN = %(<REF_DATA>1</REF_DATA>
+    <PHAR>1882189</PHAR>
+    <SMCAT>B</SMCAT>
+    <SMNO>54015011</SMNO>
+    <PRODNO>5401501</PRODNO>
+    <SALECD>I</SALECD>
+    <CDBG>N</CDBG>
+    <BG>N</BG>
+    <DSCRD>NAROPIN Inj Lös 0.2 % 10ml Duofit Amp 5 Stk</DSCRD>
+    <DSCRF>NAROPIN sol inj 0.2 % 10ml amp duofit 5 pce</DSCRF>
+    <SORTD>NAROPIN INJ LÖS 0.2 % 10ML DUOFIT AMP 5 STK</SORTD>
+    <SORTF>NAROPIN SOL INJ 0.2 % 10ML AMP DUOFIT 5 PCE</SORTF>
+    <ARTCOMP>
+      <COMPNO>7601001402539</COMPNO>
+    </ARTCOMP>
+    <ARTBAR>
+      <CDTYP>E13</CDTYP>
+      <BC>7680540150118</BC>
+      <BCSTAT>A</BCSTAT>
+    </ARTBAR>
+  </ART>)
+  
 ARTICLE_COMMON_ELEMENTS =    [
   ['ARTICLE/ART/REF_DATA', '1'],
   ['ARTICLE/ART/SMCAT', 'A'],
@@ -59,10 +82,6 @@ ARTICLE_COMMON_ELEMENTS =    [
   ['ARTICLE/ART/BG', 'N'],
   ['ARTICLE/ART/ARTBAR/BC', Oddb2xml::ORPHAN_GTIN.to_s],
   ['ARTICLE/ART/ARTBAR/BC', Oddb2xml::FRIDGE_GTIN.to_s],
-  ['ARTICLE/ART/DSCRD', 'NAROPIN Inj Lös 0.2 % 5 Polybag 100 ml'],
-  ['ARTICLE/ART/DSCRF', 'NAROPIN sol inj 0.2 % 5 polybag 100 ml'],
-  ['ARTICLE/ART/SORTD', 'NAROPIN INJ LÖS 0.2 % 5 POLYBAG 100 ML'],
-  ['ARTICLE/ART/SORTF', 'NAROPIN SOL INJ 0.2 % 5 POLYBAG 100 ML'],
   ['ARTICLE/ART/SYN1D', 'Hirudoid'],
   ['ARTICLE/ART/SYN1F', 'Hirudoid'],
   ['ARTICLE/ART/SLOPLUS', '2'],
@@ -226,12 +245,18 @@ MEDIZINALPERSON_ELEMENT_TESTS = [
   ['Personen/Person/BTM_Berechtigung', 'BTM_Berechtigung'],
 ]
 
-def check_result(rexml, nbr_record)
-  expect(XPath.match(rexml, '//RESULT/NBR_RECORD').size).to eq 1
-  expect(XPath.match(rexml, '//RESULT/NBR_RECORD').first.text.to_i).to eq nbr_record
-  expect(XPath.match(rexml, '//RESULT/OK_ERROR').first.text).to eq 'OK'
-  expect(XPath.match(rexml, '//RESULT/ERROR_CODE').first.text).to eq nil
-  expect(XPath.match(rexml, '//RESULT/MESSAGE').first.text).to eq nil
+def check_result(inhalt, nbr_record)
+  [ "<NBR_RECORD>",
+    "<OK_ERROR>",
+    '<OK_ERROR>OK</OK_ERROR>',
+    ].each do |what|
+    expect(inhalt.scan(what).size).to eq 1
+  end
+  expect(inhalt.index('<OK_ERROR>OK</OK_ERROR>')).to be > 0
+  expect(inhalt.index('<ERROR_CODE/>')).to be > 0
+  m = /<NBR_RECORD>(\d+)<\/NBR_RECORD>/.match(inhalt)
+  expect(m).not_to be nil
+  expect(m[1].to_i).to eq  nbr_record 
 end
 
 def checkItemForRefdata(doc, pharmacode, isRefdata)
@@ -292,27 +317,29 @@ def check_article_IGM_format(line, price_kendural=825, add_80_percents=false)
   return [found_SL, found_non_SL]
 end
 
+def validate_via_xsd(xsd_file, xml_file)
+  xsd =open(xsd_file).read
+  xsd_rtikelstamm_xml = Nokogiri::XML::Schema(xsd)
+  doc = Nokogiri::XML(File.read(xml_file))
+  xsd_rtikelstamm_xml.validate(doc).each do
+    |error|
+      if error.message
+        puts "Failed validating #{xml_file} with #{File.size(xml_file)} bytes using XSD from #{xsd_file}"
+        puts "CMD: xmllint --noout --schema #{xsd_file} #{xml_file}"
+      end
+      msg = "expected #{error.message} to be nil\nfor #{xml_file}"
+      puts msg
+      expect(error.message).to be_nil, msg
+  end
+end
+
 def check_validation_via_xsd
-  @oddb2xml_xsd = File.expand_path(File.join(File.dirname(__FILE__), '..', 'oddb2xml.xsd'))
-  @oddb_calc_xsd = File.expand_path(File.join(File.dirname(__FILE__), '..', 'oddb_calc.xsd'))
-  expect(File.exists?(@oddb2xml_xsd)).to eq true
-  expect(File.exists?(@oddb_calc_xsd)).to eq true
   files = Dir.glob('*.xml')
-  xsd_oddb2xml = Nokogiri::XML::Schema(File.read(@oddb2xml_xsd))
-  xsd_oddb_calc = Nokogiri::XML::Schema(File.read(@oddb_calc_xsd))
   files.each{
     |file|
     next if /#{Time.now.year}/.match(file)
-    doc = Nokogiri::XML(File.read(file))
-    xsd2use = /oddb_calc/.match(file) ? xsd_oddb_calc : xsd_oddb2xml
-    xsd2use.validate(doc).each do
-      |error|
-        if error.message
-          puts "Failed validating #{file} with #{File.size(file)} bytes using XSD from #{@oddb2xml_xsd}"
-          puts "cmd would be: xsdvalidate #{@oddb2xml_xsd} #{file}"
-        end
-        expect(error.message).to be_nil, "expected #{error.message} to be nil\nfor #{file} content \n#{File.read(file)}"
-    end
+    xsd2use = /oddb_calc/.match(file) ? @oddb_calc_xsd : @oddb2xml_xsd
+    validate_via_xsd(xsd2use, File.expand_path(file))
   }
 end
 
@@ -352,7 +379,6 @@ end
 def checkAndGetProductWithGTIN(doc, gtin)
   products = XPath.match( doc, "//PRD[GTIN=#{gtin.to_s}]")
   gtins    = XPath.match( doc, "//PRD[GTIN=#{gtin.to_s}]/GTIN")
-  binding.pry unless gtins.size == 1
   expect(gtins.size).to eq 1
   expect(gtins.first.text).to eq gtin.to_s
   # return product
@@ -378,6 +404,7 @@ def checkArticleXml(checkERYTHROCIN = true)
 
   desitin = checkAndGetArticleWithGTIN(doc, Oddb2xml::LEVETIRACETAM_GTIN)
   expect(desitin).not_to eq nil
+  # TODO: why is this now nil? desitin.elements['ATC'].text.should == 'N03AX14'
   expect(desitin.elements['DSCRD'].text).to eq("LEVETIRACETAM DESITIN Mini Filmtab 250 mg 30 Stk")
   expect(desitin.elements['DSCRF'].text).to eq('LEVETIRACETAM DESITIN mini cpr pel 250 mg 30 pce')
   expect(desitin.elements['REF_DATA'].text).to eq('1')
@@ -405,6 +432,7 @@ def checkArticleXml(checkERYTHROCIN = true)
   expect(zyvoxid.elements['DSCRD'].text).to eq 'ZYVOXID Filmtabl 600 mg 10 Stk'
 
   expect(XPath.match( doc, "//LIMPTS" ).size).to be >= 1
+  # TODO: desitin.elements['QTY'].text.should eq '250 mg'
 end
 
 def checkProductXml(nbr_record = -1)
@@ -414,7 +442,7 @@ def checkProductXml(nbr_record = -1)
   # check products
   content = IO.read(product_filename)
   doc = REXML::Document.new content
-  check_result(doc, nbr_record)
+  check_result(content, nbr_record)
   expect(nbr_record).to eq  content.scan(/<PRD/).size if nbr_record != -1
 
   desitin = checkAndGetProductWithGTIN(doc, Oddb2xml::LEVETIRACETAM_GTIN)
@@ -427,9 +455,8 @@ def checkProductXml(nbr_record = -1)
   expect(desitin.elements['EinheitSwissmedic'].text).to eq 'Tablette(n)'
   expect(desitin.elements['SubstanceSwissmedic'].text).to eq 'levetiracetamum'
   expect(desitin.elements['CompositionSwissmedic'].text).to eq 'levetiracetamum 250 mg, excipiens pro compressi obducti pro charta.'
-
   expect(desitin.elements['CPT/CPTCMP/LINE'].text).to eq '0'
-  expect(desitin.elements['CPT/CPTCMP/SUBNO'].text).to eq '10'
+  expect(desitin.elements['CPT/CPTCMP/SUBNO'].text).to eq '14'
   expect(desitin.elements['CPT/CPTCMP/QTY'].text).to eq '250'
   expect(desitin.elements['CPT/CPTCMP/QTYU'].text).to eq 'mg'
 
@@ -441,31 +468,32 @@ def checkProductXml(nbr_record = -1)
     puts "checkProductXml has #{XPath.match( doc, "//GTIN" ).find_all{|x| true}.size} GTIN"
     puts "checkProductXml has #{XPath.match( doc, "//PRODNO" ).find_all{|x| true}.size} PRODNO"
   end
-  expect(XPath.match( doc, "//PRD" ).find_all{|x| true}.size).to eq(NrPackages)
-  expect(XPath.match( doc, "//GTIN" ).find_all{|x| true}.size).to eq(NrPackages)
-  expect(XPath.match( doc, "//PRODNO" ).find_all{|x| true}.size).to eq(NrProdno)
-
   hirudoid = checkAndGetProductWithGTIN(doc, Oddb2xml::HIRUDOID_GTIN)
   expect(hirudoid.elements['ATC'].text).to eq('C05BA01') # modified by atc.csv!
 end
 
 describe Oddb2xml::Builder do
-  NrExtendedArticles = 34
-  NrSubstances = 14
-  NrLimitations = 5
-  NrInteractions = 5
+  NrExtendedArticles = 67
+  NrSubstances = 25
+  NrLimitations = 12
+  
+  NrInteractions = 2
   NrCodes = 5
-  NrProdno = 23
-  NrPackages = 24
-  NrProducts = 19
+  NrProdno = 31
+  NrPackages = 38
+  NrProducts = 32
   RegExpDesitin = /1125819012LEVETIRACETAM DESITIN Mini Filmtab 250 mg 30 Stk/
   include ServerMockHelper
-  def common_run_init
+  def common_run_init(options = {})
     @savedDir = Dir.pwd
+    @oddb2xml_xsd = File.expand_path(File.join(File.dirname(__FILE__), '..', 'oddb2xml.xsd'))
+    @oddb_calc_xsd = File.expand_path(File.join(File.dirname(__FILE__), '..', 'oddb_calc.xsd'))
+    expect(File.exist?(@oddb2xml_xsd)).to eq true
+    expect(File.exist?(@oddb_calc_xsd)).to eq true
     cleanup_directories_before_run
     FileUtils.makedirs(Oddb2xml::WorkDir)
     Dir.chdir(Oddb2xml::WorkDir)
-    VCR.eject_cassette; VCR.insert_cassette('oddb2xml')
+    mock_downloads
   end
 
   after(:all) do
@@ -474,19 +502,18 @@ describe Oddb2xml::Builder do
   context 'when default options are given' do
     before(:all) do
       common_run_init
-      options = Oddb2xml::Options.new
-      # @res = buildr_capture(:stdout){ Oddb2xml::Cli.new(options.opts).run }
-      Oddb2xml::Cli.new(options.opts).run # to debug
+      Oddb2xml::Cli.new({}).run # to debug
       @doc = Nokogiri::XML(File.open(oddb_article_xml))
+      @inhalt = File.read(oddb_article_xml)
       @rexml = REXML::Document.new File.read(oddb_article_xml)
     end
 
-    it 'should return produce a oddb_article.xml' do
+    it 'should produce a oddb_article.xml' do
       expect(File.exists?(oddb_article_xml)).to eq true
     end
 
     it 'should have a correct NBR_RECORD in oddb_article.xml' do
-      check_result(@rexml, NrProducts)
+      check_result(@inhalt, NrProducts)
     end
 
     it 'oddb_article.xml should contain a SHA256' do
@@ -503,9 +530,12 @@ describe Oddb2xml::Builder do
       check_validation_via_xsd
     end
 
-    context 'XSD article' do
-      check_attributes(oddb_article_xml, ARTICLE_ATTRIBUTE_TESTS)
-      check_elements(oddb_article_xml, ARTICLE_COMMON_ELEMENTS)
+    check_attributes(oddb_article_xml, ARTICLE_ATTRIBUTE_TESTS)
+    check_elements(oddb_article_xml, ARTICLE_COMMON_ELEMENTS)
+    
+    it 'should validate XSD article' do
+      @inhalt = File.read(oddb_article_xml)
+      expect(File.read(oddb_article_xml).scan(ARTICLE_NAROPIN).size).to eq 1
     end
 
     context 'XSD betrieb' do
@@ -522,7 +552,7 @@ describe Oddb2xml::Builder do
 
     it 'should have a correct insulin (gentechnik) for 7680532900196' do
       expect(XPath.match( @rexml, "//ART/[BC='7680532900196']").size).to eq 1
-      expect(XPath.match( @rexml, "//ART//GEN_PRODUCTION").size).to eq 2
+      expect(XPath.match( @rexml, "//ART//GEN_PRODUCTION").size).to be >= 1
       expect(XPath.match( @rexml, "//ART//GEN_PRODUCTION").first.text).to eq 'X'
       expect(XPath.match( @rexml, "//ART//INSULIN_CATEGORY").size).to eq 1
       expect(XPath.match( @rexml, "//ART//INSULIN_CATEGORY").first.text).to eq 'Insulinanalog: schnell wirkend'
@@ -534,8 +564,10 @@ describe Oddb2xml::Builder do
       expect(XPath.match( doc, "//COOL='1']").size).to eq 1
     end
 
-    it 'should have a correct drug information for 7680555610041' do
-      expect(XPath.match( @rexml, "//ART/[BC='7680555610041']").size).to eq 1
+    ean_with_drug_index = 7680555610041
+    it "should have a correct drug information for #{ean_with_drug_index}" do
+      doc = REXML::Document.new IO.read(checkAndGetArticleXmlName)
+      expect(XPath.match( @rexml, "//ART/[BC='#{ean_with_drug_index}']").size).to eq 1
       expect(XPath.match( @rexml, "//ART//DRUG_INDEX").size).to eq 1
       expect(XPath.match( @rexml, "//ART//DRUG_INDEX").first.text).to eq 'd'
       found = false
@@ -556,20 +588,17 @@ describe Oddb2xml::Builder do
       common_run_init
       @oddb_fi_xml  = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_fi.xml'))
       @oddb_fi_product_xml  = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_fi_product.xml'))
-      options = Oddb2xml::Options.new
-      options.parser.parse!(['-o'])
-      # @res = buildr_capture(:stdout){ Oddb2xml::Cli.new(options.opts).run }
-      Oddb2xml::Cli.new(options.opts).run
+      options = Oddb2xml::Options.parse(['-o', '--log'])
+      # @res = buildr_capture(:stdout){ Oddb2xml::Cli.new(options).run }
+      Oddb2xml::Cli.new(options).run
     end
 
     it 'should have a correct NBR_RECORD in oddb_fi_product.xml' do
-      rexml = REXML::Document.new File.read('oddb_fi_product.xml')
-      check_result(rexml, 0)
+      check_result( File.read('oddb_fi_product.xml'), 0)
     end
 
     it 'should have a correct NBR_RECORD in oddb_fi.xml' do
-      rexml = REXML::Document.new File.read('oddb_fi.xml')
-      check_result(rexml, 2)
+      check_result( File.read('oddb_fi.xml'), 2)
     end
 
     it 'should return produce a correct oddb_fi.xml' do
@@ -580,12 +609,11 @@ describe Oddb2xml::Builder do
       m = /<paragraph><!\[CDATA\[(.+)\n(.*)/.match(inhalt.to_s)
       expect(m[1]).to eq '<?xml version="1.0" encoding="utf-8"?><div xmlns="http://www.w3.org/1999/xhtml">'
       expected = '<p class="s2"> </p>'
-      skip { expect(m[2]).to eq '<p class="s4" id="section1"><span class="s2"><span>Zyvoxid</span></span><sup class="s3"><span>®</span></sup></p>'  }
+      skip { m[2].should eq '<p class="s4" id="section1"><span class="s2"><span>Zyvoxid</span></span><sup class="s3"><span>®</span></sup></p>'  }
       expect(File.exists?(@oddb_fi_product_xml)).to eq true
       inhalt = IO.read(@oddb_fi_product_xml)
     end
 
-if RUN_ALL
     it 'should produce valid xml files' do
       skip "Niklaus does not know how to create a valid oddb_fi_product.xml"
       # check_validation_via_xsd
@@ -601,10 +629,9 @@ if RUN_ALL
   context 'when -f dat is given' do
     before(:all) do
       common_run_init
-      options = Oddb2xml::Options.new
-      options.parser.parse!('-f dat --log'.split(' '))
-      @res = buildr_capture(:stdout){ Oddb2xml::Cli.new(options.opts).run }
-      # Oddb2xml::Cli.new(options.opts).run # to debug
+      options = Oddb2xml::Options.parse('-f dat --log')
+      @res = buildr_capture(:stdout){ Oddb2xml::Cli.new(options).run }
+      # Oddb2xml::Cli.new(options).run # to debug
     end
 
     it 'should contain the correct values fo CMUT from transfer.dat' do
@@ -616,7 +643,7 @@ if RUN_ALL
       expect(oddb_dat).to match(/^..3/), "should have a record with '3' in CMUT field"
       expect(oddb_dat).to match(RegExpDesitin), "should have Desitin"
       IO.readlines(dat_filename).each{ |line| check_article_IGM_format(line, 0) }
-      m = /.+DIAPHIN Trocke.*7680555610041.+/.match(oddb_dat)
+      m = /.+KENDURAL Depottabl 30 Stk.*7680353660163.+/.match(oddb_dat)
       expect(m[0].size).to eq 97 # size of IGM 1 record
       expect(m[0][74]).to eq '3'
     end
@@ -625,10 +652,8 @@ if RUN_ALL
   context 'when --append -f dat is given' do
     before(:all) do
       common_run_init
-      options = Oddb2xml::Options.new
-      options.parser.parse!('--append -f dat'.split(' '))
-      # Oddb2xml::Cli.new(options.opts).run
-      @res = buildr_capture(:stdout){ Oddb2xml::Cli.new(options.opts).run }
+      options = Oddb2xml::Options.parse('--append -f dat')
+      @res = buildr_capture(:stdout){ Oddb2xml::Cli.new(options).run }
     end
 
     it 'should generate a valid oddb_with_migel.dat' do
@@ -650,20 +675,35 @@ if RUN_ALL
   context 'when --append -I 80 -e is given' do
     before(:all) do
       common_run_init
-      options = Oddb2xml::Options.new
-      options.parser.parse!('--append -I 80 -e'.split(' '))
-      Oddb2xml::Cli.new(options.opts).run
-      # @res = buildr_capture(:stdout){ Oddb2xml::Cli.new(options.opts).run }
+      options = Oddb2xml::Options.parse('--append -I 80 -e')
+      Oddb2xml::Cli.new(options).run
+      # @res = buildr_capture(:stdout){ Oddb2xml::Cli.new(options).run }
     end
 
     it "oddb_article with stuf from ZurRose", :skip => "ZurRose contains ERYTHROCIN i.v. Troc*esteekensub 1000 mg Amp [!]" do
       checkArticleXml
     end
 
+     # Zeno used oddb2xml -e -I 45 -c zip for oddb_arcticle for artikelstamm 7680172330414 3605520301605
+    it 'should add GTIN 7680172330414 which is marked as inactive in transfer.dat' do
+      @inhalt = IO.read(oddb_article_xml)
+      expect(@inhalt.index('7680172330414')).not_to be nil
+    end
+
+    it 'should add GTIN 3605520301605 Armani Attitude which is marked as inactive in transfer.dat' do
+      @inhalt = IO.read(oddb_article_xml)
+      #     <SALECD>I</SALECD>
+
+      expect(@inhalt.index('3605520301605')).not_to be nil
+    end
+
     context 'XSD' do
       check_attributes(oddb_article_xml, ARTICLE_ATTRIBUTE_TESTS)
       check_elements(oddb_article_xml, ARTICLE_COMMON_ELEMENTS)
       check_elements(oddb_article_xml, ARTICLE_ZURROSE_ELEMENTS)
+      it 'should contain NAROPIN' do
+        expect(File.read(oddb_article_xml).scan(ARTICLE_NAROPIN).size).to eq 1
+      end
     end
 
     it 'should emit a correct oddb_article.xml' do
@@ -679,19 +719,17 @@ if RUN_ALL
       checkPrices(true)
     end
   end
-end
 
-if RUN_ALL
   context 'when option -e is given' do
     before(:all) do
       common_run_init
-      options = Oddb2xml::Options.new
-      options.parser.parse!('-e'.split(' '))
-      Oddb2xml::Cli.new(options.opts)
+      options = Oddb2xml::Options.parse('-e')
+      puts options
+      @cli = Oddb2xml::Cli.new(options)
       if RUN_ALL
-        @res = buildr_capture(:stdout){ Oddb2xml::Cli.new(options.opts).run }
+        @res = buildr_capture(:stdout){ @cli.run }
       else
-        Oddb2xml::Cli.new(options.opts).run
+        @cli.run
       end
     end
 
@@ -706,8 +744,7 @@ if RUN_ALL
     end
 
     it 'should have a correct NBR_RECORD in oddb_code.xml' do
-      rexml = REXML::Document.new File.read(oddb_code_xml)
-      check_result(rexml, NrCodes)
+      check_result(File.read(oddb_code_xml), NrCodes)
     end
 
     context 'XSD interaction' do
@@ -716,8 +753,7 @@ if RUN_ALL
     end
 
     it 'should have a correct NBR_RECORD in oddb_interaction.xml' do
-      rexml = REXML::Document.new File.read(oddb_interaction_xml)
-      check_result(rexml, NrInteractions)
+      check_result(File.read(oddb_interaction_xml), NrInteractions)
     end
 
     context 'XSD substance' do
@@ -726,8 +762,7 @@ if RUN_ALL
     end
 
     it 'should have a correct NBR_RECORD in oddb_substance.xml' do
-      rexml = REXML::Document.new File.read('oddb_substance.xml')
-      check_result(rexml, NrSubstances)
+      check_result(File.read('oddb_substance.xml'), NrSubstances)
     end
 
     it 'should emit a correct oddb_article.xml' do
@@ -759,7 +794,7 @@ if RUN_ALL
       expect(XPath.match( doc, "//REF_DATA" ).size).to be > 0
       checkItemForRefdata(doc, "1699947", 1) # 3TC Filmtabl 150 mg SMNO 53662013 IKSNR 53‘662, 53‘663
       checkItemForRefdata(doc, "0598003", 0) # SOFRADEX Gtt Auric 8 ml
-      checkItemForRefdata(doc, "5366964", 1) # 1-DAY ACUVUE moist jour
+      checkItemForRefdata(doc, "5366964", 0) # 1-DAY ACUVUE moist jour
       unless SkipMigelDownloader
         novopen = checkItemForRefdata(doc, "3036984", 1) # NovoPen 4 Injektionsgerät blue In NonPharma (a MiGel product)
         expect(novopen.elements['ARTBAR/BC'].text).to eq '0'
@@ -768,8 +803,7 @@ if RUN_ALL
 
     it 'should generate SALECD A for migel (NINCD 13)' do
       doc = REXML::Document.new File.new(checkAndGetArticleXmlName)
-      article = XPath.match( doc, "//ART[ARTINS/NINCD=13]").first
-      article = XPath.match( doc, "//ART[PHAR=5366964]").first
+      article = XPath.match( doc, "//ART[PHAR=4236863]").first
       expect(article.elements['SALECD'].text).to eq('A')
       expect(article.elements['ARTINS/NINCD'].text).to eq('13')
     end
@@ -791,7 +825,7 @@ if RUN_ALL
       expect(XPath.match( doc, "//PHAR" ).find_all{|x| x.text.match('5366964') }.size).to eq(1)
       expect(dscrds.size).to eq(NrExtendedArticles)
       expect(XPath.match( doc, "//PRODNO" ).find_all{|x| true}.size).to be >= 1
-      expect(XPath.match( doc, "//PRODNO" ).find_all{|x| x.text.match('0027701') }.size).to eq(0)
+      expect(XPath.match( doc, "//PRODNO" ).find_all{|x| x.text.match('0027701') }.size).to eq(1)
       expect(XPath.match( doc, "//PRODNO" ).find_all{|x| x.text.match('6206901') }.size).to eq(1)
     end
 
@@ -805,8 +839,7 @@ if RUN_ALL
     end
 
     it 'should have a correct NBR_RECORD in oddb_limitation.xml' do
-      rexml = REXML::Document.new File.read('oddb_limitation.xml')
-      check_result(rexml, NrLimitations)
+      check_result(File.read('oddb_limitation.xml'), NrLimitations)
     end
 
     it 'should emit a correct oddb_limitation.xml' do
@@ -817,10 +850,10 @@ if RUN_ALL
       limitations = XPath.match( doc, "//LIM" )
       expect(limitations.size).to eql NrLimitations
       expect(XPath.match( doc, "//SwissmedicNo5" ).find_all{|x| x.text.match('28486') }.size).to eq(1)
-      expect(XPath.match( doc, "//LIMNAMEBAG" ).find_all{|x| x.text.match('ZYVOXID') }.size).to eq(1)
-      expect(XPath.match( doc, "//LIMNAMEBAG" ).find_all{|x| x.text.match('070240') }.size).to eq(1)
-      expect(XPath.match( doc, "//DSCRD" ).find_all{|x| x.text.match(/^Gesamthaft zugelassen/) }.size).to eq(1)
-      expect(XPath.match( doc, "//DSCRD" ).find_all{|x| x.text.match(/^Behandlung nosokomialer Pneumonien/) }.size).to eq(1)
+      expect(XPath.match( doc, "//LIMNAMEBAG" ).find_all{|x| x.text.match('ZYVOXID') }.size).to eq(2)
+      expect(XPath.match( doc, "//LIMNAMEBAG" ).find_all{|x| x.text.match('070240') }.size).to be >= 1
+      expect(XPath.match( doc, "//DSCRD" ).find_all{|x| x.text.match(/^Gesamthaft zugelassen/) }.size).to be >= 1
+      expect(XPath.match( doc, "//DSCRD" ).find_all{|x| x.text.match(/^Behandlung nosokomialer Pneumonien/) }.size).to  be >= 1
     end
 
     it 'should emit a correct oddb_substance.xml' do
@@ -833,7 +866,7 @@ if RUN_ALL
     it 'should emit a correct oddb_interaction.xml' do
       doc = REXML::Document.new File.new(File.join(Oddb2xml::WorkDir, 'oddb_interaction.xml'))
       titles = XPath.match( doc, "//TITD" )
-      expect(titles.size).to eq 5
+      expect(titles.size).to eq 2
       expect(titles.find_all{|x| x.text.match('Keine Interaktion') }.size).to be >= 1
       expect(titles.find_all{|x| x.text.match('Erhöhtes Risiko für Myopathie und Rhabdomyolyse') }.size).to eq(1)
     end
@@ -859,19 +892,17 @@ if RUN_ALL
       checkItemForSALECD(doc, Oddb2xml::SOFRADEX_GTIN, 'I') # SOFRADEX
     end
   end
-if RUN_ALL
   context 'testing -e -I 80 option' do
     before(:all) do
       common_run_init
-      options = Oddb2xml::Options.new
-      options.parser.parse!('-e -I 80'.split(' '))
-      @res = buildr_capture(:stdout){ Oddb2xml::Cli.new(options.opts).run }
+      options = Oddb2xml::Options.parse('-e -I 80 --log')
+      # @res = buildr_capture(:stdout){ Oddb2xml::Cli.new(options).run }
+      @res = Oddb2xml::Cli.new(options).run
     end
 
     it 'should add 80 percent to zur_rose pubbprice' do
       expect(File.exists?(oddb_article_xml)).to eq true
       FileUtils.cp(oddb_article_xml, File.join(Oddb2xml::WorkDir, 'tst-e80.xml'))
-      checkProductXml(NrPackages)
       checkArticleXml
       checkPrices(true)
     end
@@ -880,17 +911,17 @@ if RUN_ALL
       expect(File.exists?(oddb_article_xml)).to eq true
       doc = REXML::Document.new IO.read(oddb_article_xml)
       article = XPath.match( doc, "//ART[PHAR=5822801]").first
-      expect(article.elements['DSCRD'].text).to match(/EPIMINERAL/)
+      expect(article.elements['DSCRD'].text).to match /EPIMINERAL/i
     end
 
-    it 'should generate a correct oddb_product.xml' do
+    it 'should generate a correct number of packages in oddb_product.xml' do
       checkProductXml(NrPackages)
     end
 
     it 'should generate an article with the COOL (fridge) attribute' do
       doc = REXML::Document.new File.new(oddb_article_xml)
       fridge_product = checkAndGetArticleWithGTIN(doc, Oddb2xml::FRIDGE_GTIN)
-      expect(fridge_product.elements['COOL'].text).to eq '1'
+      expect(fridge_product.elements['COOL'].text).to eq('1')
     end
 
     it 'should generate a correct oddb_article.xml' do
@@ -901,9 +932,8 @@ if RUN_ALL
   context 'when -f dat -p is given' do
     before(:all) do
       common_run_init
-      options = Oddb2xml::Options.new
-      options.parser.parse!('-f dat -p'.split(' '))
-      @res = buildr_capture(:stdout){ Oddb2xml::Cli.new(options.opts).run }
+      options = Oddb2xml::Options.parse('-f dat -p')
+      @res = buildr_capture(:stdout){ Oddb2xml::Cli.new(options).run }
     end
 
     it 'should report correct number of items' do
@@ -918,15 +948,15 @@ if RUN_ALL
       expect(oddb_dat).to match(/^..3/), "should have a record with '3' in CMUT field"
       expect(oddb_dat).to match(RegExpDesitin), "should have Desitin"
       IO.readlines(dat_filename).each{ |line| check_article_IGM_format(line, 0) }
+      # oddb_dat.should match(/^..1/), "should have a record with '1' in CMUT field" # we have no
     end
   end
 
   context 'when -f dat -I 80 is given' do
     before(:all) do
       common_run_init
-      options = Oddb2xml::Options.new
-      options.parser.parse!('-f dat -I 80'.split(' '))
-      @res = buildr_capture(:stdout){ Oddb2xml::Cli.new(options.opts).run }
+      options = Oddb2xml::Options.parse('-f dat -I 80')
+      @res = buildr_capture(:stdout){ Oddb2xml::Cli.new(options).run }
     end
 
     it 'should report correct number of items' do
@@ -949,6 +979,5 @@ if RUN_ALL
       expect(out.chomp).to eq '<NAME_DE>SENSURA Mio 1t Uro 10-33 midi con lig so op 10 Stk</NAME_DE>'
     end
   end
-end
-end
+
 end