xmlconv 1.0.1 → 1.0.2

data/test/test_i2/document.rb

@@ -4,18 +4,13 @@
 $: << File.dirname(__FILE__)
 $: << File.expand_path('../../lib', File.dirname(__FILE__))
 
-require 'test/unit'
 require 'xmlconv/i2/document'
-require 'mock'
+require 'minitest/autorun'
+require 'flexmock/minitest'
 
 module XmlConv
 	module I2
-		class TestDocument < Test::Unit::TestCase
-			class ToSMock < Mock
-				def to_s
-					true
-				end
-			end
+		class TestDocument < ::Minitest::Test
 			def setup
 				@document = I2::Document.new
 			end
@@ -25,37 +20,32 @@ module XmlConv
 			end
 			def test_add_order
 				assert_equal([], @document.orders)
-				order = Mock.new
+				order = flexmock
 				@document.add_order(order)
 				assert_equal([order], @document.orders)
-				order.__verify
 			end
 			def test_to_s
-				header = ToSMock.new('Header')
+				header = flexmock('Header')
 				@document.header = header
-				header.__next(:to_s) { "000:A Header\n" }
-				order1 = ToSMock.new('Order1')
+        header.should_receive(:to_s).and_return("000:A Header\n").once
+				order1 = flexmock('Order1')
 				@document.add_order(order1)
-				order1.__next(:to_s) { "100:An Order\n" }
-				order2 = ToSMock.new('Order2')
+        order1.should_receive(:to_s).and_return("100:An Order\n").once
+				order2 = flexmock('Order2')
 				@document.add_order(order2)
-				order2.__next(:to_s) { "100:Another Order\n" }
+        order2.should_receive(:to_s).and_return("100:Another Order\n").once
 				expected = <<-EOS
 000:A Header
 100:An Order
 100:Another Order
 				EOS
 				assert_equal(expected, @document.to_s)
-				header.__verify
-				order1.__verify
-				order2.__verify
 			end
 			def test_filename
-				header = Mock.new
-				header.__next(:filename) { 'result.dat' }
+				header = flexmock
+        header.should_receive(:filename).and_return( 'result.dat').once
 				@document.header = header
 				assert_equal('result.dat', @document.filename)
-				header.__verify
 			end
 		end
 	end

data/test/test_i2/header.rb

@@ -4,12 +4,12 @@
 $: << File.dirname(__FILE__)
 $: << File.expand_path('../../lib', File.dirname(__FILE__))
 
-require 'test/unit'
 require 'xmlconv/i2/header'
+require 'minitest/autorun'
 
 module XmlConv
 	module I2
-		class TestHeader < Test::Unit::TestCase
+		class TestHeader < ::Minitest::Test
 			def setup
 				@header = Header.new
 			end

data/test/test_i2/order.rb

@@ -4,18 +4,13 @@
 $: << File.dirname(__FILE__)
 $: << File.expand_path('../../lib', File.dirname(__FILE__))
 
-require 'test/unit'
 require 'xmlconv/i2/order'
-require 'mock'
+require 'minitest/autorun'
+require 'flexmock/minitest'
 
 module XmlConv
 	module I2
-		class TestOrder < Test::Unit::TestCase
-			class ToSMock < Mock
-				def to_s
-					true
-				end
-			end
+		class TestOrder < ::Minitest::Test
 			def setup
 				@order = Order.new
 			end
@@ -30,46 +25,43 @@ module XmlConv
 			end
 			def test_add_address
 				assert_equal([], @order.addresses)
-				address = Mock.new
+				address = flexmock
 				@order.add_address(address)
 				assert_equal([address], @order.addresses)
-				address.__verify
 			end
 			def test_add_date
 				assert_equal([], @order.dates)
-				date = Mock.new
+				date = flexmock
 				@order.add_date(date)
 				assert_equal([date], @order.dates)
-				date.__verify
 			end
 			def test_add_position
 				assert_equal([], @order.positions)
-				position = Mock.new
+				position = flexmock
 				@order.add_position(position)
 				assert_equal([position], @order.positions)
-				position.__verify
 			end
 			def test_to_s
 				@order.sender_id = 'Sender'
 				@order.delivery_id = 'DeliveryId'
