Skip to content

Commit

Permalink
Re #1791 two more merge errors
Browse files Browse the repository at this point in the history
  • Loading branch information
abuts committed Jan 20, 2025
1 parent f027477 commit 89165a9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion _test/test_admin/test_upgrade_file_format.m
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ function test_upgrade_single_mat(obj)
function check_container(~,uob_present,n_runs)
assertTrue(isa(uob_present,'unique_references_container'));
assertEqual(uob_present.n_objects,n_runs);
assertEqual(uob_present.n_unique_objects,1);
assertEqual(uob_present.n_unique,1);
uob_here= uob_present.unique_objects.unique_objects{1};
% hash has been calculated while putting into urc
assertTrue(uob_here.hash_defined)
Expand Down
6 changes: 3 additions & 3 deletions _test/test_sqw_file/test_faccess_sqw_v4.m
Original file line number Diff line number Diff line change
Expand Up @@ -408,11 +408,11 @@ function test_init_and_get(obj)
assertTrue(isa(exp_info.instruments,'unique_references_container'))

assertEqual(numel(exp_info.expdata),exp_info.detector_arrays.n_objects);
assertEqual(exp_info.detector_arrays.n_unique_objects,1);
assertEqual(exp_info.detector_arrays.n_unique,1);
assertEqual(numel(exp_info.expdata),exp_info.samples.n_objects);
assertEqual(exp_info.samples.n_unique_objects,1);
assertEqual(exp_info.samples.n_unique,1);
assertEqual(numel(exp_info.expdata),exp_info.instruments.n_objects);
assertEqual(exp_info.instruments.n_unique_objects,1);
assertEqual(exp_info.instruments.n_unique,1);

end
%
Expand Down

0 comments on commit 89165a9

Please sign in to comment.