fireruby 0.1.0-powerpc-darwin → 0.2.0-powerpc-darwin

data/test/ConnectionTest.rb

@@ -2,7 +2,8 @@
 
 require 'TestSetup'
 require 'test/unit'
-require 'fireruby'
+require 'rubygems'
+require_gem 'fireruby'
 
 include FireRuby
 
@@ -12,8 +13,7 @@ class ConnectionTest < Test::Unit::TestCase
    
    def setup
       if File::exist?(DB_FILE)
-         db = Database.new(DB_USER_NAME, DB_PASSWORD, DB_FILE)
-         db.drop
+         Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
       end
 
       @database    = Database.create(DB_FILE, DB_USER_NAME, DB_PASSWORD, 1024, nil)
@@ -25,34 +25,35 @@ class ConnectionTest < Test::Unit::TestCase
       @connections.clear
 
       if File::exist?(DB_FILE)
-         db = Database.new(DB_USER_NAME, DB_PASSWORD, DB_FILE)
-         db.drop
+         Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
       end
    end
    
    def test01
-      @connections.push(@database.connect)
+      @connections.push(@database.connect(DB_USER_NAME, DB_PASSWORD))
       
+      assert(@connections[0].user == DB_USER_NAME)
       assert(@connections[0].open?)
       assert(@connections[0].closed? == false)
       assert(@connections[0].database == @database)
       assert(@connections[0].to_s == "#{DB_USER_NAME}@#{DB_FILE} (OPEN)")
       
       @connections[0].close
+      assert(@connections[0].user == DB_USER_NAME)
       assert(@connections[0].open? == false)
       assert(@connections[0].closed?)
       assert(@connections[0].database == @database)
       assert(@connections[0].to_s == "(CLOSED)")
       
-      @connections[0] = @database.connect
+      @connections[0] = @database.connect(DB_USER_NAME, DB_PASSWORD)
       assert(@connections[0].open?)
-      @connections.push(Connection.new(@database))
+      @connections.push(Connection.new(@database, DB_USER_NAME, DB_PASSWORD))
       assert(@connections[0].open?)
       assert(@connections[1].open?)
    end
    
    def test02
-      @connections.push(@database.connect)
+      @connections.push(@database.connect(DB_USER_NAME, DB_PASSWORD))
       
       tx = @connections[0].start_transaction
       assert(tx != nil)
@@ -73,7 +74,7 @@ class ConnectionTest < Test::Unit::TestCase
    end
    
    def test03
-      @connections.push(@database.connect)
+      @connections.push(@database.connect(DB_USER_NAME, DB_PASSWORD))
       tx    = @connections[0].start_transaction
       total = 0
       @connections[0].execute("SELECT RDB$FIELD_NAME FROM RDB$FIELDS", tx) do |row|

data/test/DDLTest.rb

@@ -2,7 +2,8 @@
 
 require 'TestSetup'
 require 'test/unit'
-require 'fireruby'
+require 'rubygems'
+require_gem 'fireruby'
 
 include FireRuby
 
@@ -12,19 +13,19 @@ class DDLTest < Test::Unit::TestCase
    
    def setup
       if File::exist?(DB_FILE)
-         Database.new(DB_USER_NAME, DB_PASSWORD, DB_FILE).drop
+         Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
       end
-      @database     = Database::create(DB_FILE, DB_USER_NAME, DB_PASSWORD, 1024, nil)
+      @database = Database::create(DB_FILE, DB_USER_NAME, DB_PASSWORD, 1024, nil)
    end
    
    def teardown
       if File::exist?(DB_FILE)
-         Database.new(DB_USER_NAME, DB_PASSWORD, DB_FILE).drop
+         Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
       end
    end
    
    def test01
-      @database.connect do |cxn|
+      @database.connect(DB_USER_NAME, DB_PASSWORD) do |cxn|
          cxn.execute_immediate('CREATE TABLE DDL_TABLE_01 (TABLEID '\
                                'INTEGER NOT NULL, '\
                                'FIELD01 FLOAT, FIELD02 CHAR(50), '\
@@ -32,7 +33,7 @@ class DDLTest < Test::Unit::TestCase
                                'NOT NULL, FIELD05 VARCHAR(600))')
 
          r = cxn.execute_immediate('SELECT COUNT(*) FROM DDL_TABLE_01')