-				address1 = ToSMock.new('Address1')
+				address1 = flexmock('Address1')
+        address1.should_receive(:to_s).and_return("200:An Address\n")
 				@order.add_address(address1)
-				address1.__next(:to_s) { "200:An Address\n" }
-				address2 = ToSMock.new('Address2')
+				address2 = flexmock('Address2')
+        address2.should_receive(:to_s).and_return("200:Another Address\n")
 				@order.add_address(address2)
-				address2.__next(:to_s) { "200:Another Address\n" }
-				date1 = ToSMock.new('Date1')
+				date1 = flexmock('Date1')
+        date1.should_receive(:to_s).and_return("300:A Date\n").once
 				@order.add_date(date1)
-				date1.__next(:to_s) { "300:A Date\n" }
-				date2 = ToSMock.new('Date2')
+				date2 = flexmock('Date2')
+        date2.should_receive(:to_s).and_return("300:Another Date\n").once
 				@order.add_date(date2)
-				date2.__next(:to_s) { "300:Another Date\n" }
-				pos1 = ToSMock.new('Position1')
+				pos1 = flexmock('Position1')
+        pos1.should_receive(:to_s).and_return( "500:A Position\n").once
 				@order.add_position(pos1)
-				pos1.__next(:to_s) { "500:A Position\n" }
-				pos2 = ToSMock.new('Position2')
+				pos2 = flexmock('Position2')
+        pos2.should_receive(:to_s).and_return( "500:Another Position\n").once
 				@order.add_position(pos2)
-				pos2.__next(:to_s) { "500:Another Position\n" }
 				expected = <<-EOS
 100:Sender
 101:DeliveryId
@@ -82,12 +74,6 @@ module XmlConv
 500:Another Position
 				EOS
 				assert_equal(expected, @order.to_s)
-				address1.__verify
-				address2.__verify
-				date1.__verify
-				date2.__verify
-				pos1.__verify
-				pos2.__verify
 			end
 		end
 	end

data/test/test_i2/parser.rb

@@ -3,14 +3,14 @@
 
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path('../../lib', File.dirname(__FILE__))
-
-require 'test/unit'
+if false
 require 'xmlconv/i2/parser'
 require 'config'
+require 'minitest/autorun'
 
 module XmlConv
 	module I2
-		class TestParser < Test::Unit::TestCase
+		class TestParser < ::Minitest::Test
 			def setup
         XmlConv::CONFIG.grammar_dir = File.expand_path('../../data/grammar',
                                                        File.dirname(__FILE__))
@@ -310,3 +310,4 @@ module XmlConv
 		end
 	end
 end
+end

data/test/test_i2/position.rb

@@ -4,21 +4,13 @@
 $: << File.dirname(__FILE__)
 $: << File.expand_path('../../lib', File.dirname(__FILE__))
 
-require 'test/unit'
 require 'xmlconv/i2/position'
-require 'mock'
+require 'minitest/autorun'
+require 'flexmock/minitest'
 
 module XmlConv
 	module I2
-		class TestPosition < Test::Unit::TestCase
-			class ToSMock < Mock
-				def is_a?(klass)
-					true
-				end
-				def to_s
-					true
-				end
-			end
+		class TestPosition < ::Minitest::Test
 			def setup
 				@position = Position.new
 			end
@@ -36,14 +28,11 @@ module XmlConv
 				@position.number = '12345'
 				@position.article_ean = '7654321098765'
 				@position.qty = 123
-				date = ToSMock.new('Date')
-				date.__next(:code=) {}
+				date = flexmock('Date')
+        date.should_receive(:code=).and_return({})
+        date.should_receive(:is_a?).and_return(I2::Date)
 				@position.delivery_date = date
-				date.__next(:is_a?) { |klass| 
-					assert_equal(I2::Date, klass)
-					true
-				}
-				date.__next(:to_s) { "540:A Date\n" }
+        date.should_receive(:to_s=).and_return("540:A Date\n")
 				expected = <<-EOS
 500:12345
 501:7654321098765
@@ -53,12 +42,9 @@ module XmlConv
 				assert_equal(expected, @position.to_s)
 			end
 			def test_delivery_date_writer
