Changeset 589

Timestamp:

03/22/07 12:30:23 (2 years ago)

Author:

jarmo

Message:

• Fixed some broken tests on baseline
  

Files:

• branches/baseline/app/views/form/_creation_form.rhtml (modified) (1 diff)
• branches/baseline/db/migrate/001_baseline.rb (modified) (1 diff)
• branches/baseline/test/functional/task_type_controller_test.rb (modified) (1 diff)
• branches/baseline/test/test_helper.rb (modified) (4 diffs)
• branches/baseline/test/unit/asset_type_test.rb (modified) (2 diffs)
• branches/baseline/test/unit/protected_data_test.rb (modified) (5 diffs)
• branches/baseline/test/unit/task_test.rb (modified) (2 diffs)

branches/baseline/app/views/form/_creation_form.rhtml

@@ -37 +37 @@
-      <td><%= check_box(:form, :editable) %></td>
-    </tr>
-
+@task_types and 
-      <tr>
-        <th><%= _('Create new a task associated to this form') %></th>

branches/baseline/db/migrate/001_baseline.rb

@@ -319 +319 @@
-    create_table 'type_attachments', :force => true do |t|
-      t.column 'asset_type_id', :integer, :references => :asset_types, :null => false, :on_delete => :restrict, :on_update => :restrict
-, :null => false
+
-      t.column 'filename', :string, :limit => 100, :null => false
-      t.column 'content_type', :string, :limit => 100, :null => false

branches/baseline/test/functional/task_type_controller_test.rb

@@ -71 +71 @@
-    login('test')  
-
-name => 'Valid name'
-success
-template 'shared/_create_or_edi
+model => { :name => 'Valid name' }
+redirect
+redirected_to :action => 'lis
-    assert_equal true, assigns(:model).errors.empty?
-    assert_equal false, assigns(:model).new_record?

branches/baseline/test/test_helper.rb

@@ -145 +145 @@
-
-  # Creates a new task to asset+
-
+
+
+
-    w = Task.new(:short_description => short_description)
-ask_t
+
-    w.asset = asset
-    w.ready = ready
@@ -157 +159 @@
-  def create_raw_task(asset, ready = false, short_description = 'Short description')
-    tt = TaskType.find_by_name('create_raw_task')
-
+!
-
-    tmp = TempTask.create!(:asset_id => asset.id, :ready => ready, :short_description => short_description, :task_type_id => tt.id)
@@ -164 +166 @@
-
-  # Creates a new form to asset+
-
+
+
+
-    r = Form.new(:other_read => other_read, :other_edit => other_edit)
-form_
+
-    r.asset = asset
-    r.ready = ready
@@ -176 +180 @@
-  def create_raw_form(asset, ready = false, other_read = false, other_edit = false)
-    ft = FormType.find_by_name('create_raw_form')
-
+!
-
-    tmp = TempForm.create!(:asset_id => asset.id, :ready => ready, :other_read => other_read, :other_edit => other_edit, :form_type_id => ft.id)

branches/baseline/test/unit/asset_type_test.rb

@@ -15 +15 @@
-    # Create an asset type
-    @icon = AssetTypeIcon.create!(:file => uploaded_file('assets.png', 'image/png', 'test_icon.png'))
-, :set_typical_maintenance_time_interval => {:months => 1}
-, :set_typical_maintenance_time_interval => {:months => 1}
+
+
-
-    # Create two assets to the asset type, which the user is authorized to read and to create some data to them.
@@ -62 +62 @@
-  end
-
-  def test_set_and_get_typical_maintenance_time_interval
-    time = {:years => 1, :months => 2, :days => 3, :hours => 4, :minutes => 5}
-    time_str = {'years' => '1', 'months' => '2', 'days' => '3', 'hours' => '4', 'minutes' => '5'}
-    time_in_seconds = AssetType::YEAR + 2*AssetType::MONTH + 3*AssetType::DAY + 4*AssetType::HOUR + 5*AssetType::MINUTE
-
-    @asset_type.set_typical_maintenance_time_interval = time
-    assert_equal time_in_seconds, @asset_type.typical_maintenance_time_interval
-    @asset_type.set_typical_maintenance_time_interval = time_str
-    assert_equal time_in_seconds, @asset_type.typical_maintenance_time_interval
-    assert_equal time, @asset_type.get_typical_maintenance_time_interval
-  end
-
-  def test_typical_maintenance_time_intervals_positivity
-    icon = AssetTypeIcon.create!(:file => uploaded_file('assets.png', 'image/png', 'test_icon.png'))
-    asset_type = AssetType.new(:name => 'Unigue', :asset_type_icon_id => icon.id)
-    asset_type.typical_maintenance_time_interval = 0
-    assert_equal false, asset_type.valid?
-    asset_type.typical_maintenance_time_interval = 1
-    assert_equal true, asset_type.valid?
-  end
-
-  # Function: test_destroy_associated_data
-  # ======================================

