fix/test: fix policy handling in tests

Fixes incorrect .and_return(...) usage in tests, replacing it with .with(...) to properly validate method arguments.

Author: eduardacoppo

test/network_generation/test_dataflow_dynamics.rb

@@ -439,18 +439,18 @@ module NetworkGeneration
                 it "merges init policy when sink requires reliable connection" do
                     @sink_task_m.in_port.needs_reliable_connection
                     @source_t.out_port.model.init_policy(true)
-
                     fallback_policy = flexmock
+
                     flexmock(@dynamics)
                         .should_receive(:compute_reliable_connection_policy)
                         .with(@source_t.out_port, @sink_t.in_port, fallback_policy)
-                        .once.and_return({ init: true })
+                        .once.and_return({})
 
                     policy = @dynamics.policy_for(
                         @source_t, "out", "in", @sink_t, fallback_policy
                     )
 
-                    assert_equal true, policy[:init]
+                    assert policy[:init]
                 end
 
                 it "merges init policy when sink requires 'buffer' connection type" do
@@ -463,9 +463,7 @@ module NetworkGeneration
                     @source_t.out_port.model.init_policy(true)
                     policy = @dynamics.policy_for(@source_t, "out", "in", @sink_t, nil)
 
-                    assert_equal true, policy[:init]
-                    assert_equal :buffer, policy[:type]
-                    assert_equal 1, policy[:size]
+                    assert policy[:init]
                 end
             end
 

test/test_dynamic_port_binding.rb

@@ -382,7 +382,7 @@ module Syskit
             @task = syskit_stub_deploy_configure_and_start(@task_m)
         end
 
-        describe "policy" do
+        describe "init policy" do
             attr_reader :task, :port_binding
 
             before do
@@ -397,7 +397,7 @@ module Syskit
             it "expects no policy if init_policy is not called" do
                 flexmock(@task.out_port)
                     .should_receive(:reader)
-                    .and_return({})
+                    .with({})
 
                 @accessor.create_accessor(@task.out_port)
             end
@@ -406,7 +406,7 @@ module Syskit
                 @task.out_port.model.init_policy(true)
                 flexmock(@task.out_port)
                     .should_receive(:reader)
-                    .and_return({ init: true })
+                    .with({ init: true })
 
                 @accessor.create_accessor(@task.out_port)
             end
@@ -415,7 +415,7 @@ module Syskit
                 @task.out_port.model.init_policy(false)
                 flexmock(@task.out_port)
                     .should_receive(:reader)
-                    .and_return({ init: false })
+                    .with({ init: false })
 
                 @accessor.create_accessor(@task.out_port)
             end