-				date = Mock.new('DeliveryDate')
-				date.__next(:code=) { |code| 
-					assert_equal(:delivery, code)
-				}
+				date = flexmock('DeliveryDate')
+        date.should_receive(:code=).with(:delivery).and_return(:delivery)
 				@position.delivery_date = date
-				date.__verify
 			end
 		end
 	end

data/test/test_model/address.rb

@@ -4,12 +4,12 @@
 $: << File.dirname(__FILE__)
 $: << File.expand_path('../../lib', File.dirname(__FILE__))
 
-require 'test/unit'
 require 'xmlconv/model/address'
+require 'minitest/autorun'
 
 module XmlConv
 	module Model
-		class TestAddress < Test::Unit::TestCase
+		class TestAddress < ::Minitest::Test
 			def setup
 				@address = Address.new
 			end

data/test/test_model/agreement.rb

@@ -4,12 +4,12 @@
 $: << File.dirname(__FILE__)
 $: << File.expand_path('../../lib', File.dirname(__FILE__))
 
-require 'test/unit'
 require 'xmlconv/model/agreement'
+require 'minitest/autorun'
 
 module XmlConv
 	module Model
-		class TestAgreement < Test::Unit::TestCase
+		class TestAgreement < ::Minitest::Test
 			def setup
 				@agreement = Agreement.new
 			end

data/test/test_model/bdd.rb

@@ -4,13 +4,13 @@
 $: << File.dirname(__FILE__)
 $: << File.expand_path('../../lib', File.dirname(__FILE__))
 
-require 'test/unit'
 require 'xmlconv/model/bdd'
-require 'flexmock'
+require 'minitest/autorun'
+require 'flexmock/minitest'
 
 module XmlConv
 	module Model
-		class TestBdd < Test::Unit::TestCase
+		class TestBdd < ::Minitest::Test
 			def setup
 				@bdd = Bdd.new
 			end
@@ -23,29 +23,28 @@ module XmlConv
 				assert_respond_to(@bdd, :invoices)
 			end
 			def test_add_delivery
-				delivery = FlexMock.new('Delivery')
+				delivery = flexmock('Delivery')
 				assert_equal([], @bdd.deliveries)
 				@bdd.add_delivery(delivery)
 				assert_equal([delivery], @bdd.deliveries)
 			end
 			def test_add_invoice
-				invoice = FlexMock.new('Invoice')
+				invoice = flexmock('Invoice')
 				assert_equal([], @bdd.invoices)
 				@bdd.add_invoice(invoice)
 				assert_equal([invoice], @bdd.invoices)
 			end
       def test_invoiced_amount
         assert_equal(0, @bdd.invoiced_amount)
-        invoice = FlexMock.new
-        price = FlexMock.new
+        invoice = flexmock
+        price = flexmock
         @bdd.invoices.push(invoice, invoice) 
         invoice.should_receive(:get_price)\
           .times(4).and_return { |purpose|
           assert_equal('SummePositionen', purpose)
           price
         }
-        price.should_receive(:amount)\
-          .times(1).and_return { '123.45' }
+        price.should_receive(:amount).at_least.once.and_return { '123.45' }
         assert_equal(246.90, @bdd.invoiced_amount)
         @bdd.deliveries.push(invoice) 
         assert_equal(246.90, @bdd.invoiced_amount)

data/test/test_model/bsr.rb

@@ -4,13 +4,13 @@
 $: << File.dirname(__FILE__)
 $: << File.expand_path('../../lib', File.dirname(__FILE__))
 
-require 'test/unit'
 require 'xmlconv/model/bsr'
-require 'mock'
+require 'minitest/autorun'
+require 'flexmock/minitest'
 
 module XmlConv
 	module Model
-		class TestBsr < Test::Unit::TestCase
+		class TestBsr < ::Minitest::Test
 			def setup
 				@bsr = Bsr.new
 			end
@@ -26,12 +26,11 @@ module XmlConv
 				assert_respond_to(@bsr, :verb=)
 			end
 			def test_bsr_id
-				party = Mock.new('Party')
-				party.__next(:role) { 'Customer' }
-				party.__next(:party_id) { 'id_string' }
+				party = flexmock('Party')
+        party.should_receive(:role).and_return( 'Customer').once
+        party.should_receive(:party_id).and_return( 'id_string').once
 				@bsr.add_party(party)
 				assert_equal('id_string', @bsr.bsr_id)