branches/baseline/test/unit/protected_data_test.rb

@@ -30 +30 @@
-    # Create a task to which the @user_group has all permissions and
-    # @another_user_group has read and change state permissions to the task.
+    @task_type = TaskType.create!(:name => 'Valid name')
-    @task_authorized_to_edit = create_task(@root_asset, true, 'Test task')
-    @wop1 = @task_authorized_to_edit.data_permissions.create!(:user_group_id => @user_group.id, :group_read => true, :group_change_state => true, :group_edit => true)
@@ -488 +489 @@
-  def test_before_create_form_without_user
-    User.current_user = nil
+    ft = FormType.create!(:name => 'Valid name', :ready => true, :editable => true)
-    r = Form.new
+    r.form_type = ft
-    r.asset = @root_asset
-    assert_equal true, r.valid?
@@ -499 +502 @@
-
-    # New object can only be saved if creator has creation permission to object's asset.
+    ft = FormType.create!(:name => 'Valid name', :ready => true, :editable => true)
-    r = Form.new
+    r.form_type = ft
-    r.asset = asset
-    assert_equal true, r.valid?
@@ -519 +524 @@
-    # New object can only be saved if creator has creation permission to object's asset.
-    w = Task.new(:short_description => 'Short description')
+    w.task_type = @task_type
-    w.asset = asset
-    assert_equal true, w.valid?
@@ -712 +718 @@
-  def test_before_update_stateless_data
-    setup_extra_forms
-
+, :ready => true, :editable => true
-
-    # User doesn't have permission to change state or/and edit these objects, so saving should fail.

branches/baseline/test/unit/task_test.rb

@@ -15 +15 @@
-
-    # Create test task
+    @task_type = TaskType.create(:name => 'Valid name')
-    @valid_task = Task.new
+    @valid_task.task_type = @task_type
-    @valid_task.asset = @root_asset
-    @valid_task.short_description = 'asdf'
@@ -239 +241 @@
-  end
-
-  def test_calculate_resource_usage
-    Task.delete_all
-    assert_equal 0, Task.count  
-
-    # Create test tasks
-    wo1 = Task.new(:short_description => 'test1', :starting_time => 1.hours.from_now, :deadline => 3.hours.from_now, :estimated_working_time => 1)
-    wo1.asset = @root_asset
-    wo1.ready = true
-    wo1.save
-
-    wo2 = Task.new(:short_description => 'test2', :starting_time => 2.hours.from_now, :deadline => 5.hours.from_now, :estimated_working_time => 10)
-    wo2.asset = @root_asset
-    wo2.ready = true
-    wo2.save
-
-    wo3 = Task.new(:short_description => 'test3', :starting_time => nil, :deadline => 3.hours.from_now, :estimated_working_time => 100)
-    wo3.asset = @root_asset
-    wo3.ready = true
-    wo3.save
-
-    wo4 = Task.new(:short_description => 'test4', :starting_time => 2.hours.from_now, :deadline => nil, :estimated_working_time => 1000)
-    wo4.asset = @root_asset
-    wo4.ready = true
-    wo4.save
-
-    assert_equal 4, Task.count  
-
-    assert_equal [100.0, 101.0, 1111.0, 1010.0, 1010.0, 1000.0], Task.calculate_resource_usage(['asset_id = ?', @root_asset.id], 5.hours, 1.hours)
-  
-  end
-
-end