-         assert(r.fetch == [0])
+         assert(r.fetch[0] == 0)
          r.close
          
          cxn.execute_immediate('ALTER TABLE DDL_TABLE_01 ADD PRIMARY KEY '\

data/test/DatabaseTest.rb

@@ -2,7 +2,8 @@
 
 require 'TestSetup'
 require 'test/unit'
-require 'fireruby'
+require 'rubygems'
+require_gem 'fireruby'
 
 include FireRuby
 
@@ -13,11 +14,11 @@ class DatabaseTest < Test::Unit::TestCase
    
    def setup
       if File.exist?(DB_FILE)
-         db = Database.new(DB_USER_NAME, DB_PASSWORD, DB_FILE)
+         db = Database.new(DB_FILE)
          db.drop
       end
       if File.exist?(CREATE_FILE)
-         db = Database.new(DB_USER_NAME, DB_PASSWORD, CREATE_FILE)
+         db = Database.new(CREATE_FILE)
          db.drop
       end
       
@@ -26,12 +27,12 @@ class DatabaseTest < Test::Unit::TestCase
    
    def teardown
       if File::exist?(DB_FILE)
-         db = Database.new(DB_USER_NAME, DB_PASSWORD, DB_FILE)
-         db.drop
+         db = Database.new(DB_FILE)
+         db.drop(DB_USER_NAME, DB_PASSWORD)
       end
       if File::exist?(CREATE_FILE)
-         db = Database.new(DB_USER_NAME, DB_PASSWORD, CREATE_FILE)
-         db.drop
+         db = Database.new(CREATE_FILE)
+         db.drop(DB_USER_NAME, DB_PASSWORD)
       end
    end
    
@@ -41,7 +42,6 @@ class DatabaseTest < Test::Unit::TestCase
       db = Database.create(CREATE_FILE, DB_USER_NAME, DB_PASSWORD, 2048, 'ASCII')
       
       assert(File.exist?(CREATE_FILE))
-      assert(db.user == DB_USER_NAME)
       assert(db.file == CREATE_FILE)
       
       begin
@@ -51,27 +51,26 @@ class DatabaseTest < Test::Unit::TestCase
       rescue Exception
       end
       
-      db.drop
+      db.drop(DB_USER_NAME, DB_PASSWORD)
       assert(File.exist?(CREATE_FILE) == false)
    end
    
    def test02
       puts "Executing test02.\n\n"
-      db = Database.new(DB_USER_NAME, DB_PASSWORD, DB_FILE);
+      db = Database.new(DB_FILE);
       
-      assert(db.user == DB_USER_NAME)
       assert(db.file == DB_FILE)
       
-      c = db.connect
+      c = db.connect(DB_USER_NAME, DB_PASSWORD)
       assert(c != nil)
       c.close
    end
    
    def test03
-      db = Database.new(DB_USER_NAME, DB_PASSWORD, DB_FILE);
+      db = Database.new(DB_FILE);
       c  = nil
 
-      db.connect do |connection|
+      db.connect(DB_USER_NAME, DB_PASSWORD) do |connection|
          assert(connection != nil)
          assert(connection.class == Connection)
          assert(connection.open?)

data/test/GeneratorTest.rb

@@ -2,7 +2,8 @@
 
 require 'TestSetup'
 require 'test/unit'
-require 'fireruby'
+require 'rubygems'
+require_gem 'fireruby'
 
 include FireRuby
 
@@ -17,7 +18,7 @@ class GeneratorTest < Test::Unit::TestCase
       @database     = Database::create(DB_FILE, DB_USER_NAME, DB_PASSWORD, 1024, nil)
       @connections  = []
       
-      @connections.push(@database.connect)
+      @connections.push(@database.connect(DB_USER_NAME, DB_PASSWORD))
    end
    
    def teardown
@@ -26,7 +27,7 @@ class GeneratorTest < Test::Unit::TestCase
       end
       @connections.clear
       if File::exist?(DB_FILE)
-         Database.new(DB_USER_NAME, DB_PASSWORD, DB_FILE).drop
+         Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
       end
    end
    

data/test/ResultSetTest.rb

@@ -2,7 +2,8 @@
 
 require 'TestSetup'
 require 'test/unit'
-require 'fireruby'
+require 'rubygems'
+require_gem 'fireruby'
 
 include FireRuby
 
@@ -12,13 +13,13 @@ class ResultSetTest < Test::Unit::TestCase
    
    def setup
       if File::exist?(DB_FILE)
-         Database.new(DB_USER_NAME, DB_PASSWORD, DB_FILE).drop
+         Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
       end
       @database     = Database::create(DB_FILE, DB_USER_NAME, DB_PASSWORD, 1024, nil)
       @connections  = []
       @transactions = []
       
-      @connections.push(@database.connect)
+      @connections.push(@database.connect(DB_USER_NAME, DB_PASSWORD))
       
       @connections[0].start_transaction do |tx|
          tx.execute("CREATE TABLE TEST_TABLE (TESTID INTEGER NOT NULL "\
@@ -52,7 +53,7 @@ class ResultSetTest < Test::Unit::TestCase
       end
       @connections.clear
       if File::exist?(DB_FILE)
-         Database.new(DB_USER_NAME, DB_PASSWORD, DB_FILE).drop
+         Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
       end
    end
    
@@ -65,7 +66,7 @@ class ResultSetTest < Test::Unit::TestCase
       assert(r.statement == s)
       
       assert(r.fetch != nil)
-      assert(r.fetch.class == Array)
+      assert(r.fetch.class == Row)
       assert(r.fetch[0] == 30)
       assert(r.fetch[1] == 'Record Four.')
       r.fetch

data/test/RowTest.rb

@@ -0,0 +1,49 @@
+#!/usr/bin/env ruby
+
+require 'TestSetup'
+require 'test/unit'
+require 'rubygems'
+require_gem 'fireruby'
+
+include FireRuby
+
+class RowTest < Test::Unit::TestCase
+   CURDIR  = "#{Dir.getwd}"
+   DB_FILE = "#{CURDIR}#{File::SEPARATOR}row_unit_test.fdb"
+   
+   def setup
+      if File::exist?(DB_FILE)
+         Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
+      end
+      
+      database     = Database::create(DB_FILE, DB_USER_NAME, DB_PASSWORD, 1024, nil)
+      @connection  = database.connect(DB_USER_NAME, DB_PASSWORD)
+      @transaction = @connection.start_transaction
+      @statement   = Statement.new(@connection, @transaction,
+                                   'SELECT * FROM RDB$FIELDS', 3)
+      @results     = ResultSet.new(@statement)
+      @empty       = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                      0, 0, 0, 0, 0, 0, 0, 0, 0]
+   end
+   
+   def teardown
+      @results.close
+      @statement.close
+      @transaction.rollback
+      @connection.close
+      if File::exist?(DB_FILE)
+         Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
+      end
+   end
+   
+   def test01
+      row = Row.new(@results, @empty, 100)
+      
+      assert(row.column_count == 28)
+      assert(row.number == 100)
+      assert(row.column_name(0) == 'RDB$FIELD_NAME')
+      assert(row.column_alias(10) == 'RDB$FIELD_TYPE')
+      assert(row[0] == 0)
+      assert(row['RDB$FIELD_TYPE'] == 0)
+   end
+end

data/test/SQLTest.rb

@@ -2,7 +2,8 @@
 
 require 'TestSetup'
 require 'test/unit'
-require 'fireruby'
+require 'rubygems'
+require_gem 'fireruby'
 
 include FireRuby
 
@@ -15,17 +16,17 @@ class SQLTest < Test::Unit::TestCase
    
    def setup
       if File::exist?(DB_FILE)
-         Database.new(DB_USER_NAME, DB_PASSWORD, DB_FILE).drop
+         Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
       end
       @database     = Database::create(DB_FILE, DB_USER_NAME, DB_PASSWORD,
                                        1024, 'ASCII')
       @connections  = []
       @transactions = []
       
-      @database.connect do |cxn|
+      @database.connect(DB_USER_NAME, DB_PASSWORD) do |cxn|
          cxn.execute_immediate('CREATE TABLE TEST_TABLE (TESTID INTEGER '\
                                'NOT NULL PRIMARY KEY, TESTTEXT VARCHAR(100), '\
-                               'TESTFLOAT FLOAT, TESTDATE DATE, TESTTIME '\
+                               'TESTFLOAT NUMERIC(8,2), TESTDATE DATE, TESTTIME '\
                                'TIME, TESTSTAMP TIMESTAMP)')
       end
    end
@@ -39,13 +40,13 @@ class SQLTest < Test::Unit::TestCase
          cxn.close if cxn.open?
       end
       
-      #if File::exist?(DB_FILE)
-      #   Database.new(DB_USER_NAME, DB_PASSWORD, DB_FILE).drop
-      #end
+      if File::exist?(DB_FILE)
+         Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
+      end
    end
    
    def test01
-      @database.connect do |cxn|
+      @database.connect(DB_USER_NAME, DB_PASSWORD) do |cxn|
          cxn.start_transaction do |tx|
             s = Statement.new(cxn, tx, INSERT_SQL, 3)
             f = 0.0
@@ -59,7 +60,7 @@ class SQLTest < Test::Unit::TestCase
          end
       end
       
-      @connections.push(@database.connect)
+      @connections.push(@database.connect(DB_USER_NAME, DB_PASSWORD))
       r = @connections[0].execute_immediate("SELECT COUNT(*) FROM TEST_TABLE")
       assert(r.fetch[0] == ITERATIONS)
       r.close
@@ -67,7 +68,7 @@ class SQLTest < Test::Unit::TestCase
    
    def test02
       f = 0.0
-      @database.connect do |cxn|
+      @database.connect(DB_USER_NAME, DB_PASSWORD) do |cxn|
          1.upto(20) do |i|
             f += i
             sql = "INSERT INTO TEST_TABLE VALUES (#{i}, "\
@@ -76,7 +77,7 @@ class SQLTest < Test::Unit::TestCase
          end
       end
       
-      @connections.push(@database.connect)
+      @connections.push(@database.connect(DB_USER_NAME, DB_PASSWORD))
       @transactions.push(@connections[0].start_transaction)
       r = @transactions[0].execute("SELECT COUNT(*) FROM TEST_TABLE")
       assert(r.fetch[0] == 20)
@@ -85,24 +86,39 @@ class SQLTest < Test::Unit::TestCase
       r = @transactions[0].execute("SELECT * FROM TEST_TABLE WHERE TESTID IN "\
                                    "(2, 4, 6, 8, 10) ORDER BY TESTID ASCENDING")
       a = r.fetch
-      assert(a.delete_at(5) != nil)
-      assert(a == [2, '3.0', 3.0, nil, nil])
+      assert(a[0] == 2)
+      assert(a[1] == '3.0')
+      assert(a[2] == 3.0)
+      assert(a[3] == nil)
+      assert(a[4] == nil)
 
       a = r.fetch
-      assert(a.delete_at(5) != nil)
-      assert(a == [4, '10.0', 10.0, nil, nil])
+      assert(a[0] == 4)
+      assert(a[1] == '10.0')
+      assert(a[2] == 10.0)
+      assert(a[3] == nil)
+      assert(a[4] == nil)
 
       a = r.fetch
-      assert(a.delete_at(5) != nil)
-      assert(a == [6, '21.0', 21.0, nil, nil])
+      assert(a[0] == 6)
+      assert(a[1] == '21.0')
+      assert(a[2] == 21.0)
+      assert(a[3] == nil)
+      assert(a[4] == nil)
 
       a = r.fetch
-      assert(a.delete_at(5) != nil)
-      assert(a == [8, '36.0', 36.0, nil, nil])
+      assert(a[0] == 8)
+      assert(a[1] == '36.0')
+      assert(a[2] == 36.0)
+      assert(a[3] == nil)
+      assert(a[4] == nil)
 
       a = r.fetch
-      assert(a.delete_at(5) != nil)
-      assert(a == [10, '55.0', 55.0, nil, nil])
+      assert(a[0] == 10)
+      assert(a[1] == '55.0')
+      assert(a[2] == 55.0)
+      assert(a[3] == nil)
+      assert(a[4] == nil)
       
       r.close
       
@@ -123,6 +139,7 @@ class SQLTest < Test::Unit::TestCase
       end
       
       a = []
+      t = nil
       @connections[0].start_transaction do |tx|
          # Perform an insert via a parameterized statement.
          s = Statement.new(@connections[0], tx,
@@ -136,18 +153,18 @@ class SQLTest < Test::Unit::TestCase
                         "TEST_TABLE WHERE TESTID = 25000")
          a = r.fetch
          r.close
-         puts ['La la la', 3.14, t].join(', ')
-         puts a.join(', ')
       end
-      assert(a == ['La la la', 3.14, t])
+      assert(a[0] == 'La la la')
+      assert(a[1] == 3.14)
+      assert(a[2].to_i == t.to_i)
       
       @connections[0].execute_immediate("DELETE FROM TEST_TABLE WHERE TESTID "\
                                         "IN (1, 3, 5, 7, 9, 12, 14, 16, 18, 20)")
-      @database.connect do |cxn|
+      @database.connect(DB_USER_NAME, DB_PASSWORD) do |cxn|
          r = cxn.execute_immediate("SELECT COUNT(*) FROM TEST_TABLE")
          a = r.fetch
          r.close
-         assert(a[0] == 10)
+         assert(a[0] == 11)
       end
    end
 end

data/test/StatementTest.rb

@@ -2,7 +2,8 @@
 
 require 'TestSetup'
 require 'test/unit'
-require 'fireruby'
+require 'rubygems'
+require_gem 'fireruby'
 
 include FireRuby
 
@@ -12,7 +13,7 @@ class StatementTest < Test::Unit::TestCase
    
    def setup
       if File::exist?(DB_FILE)
-         Database.new(DB_USER_NAME, DB_PASSWORD, DB_FILE).drop
+         Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
       end
       @database     = Database::create(DB_FILE, DB_USER_NAME, DB_PASSWORD, 1024, nil)
       @connections  = []
@@ -29,12 +30,12 @@ class StatementTest < Test::Unit::TestCase
       end
       @connections.clear
       if File::exist?(DB_FILE)
-         Database.new(DB_USER_NAME, DB_PASSWORD, DB_FILE).drop
+         Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
       end
    end
    
    def test01
-      @connections.push(@database.connect)
+      @connections.push(@database.connect(DB_USER_NAME, DB_PASSWORD))
       @transactions.push(@connections.last.start_transaction)
       
       s1 = Statement.new(@connections[0],
@@ -59,7 +60,7 @@ class StatementTest < Test::Unit::TestCase
    end
    
    def test02
-      @connections.push(@database.connect)
+      @connections.push(@database.connect(DB_USER_NAME, DB_PASSWORD))
       @transactions.push(@connections[0].start_transaction)
       
       s = Statement.new(@connections[0], @transactions[0],

data/test/TransactionTest.rb

@@ -2,7 +2,8 @@
 
 require 'TestSetup'
 require 'test/unit'
-require 'fireruby'
+require 'rubygems'
+require_gem 'fireruby'
 
 include FireRuby
 
@@ -12,16 +13,16 @@ class TransactionTest < Test::Unit::TestCase
    
    def setup
       if File::exist?(DB_FILE)
-         Database.new(DB_USER_NAME, DB_PASSWORD, DB_FILE).drop
+         Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
       end
       
       @database     = Database.create(DB_FILE, DB_USER_NAME, DB_PASSWORD, 1024, nil)
       @connections  = []
       @transactions = []
 
-      @connections.push(@database.connect)
-      @connections.push(@database.connect)
-      @connections.push(@database.connect)
+      @connections.push(@database.connect(DB_USER_NAME, DB_PASSWORD))
+      @connections.push(@database.connect(DB_USER_NAME, DB_PASSWORD))
+      @connections.push(@database.connect(DB_USER_NAME, DB_PASSWORD))
    end
    
    def teardown
@@ -33,7 +34,7 @@ class TransactionTest < Test::Unit::TestCase
          cxn.close if cxn.open?
       end
       if File::exist?(DB_FILE)
-         Database.new(DB_USER_NAME, DB_PASSWORD, DB_FILE).drop
+         Database.new(DB_FILE).drop(DB_USER_NAME, DB_PASSWORD)
       end
    end
    

data/test/UnitTest.rb

@@ -5,6 +5,7 @@ require 'ConnectionTest'
 require 'TransactionTest'
 require 'StatementTest'
 require 'ResultSetTest'
+require 'RowTest'
 require 'GeneratorTest'
 require 'DDLTest'
 require 'SQLTest'