-				party.__verify
 			end
 		end
 	end

data/test/test_model/delivery.rb

@@ -4,13 +4,13 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path('../../lib', File.dirname(__FILE__))
 
-require 'test/unit'
 require 'xmlconv/model/delivery'
-require 'mock'
+require 'minitest/autorun'
+require 'flexmock/minitest'
 
 module XmlConv
 	module Model
-		class TestDelivery < Test::Unit::TestCase
+		class TestDelivery < ::Minitest::Test
 			def setup
 				@delivery = Delivery.new
 			end
@@ -39,38 +39,34 @@ module XmlConv
 				assert_respond_to(@delivery, :add_free_text)
 			end
 			def test_bsr_id
-				bsr = Mock.new('BSR')
-				bsr.__next(:bsr_id) { 'id_string' } 
+				bsr = flexmock('BSR')
+        bsr.should_receive(:bsr_id).and_return( 'id_string').once
 				assert_nil(@delivery.bsr_id)
 				@delivery.bsr = bsr
 				assert_equal('id_string', @delivery.bsr_id)
-				bsr.__verify
 			end
 			def test_add_party__customer
-				party = Mock.new('Customer')
-				party.__next(:role) { 'Customer' }
+				party = flexmock('Customer')
+        party.should_receive(:role).and_return( 'Customer').once
 				@delivery.add_party(party)
 				assert_equal(party, @delivery.customer)
 				assert_equal([party], @delivery.parties)
-				party.__verify
 			end
 			def test_add_party__seller
-				party = Mock.new('Seller')
-				party.__next(:role) { 'Seller' }
+				party = flexmock('Seller')
+        party.should_receive(:role).and_return( 'Seller').once
 				@delivery.add_party(party)
 				assert_equal(party, @delivery.seller)
 				assert_equal([party], @delivery.parties)
-				party.__verify
 			end
 			def test_add_item
-				item = Mock.new
+				item = flexmock
 				@delivery.add_item(item)	
 				assert_equal([item], @delivery.items)
-				item.__verify
 			end
 			def test_add_price
 				assert_equal([], @delivery.prices)
-				price = Mock.new('BruttoPreis')
+				price = flexmock('BruttoPreis')
 				@delivery.add_price(price)
 				assert_equal([price], @delivery.prices)
 			end

data/test/test_model/delivery_item.rb

@@ -4,13 +4,13 @@
 $: << File.expand_path('..', File.dirname(__FILE__))
 $: << File.expand_path('../../lib', File.dirname(__FILE__))
 
-require 'test/unit'
 require 'xmlconv/model/delivery_item'
-require 'mock'
+require 'minitest/autorun'
+require 'flexmock/minitest'
 
 module XmlConv
 	module Model
-		class TestDeliveryItem < Test::Unit::TestCase
+		class TestDeliveryItem < ::Minitest::Test
 			def setup
 				@item = DeliveryItem.new
 			end
@@ -37,12 +37,12 @@ module XmlConv
 			end
 			def test_add_price
 				assert_equal([], @item.prices)
-				price = Mock.new('BruttoPreis')
+				price = flexmock('BruttoPreis')
 				@item.add_price(price)
 				assert_equal([price], @item.prices)
 			end
 			def test_add_part_info
-				info = Mock.new('PartInfo')
+				info = flexmock('PartInfo')
 				assert_equal([], @item.part_infos)
 				@item.add_part_info(info)
 				assert_equal([info], @item.part_infos)

data/test/test_model/freetext_container.rb

@@ -4,15 +4,15 @@
 $: << File.dirname(__FILE__)
 $: << File.expand_path('../../lib', File.dirname(__FILE__))
 
-require 'test/unit'
 require 'xmlconv/model/invoice_item'
+require 'minitest/autorun'
 
 module XmlConv
 	module Model
 		class Container 
 			include FreeTextContainer
 		end
-		class TestFreeTextContainer < Test::Unit::TestCase
+		class TestFreeTextContainer < ::Minitest::Test
 			def setup
 				@container = Container.new
 			end
