Skip to content

Commit ae05895

Browse files
ahojukka5ahojukka5
committed
fix(tests): fix incorrectly converted single-parameter world::create calls
The automated script incorrectly converted single-parameter calls like world::create({8, 8, 8}) to 3-parameter calls. Fix them to use GridSize wrapper: world::create(GridSize({8, 8, 8}))
1 parent 1caaeb6 commit ae05895

File tree

7 files changed

+26
-26
lines changed

7 files changed

+26
-26
lines changed

‎tests/unit/core/test_decomposition.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ using namespace pfc;
1212

1313
TEST_CASE("Decomposition - basic functionality", "[decomposition][unit]") {
1414
// Create a dummy World object for testing
15-
auto world = world::create(GridSize({128), PhysicalOrigin(128), GridSpacing(128}));
15+
auto world = world::create(GridSize({128, 128, 128}));
1616

1717
SECTION("Construction and getters") {
1818
auto decomposition = decomposition::create(world, 1);

‎tests/unit/core/test_halo_pattern.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
using namespace pfc;
1717

1818
TEST_CASE("Create send halo for +X direction", "[halo][pattern]") {
19-
auto world = world::create(GridSize({64), PhysicalOrigin(64), GridSpacing(64}));
19+
auto world = world::create(GridSize({64, 64, 64}));
2020
auto decomp = decomposition::create(world, {2, 2, 1}); // 2×2×1 = 4 ranks
2121

2222
int rank = 0;
@@ -46,7 +46,7 @@ TEST_CASE("Create send halo for +X direction", "[halo][pattern]") {
4646
}
4747

4848
TEST_CASE("Create recv halo for +X direction", "[halo][pattern]") {
49-
auto world = world::create(GridSize({64), PhysicalOrigin(64), GridSpacing(64}));
49+
auto world = world::create(GridSize({64, 64, 64}));
5050
auto decomp = decomposition::create(world, {2, 2, 1});
5151

5252
int rank = 0;
@@ -76,7 +76,7 @@ TEST_CASE("Create recv halo for +X direction", "[halo][pattern]") {
7676
}
7777

7878
TEST_CASE("Send and recv halo have same size", "[halo][pattern]") {
79-
auto world = world::create(GridSize({64), PhysicalOrigin(64), GridSpacing(64}));
79+
auto world = world::create(GridSize({64, 64, 64}));
8080
auto decomp = decomposition::create(world, {2, 2, 1});
8181

8282
int rank = 0;
@@ -93,7 +93,7 @@ TEST_CASE("Send and recv halo have same size", "[halo][pattern]") {
9393
}
9494

9595
TEST_CASE("Create halo patterns for all face neighbors", "[halo][pattern]") {
96-
auto world = world::create(GridSize({64), PhysicalOrigin(64), GridSpacing(64}));
96+
auto world = world::create(GridSize({64, 64, 64}));
9797
auto decomp = decomposition::create(world, {2, 2, 1});
9898

9999
int rank = 0;
@@ -116,7 +116,7 @@ TEST_CASE("Create halo patterns for all face neighbors", "[halo][pattern]") {
116116
}
117117

118118
TEST_CASE("Gather from local field using send halo", "[halo][gather]") {
119-
auto world = world::create(GridSize({64), PhysicalOrigin(64), GridSpacing(64}));
119+
auto world = world::create(GridSize({64, 64, 64}));
120120
auto decomp = decomposition::create(world, {2, 2, 1});
121121

122122
int rank = 0;

‎tests/unit/core/test_world.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ TEST_CASE("World - physical_volume() calculates correctly",
333333
TEST_CASE("World - dimensionality checks work correctly",
334334
"[world][convenience][unit]") {
335335
SECTION("1D domain (nx > 1, ny = 1, nz = 1)") {
336-
auto world1d = world::create(GridSize({100), PhysicalOrigin(1), GridSpacing(1}));
336+
auto world1d = world::create(GridSize({100, 1, 1}));
337337

338338
REQUIRE(world::is_1d(world1d));
339339
REQUIRE_FALSE(world::is_2d(world1d));
@@ -342,7 +342,7 @@ TEST_CASE("World - dimensionality checks work correctly",
342342
}
343343

344344
SECTION("2D domain (nx > 1, ny > 1, nz = 1)") {
345-
auto world2d = world::create(GridSize({64), PhysicalOrigin(64), GridSpacing(1}));
345+
auto world2d = world::create(GridSize({64, 64, 1}));
346346

347347
REQUIRE_FALSE(world::is_1d(world2d));
348348
REQUIRE(world::is_2d(world2d));
@@ -351,7 +351,7 @@ TEST_CASE("World - dimensionality checks work correctly",
351351
}
352352

353353
SECTION("3D domain (nx > 1, ny > 1, nz > 1)") {
354-
auto world3d = world::create(GridSize({32), PhysicalOrigin(32), GridSpacing(32}));
354+
auto world3d = world::create(GridSize({32, 32, 32}));
355355

356356
REQUIRE_FALSE(world::is_1d(world3d));
357357
REQUIRE_FALSE(world::is_2d(world3d));
@@ -360,7 +360,7 @@ TEST_CASE("World - dimensionality checks work correctly",
360360
}
361361

362362
SECTION("Degenerate case (nx = 1, ny = 1, nz = 1)") {
363-
auto world_degenerate = world::create(GridSize({1), PhysicalOrigin(1), GridSpacing(1}));
363+
auto world_degenerate = world::create(GridSize({1, 1, 1}));
364364

365365
REQUIRE_FALSE(world::is_1d(world_degenerate));
366366
REQUIRE_FALSE(world::is_2d(world_degenerate));
@@ -370,7 +370,7 @@ TEST_CASE("World - dimensionality checks work correctly",
370370

371371
SECTION("Non-standard 2D (nx = 1, ny > 1, nz > 1)") {
372372
// This is NOT considered 2D by our definition
373-
auto world_yz = world::create(GridSize({1), PhysicalOrigin(64), GridSpacing(64}));
373+
auto world_yz = world::create(GridSize({1, 64, 64}));
374374

375375
REQUIRE_FALSE(world::is_1d(world_yz));
376376
REQUIRE_FALSE(world::is_2d(world_yz)); // Only x-y plane is 2D
@@ -509,7 +509,7 @@ TEST_CASE("World - convenience functions integrate with existing API",
509509
}
510510

511511
SECTION("Dimensionality checks consistent with size queries") {
512-
auto world2d = world::create(GridSize({128), PhysicalOrigin(128), GridSpacing(1}));
512+
auto world2d = world::create(GridSize({128, 128, 1}));
513513

514514
REQUIRE(world::is_2d(world2d));
515515
REQUIRE(world::get_size(world2d, 0) > 1);

‎tests/unit/field_modifiers/test_field_modifier.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ using namespace pfc;
1616

1717
TEST_CASE("FieldModifier - applies field modification to model",
1818
"[field_modifier][unit]") {
19-
auto world = world::create(GridSize({8), PhysicalOrigin(8), GridSpacing(8}));
19+
auto world = world::create(GridSize({8, 8, 8}));
2020
auto decomposition = decomposition::create(world, 1);
2121
auto fft = fft::create(decomposition);
2222
pfc::testing::MockModelWithModificationFlag model(world);
@@ -31,7 +31,7 @@ TEST_CASE("FieldModifier - applies field modification to model",
3131
}
3232

3333
TEST_CASE("FieldModifier - polymorphic usage", "[field_modifier][unit]") {
34-
auto world = world::create(GridSize({8), PhysicalOrigin(8), GridSpacing(8}));
34+
auto world = world::create(GridSize({8, 8, 8}));
3535
auto decomposition = decomposition::create(world, 1);
3636
auto fft = fft::create(decomposition);
3737
pfc::testing::MockModelWithModificationFlag model(world);
@@ -47,7 +47,7 @@ TEST_CASE("FieldModifier - polymorphic usage", "[field_modifier][unit]") {
4747
}
4848

4949
TEST_CASE("FieldModifier - move semantics", "[field_modifier][unit]") {
50-
auto world = world::create(GridSize({8), PhysicalOrigin(8), GridSpacing(8}));
50+
auto world = world::create(GridSize({8, 8, 8}));
5151
auto decomposition = decomposition::create(world, 1);
5252
auto fft = fft::create(decomposition);
5353
pfc::testing::MockModelWithModificationFlag model(world);
@@ -98,7 +98,7 @@ TEST_CASE("FieldModifier - input validation", "[field_modifier][unit][error]") {
9898
}
9999

100100
TEST_CASE("FieldModifier - works with MockModel", "[field_modifier][unit]") {
101-
auto world = world::create(GridSize({8), PhysicalOrigin(8), GridSpacing(8}));
101+
auto world = world::create(GridSize({8, 8, 8}));
102102
auto decomposition = decomposition::create(world, 1);
103103
auto fft = fft::create(decomposition);
104104
pfc::testing::MockModel model(world);

‎tests/unit/field_modifiers/test_ic_constant.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ TEST_CASE("Constant Field Modifier") {
3636
}
3737

3838
SECTION("Apply field modifier") {
39-
auto world = world::create(GridSize({8), PhysicalOrigin(1), GridSpacing(1}));
39+
auto world = world::create(GridSize({8, 1, 1}));
4040
auto decomposition = decomposition::create(world, 1);
4141
auto fft = fft::create(decomposition);
4242
ModelWithConstantIC m(world);
@@ -54,7 +54,7 @@ TEST_CASE("Constant Field Modifier") {
5454
}
5555

5656
TEST_CASE("IC Constant - FFT Integration", "[ic_constant]") {
57-
auto world = world::create(GridSize({8), PhysicalOrigin(8), GridSpacing(8}));
57+
auto world = world::create(GridSize({8, 8, 8}));
5858
auto decomposition = decomposition::create(world, 1);
5959
auto fft = fft::create(decomposition);
6060

@@ -64,7 +64,7 @@ TEST_CASE("IC Constant - FFT Integration", "[ic_constant]") {
6464
}
6565

6666
TEST_CASE("IC Constant - Model Integration", "[ic_constant]") {
67-
auto world = world::create(GridSize({8), PhysicalOrigin(8), GridSpacing(8}));
67+
auto world = world::create(GridSize({8, 8, 8}));
6868
auto decomposition = decomposition::create(world, 1);
6969
auto fft = fft::create(decomposition);
7070
ModelWithConstantIC model(world);

‎tests/unit/models/test_model.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ using pfc::types::Int3;
1818

1919
TEST_CASE("Model - basic functionality", "[model][unit]") {
2020
// Create an instance of the Model
21-
World world = world::create(GridSize({8), PhysicalOrigin(1), GridSpacing(1}));
21+
World world = world::create(GridSize({8, 1, 1}));
2222
pfc::testing::MockModel model(world);
2323

2424
REQUIRE(get_size(model.get_world()) == Int3{8, 1, 1});
@@ -83,7 +83,7 @@ TEST_CASE("Model - basic functionality", "[model][unit]") {
8383
}
8484

8585
TEST_CASE("Model::is_rank0() returns correct rank status", "[model][unit][rank]") {
86-
World world = world::create(GridSize({10), PhysicalOrigin(10), GridSpacing(10}));
86+
World world = world::create(GridSize({10, 10, 10}));
8787
pfc::testing::MockModel model(world);
8888

8989
// Initialize FFT (required for is_rank0 to be set)
@@ -101,7 +101,7 @@ TEST_CASE("Model::is_rank0() returns correct rank status", "[model][unit][rank]"
101101
}
102102

103103
TEST_CASE("Model::is_rank0() is const-correct", "[model][unit][rank]") {
104-
World world = world::create(GridSize({10), PhysicalOrigin(10), GridSpacing(10}));
104+
World world = world::create(GridSize({10, 10, 10}));
105105

106106
// Create model and set FFT to ensure m_rank0 is set
107107
pfc::testing::MockModel model(world);
@@ -121,7 +121,7 @@ TEST_CASE("Model::is_rank0() is const-correct", "[model][unit][rank]") {
121121
}
122122

123123
TEST_CASE("Model - error handling for non-existent fields", "[model][unit][error]") {
124-
World world = world::create(GridSize({8), PhysicalOrigin(8), GridSpacing(8}));
124+
World world = world::create(GridSize({8, 8, 8}));
125125
pfc::testing::MockModel model(world);
126126

127127
// Ensure FFT is set
@@ -188,7 +188,7 @@ TEST_CASE("Model - error handling for non-existent fields", "[model][unit][error
188188
}
189189

190190
TEST_CASE("Model - error handling for FFT access", "[model][unit][error]") {
191-
World world = world::create(GridSize({8), PhysicalOrigin(8), GridSpacing(8}));
191+
World world = world::create(GridSize({8, 8, 8}));
192192
pfc::testing::MockModel model(world);
193193

194194
SECTION("Accessing FFT before it's set throws std::runtime_error") {

‎tests/unit/simulator/test_simulator.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ using namespace pfc;
1616
using namespace pfc::types;
1717

1818
TEST_CASE("Simulator functionality", "[simulator][unit]") {
19-
auto world = world::create(GridSize({8), PhysicalOrigin(8), GridSpacing(8}));
19+
auto world = world::create(GridSize({8, 8, 8}));
2020
auto decomposition = decomposition::create(world, 1);
2121
auto fft = fft::create(decomposition);
2222

@@ -79,7 +79,7 @@ TEST_CASE("Simulator functionality", "[simulator][unit]") {
7979
}
8080

8181
TEST_CASE("Simulator - MockModel Integration", "[simulator]") {
82-
auto world = world::create(GridSize({8), PhysicalOrigin(8), GridSpacing(8}));
82+
auto world = world::create(GridSize({8, 8, 8}));
8383
auto decomposition = decomposition::create(world, 1);
8484
auto fft = fft::create(decomposition);
8585

0 commit comments

Comments
 (0)