@@ -27,7 +27,7 @@ module XmlConv
 				assert_equal('Description', txt.type)
 			end
 		end
-		class TestFreeText < Test::Unit::TestCase
+		class TestFreeText < ::Minitest::Test
 			def setup
 				@text = FreeText.new
 			end

data/test/test_model/invoice.rb

@@ -4,13 +4,13 @@
 $: << File.dirname(__FILE__)
 $: << File.expand_path('../../lib', File.dirname(__FILE__))
 
-require 'test/unit'
 require 'xmlconv/model/invoice'
-require 'mock'
+require 'minitest/autorun'
+require 'flexmock/minitest'
 
 module XmlConv
 	module Model
-		class TestInvoice < Test::Unit::TestCase
+		class TestInvoice < ::Minitest::Test
 			def setup
 				@invoice = Invoice.new
 			end
@@ -35,30 +35,27 @@ module XmlConv
 				assert_respond_to(@invoice, :add_free_text)
 			end
 			def test_add_item
-				item = Mock.new
+				item = flexmock
 				@invoice.add_item(item)	
 				assert_equal([item], @invoice.items)
-				item.__verify
 			end
 			def test_add_delivery_id
 				@invoice.add_delivery_id('Domain', 'Id')
 				assert_equal(['Domain', 'Id'], @invoice.delivery_id)
 			end
 			def test_add_party__customer
-				party = Mock.new('Customer')
-				party.__next(:role) { 'Customer' }
+				party = flexmock('Customer')
+        party.should_receive(:role).and_return( 'Customer').once
 				@invoice.add_party(party)
 				assert_equal(party, @invoice.customer)
 				assert_equal([party], @invoice.parties)
-				party.__verify
 			end
 			def test_add_party__seller
-				party = Mock.new('Seller')
-				party.__next(:role) { 'Seller' }
+				party = flexmock('Seller')
+        party.should_receive(:role).and_return( 'Seller').once
 				@invoice.add_party(party)
 				assert_equal(party, @invoice.seller)
 				assert_equal([party], @invoice.parties)
-				party.__verify
 			end
 		end
 	end

data/test/test_model/invoice_item.rb

@@ -2,15 +2,16 @@
 # Model::TestInvoiceItem -- xmlconv2 -- 23.06.2004 -- hwyss@ywesee.com
 
 $: << File.dirname(__FILE__)
+puts File.expand_path('../../lib', File.dirname(__FILE__))
 $: << File.expand_path('../../lib', File.dirname(__FILE__))
 
-require 'test/unit'
 require 'xmlconv/model/invoice_item'
-require 'mock'
+require 'minitest/autorun'
+require 'flexmock/minitest'
 
 module XmlConv
 	module Model
-		class TestInvoiceItem < Test::Unit::TestCase
+		class TestInvoiceItem < ::Minitest::Test
 			def setup
 				@item = InvoiceItem.new
 			end
@@ -31,7 +32,7 @@ module XmlConv
 				assert_equal({'ET-NUMMER'	=>	'et_number'}, @item.ids)
 			end
 			def test_add_part_info
-				info = Mock.new('PartInfo')
+				info = flexmock('PartInfo')
 				assert_equal([], @item.part_infos)
 				@item.add_part_info(info)
 				assert_equal([info], @item.part_infos)

data/test/test_model/name.rb

@@ -4,12 +4,12 @@
 $: << File.dirname(__FILE__)
 $: << File.expand_path('../../lib', File.dirname(__FILE__))
 
-require 'test/unit'
 require 'xmlconv/model/name'
+require 'minitest/autorun'
 
 module XmlConv
 	module Model
-		class TestName < Test::Unit::TestCase
+		class TestName < ::Minitest::Test
 			def setup
 				@name = Name.new
 			end

data/test/test_model/part_info.rb

@@ -4,12 +4,12 @@
 $: << File.dirname(__FILE__)
 $: << File.expand_path('../../lib', File.dirname(__FILE__))
 
-require 'test/unit'
 require 'xmlconv/model/part_info'
+require 'minitest/autorun'
 
 module XmlConv
 	module Model
-		class TestPartInfo < Test::Unit::TestCase
+		class TestPartInfo < ::Minitest::Test
 			def setup
 				@part_info = PartInfo.new
 			end