Skip to content

fix(Test): no more guarantee on colocation issue order #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MelchiorSchuh merged 5 commits into from
Feb 15, 2025
Merged

fix(Test): no more guarantee on colocation issue order #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
82d6262
fix(Test): no more guarantee on colocation issue order
panquez Feb 13, 2025
eaaa662
fixing all tests
panquez Feb 15, 2025
1a71340
fix copy paste
panquez Feb 15, 2025
b3a5080
same
panquez Feb 15, 2025
9577f08
same
panquez Feb 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions bindings/python/tests/test-py-edgedcurve-colocation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ def check_colocation2D():
raise ValueError(
"[Test] EdgedCurve has wrong number of colocated points groups.")
first_colocated_points_group = [0, 1, 6]
if not colocation_inspector.colocated_points_groups().issues()[0] == first_colocated_points_group:
second_colocated_points_group = [3, 5]
if not colocation_inspector.colocated_points_groups().issues()[0] == first_colocated_points_group and not colocation_inspector.colocated_points_groups().issues()[0] == second_colocated_points_group:
raise ValueError(
"[Test] EdgedCurve has wrong first colocated points group.")
second_colocated_points_group = [3, 5]
if not colocation_inspector.colocated_points_groups().issues()[1] == second_colocated_points_group:
if not colocation_inspector.colocated_points_groups().issues()[1] == first_colocated_points_group and not colocation_inspector.colocated_points_groups().issues()[1] == second_colocated_points_group:
raise ValueError(
"[Test] EdgedCurve has wrong second colocated points group.")

Expand Down Expand Up @@ -114,11 +114,11 @@ def check_colocation3D():
raise ValueError(
"[Test] (3D) EdgedCurve has wrong number ofgroup of colocated points.")
first_colocated_points_group = [0, 1, 6]
if not colocation_inspector.colocated_points_groups().issues()[0] == first_colocated_points_group:
second_colocated_points_group = [3, 5]
if not colocation_inspector.colocated_points_groups().issues()[0] == first_colocated_points_group and not colocation_inspector.colocated_points_groups().issues()[0] == second_colocated_points_group:
raise ValueError(
"[Test] (3D) EdgedCurve has wrong first colocated points group.")
second_colocated_points_group = [3, 5]
if not colocation_inspector.colocated_points_groups().issues()[1] == second_colocated_points_group:
if not colocation_inspector.colocated_points_groups().issues()[1] == first_colocated_points_group and not colocation_inspector.colocated_points_groups().issues()[1] == second_colocated_points_group:
raise ValueError(
"[Test] (3D) EdgedCurve has wrong second colocated points group.")

Expand Down
12 changes: 6 additions & 6 deletions bindings/python/tests/test-py-pointset-colocation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@ def check_colocation2D():
raise ValueError(
"[Test] PointSet has wrong number of group of colocated points.")
first_colocated_points_group = [0, 1, 6]
if not colocation_inspector.colocated_points_groups().issues()[0] == first_colocated_points_group:
second_colocated_points_group = [3, 5]
if not colocation_inspector.colocated_points_groups().issues()[0] == first_colocated_points_group and not colocation_inspector.colocated_points_groups().issues()[0] == second_colocated_points_group:
raise ValueError(
"[Test] PointSet has wrong first colocated points group.")
second_colocated_points_group = [3, 5]
if not colocation_inspector.colocated_points_groups().issues()[1] == second_colocated_points_group:
if colocation_inspector.colocated_points_groups().issues()[1] == first_colocated_points_group and not colocation_inspector.colocated_points_groups().issues()[1] == second_colocated_points_group:
raise ValueError(
"[Test] PointSet has wrong second colocated points group.")

Expand Down Expand Up @@ -115,11 +115,11 @@ def check_colocation3D():
raise ValueError(
"[Test] (3D) PointSet has wrong number of colocated points.")
first_colocated_points_group = [0, 1, 6]
if not colocation_inspector.colocated_points_groups().issues()[0] == first_colocated_points_group:
second_colocated_points_group = [3, 5]
if not colocation_inspector.colocated_points_groups().issues()[0] == first_colocated_points_group and not colocation_inspector.colocated_points_groups().issues()[0] == second_colocated_points_group:
raise ValueError(
"[Test] (3D) PointSet has wrong first colocated points group.")
second_colocated_points_group = [3, 5]
if not colocation_inspector.colocated_points_groups().issues()[1] == second_colocated_points_group:
if not colocation_inspector.colocated_points_groups().issues()[1] == first_colocated_points_group and not colocation_inspector.colocated_points_groups().issues()[1] == second_colocated_points_group:
raise ValueError(
"[Test] (3D) PointSet has wrong second colocated points group.")

Expand Down
6 changes: 3 additions & 3 deletions bindings/python/tests/test-py-solid-colocation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ def check_colocation():
if not colocation_inspector.colocated_points_groups().nb_issues() == 2:
raise ValueError("[Test] Solid has wrong number of colocated points.")
first_colocated_points_group = [0, 1, 6]
if not colocation_inspector.colocated_points_groups().issues()[0] == first_colocated_points_group:
second_colocated_points_group = [3, 5]
if not colocation_inspector.colocated_points_groups().issues()[0] == first_colocated_points_group and not colocation_inspector.colocated_points_groups().issues()[0] == second_colocated_points_group:
raise ValueError(
"[Test] Solid has wrong first colocated points group.")
second_colocated_points_group = [3, 5]
if not colocation_inspector.colocated_points_groups().issues()[1] == second_colocated_points_group:
if not colocation_inspector.colocated_points_groups().issues()[1] == first_colocated_points_group and not colocation_inspector.colocated_points_groups().issues()[1] == second_colocated_points_group:
raise ValueError(
"[Test] Solid has wrong second colocated points group.")

Expand Down
12 changes: 6 additions & 6 deletions bindings/python/tests/test-py-surface-colocation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ def check_colocation2D():
raise ValueError(
"[Test] Surface has wrong number of colocated points.")
first_colocated_points_group = [0, 1, 6]
if not colocation_inspector.colocated_points_groups().issues()[0] == first_colocated_points_group:
second_colocated_points_group = [3, 5]
if not colocation_inspector.colocated_points_groups().issues()[0] == first_colocated_points_group and not colocation_inspector.colocated_points_groups().issues()[0] == second_colocated_points_group:
raise ValueError(
"[Test] Surface has wrong first colocated points group.")
second_colocated_points_group = [3, 5]
if not colocation_inspector.colocated_points_groups().issues()[1] == second_colocated_points_group:
if not colocation_inspector.colocated_points_groups().issues()[1] == first_colocated_points_group and not colocation_inspector.colocated_points_groups().issues()[1] == second_colocated_points_group:
raise ValueError(
"[Test] Surface has wrong second colocated points group.")

Expand Down Expand Up @@ -114,11 +114,11 @@ def check_colocation3D():
raise ValueError(
"[Test] (3D) Surface has wrong number of colocated points.")
first_colocated_points_group = [0, 1, 6]
if not colocation_inspector.colocated_points_groups().issues()[0] == first_colocated_points_group:
second_colocated_points_group = [3, 5]
if not colocation_inspector.colocated_points_groups().issues()[0] == first_colocated_points_group and not colocation_inspector.colocated_points_groups().issues()[0] == second_colocated_points_group:
raise ValueError(
"[Test] (3D) Surface has wrong first colocated points group.")
second_colocated_points_group = [3, 5]
if not colocation_inspector.colocated_points_groups().issues()[1] == second_colocated_points_group:
if not colocation_inspector.colocated_points_groups().issues()[1] == first_colocated_points_group and not colocation_inspector.colocated_points_groups().issues()[1] == second_colocated_points_group:
raise ValueError(
"[Test] (3D) Surface has wrong second colocated points group.")

Expand Down
20 changes: 14 additions & 6 deletions tests/inspector/test-edgedcurve-colocation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,16 @@ void check_colocation2D()
OPENGEODE_EXCEPTION( nb_colocated_points == 5,
"[Test] EdgedCurve has wrong number of colocated points." );
const std::vector< geode::index_t > first_colocated_points_group{ 0, 1, 6 };
const std::vector< geode::index_t > second_colocated_points_group{ 3, 5 };
OPENGEODE_EXCEPTION(
colocated_points_groups.issues()[0] == first_colocated_points_group,
colocated_points_groups.issues()[0] == first_colocated_points_group
|| colocated_points_groups.issues()[0]
== second_colocated_points_group,
"[Test] EdgedCurve has wrong first colocated points group." );
const std::vector< geode::index_t > second_colocated_points_group{ 3, 5 };
OPENGEODE_EXCEPTION(
colocated_points_groups.issues()[1] == second_colocated_points_group,
colocated_points_groups.issues()[1] == second_colocated_points_group
|| colocated_points_groups.issues()[1]
== first_colocated_points_group,
"[Test] EdgedCurve has wrong second colocated points group." );
}

Expand Down Expand Up @@ -139,12 +143,16 @@ void check_colocation3D()
OPENGEODE_EXCEPTION( nb_colocated_points == 5,
"[Test] (3D) EdgedCurve has wrong number of colocated points." );
const std::vector< geode::index_t > first_colocated_points_group{ 0, 1, 6 };
const std::vector< geode::index_t > second_colocated_points_group{ 3, 5 };
OPENGEODE_EXCEPTION(
colocated_points_groups.issues()[0] == first_colocated_points_group,
colocated_points_groups.issues()[0] == first_colocated_points_group
|| colocated_points_groups.issues()[0]
== second_colocated_points_group,
"[Test] (3D) EdgedCurve has wrong first colocated points group." );
const std::vector< geode::index_t > second_colocated_points_group{ 3, 5 };
OPENGEODE_EXCEPTION(
colocated_points_groups.issues()[1] == second_colocated_points_group,
colocated_points_groups.issues()[1] == first_colocated_points_group
|| colocated_points_groups.issues()[1]
== second_colocated_points_group,
"[Test] (3D) EdgedCurve has wrong second colocated points group." );
}

Expand Down
20 changes: 14 additions & 6 deletions tests/inspector/test-pointset.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,16 @@ void check_colocation2D()
OPENGEODE_EXCEPTION( nb_colocated_points == 5,
"[Test] PointSet has wrong number of colocated points." );
const std::vector< geode::index_t > first_colocated_points_group{ 0, 1, 6 };
const std::vector< geode::index_t > second_colocated_points_group{ 3, 5 };
OPENGEODE_EXCEPTION(
colocated_points_groups.issues()[0] == first_colocated_points_group,
colocated_points_groups.issues()[0] == first_colocated_points_group
|| colocated_points_groups.issues()[0]
== second_colocated_points_group,
"[Test] PointSet has wrong first colocated points group." );
const std::vector< geode::index_t > second_colocated_points_group{ 3, 5 };
OPENGEODE_EXCEPTION(
colocated_points_groups.issues()[1] == second_colocated_points_group,
colocated_points_groups.issues()[1] == first_colocated_points_group
|| colocated_points_groups.issues()[1]
== second_colocated_points_group,
"[Test] PointSet has wrong second colocated points group." );
}

Expand Down Expand Up @@ -135,12 +139,16 @@ void check_colocation3D()
OPENGEODE_EXCEPTION( nb_colocated_points == 5,
"[Test] (3D) PointSet has wrong number of colocated points." );
const std::vector< geode::index_t > first_colocated_points_group{ 0, 1, 6 };
const std::vector< geode::index_t > second_colocated_points_group{ 3, 5 };
OPENGEODE_EXCEPTION(
colocated_points_groups.issues()[0] == first_colocated_points_group,
colocated_points_groups.issues()[0] == first_colocated_points_group
|| colocated_points_groups.issues()[0]
== second_colocated_points_group,
"[Test] (3D) PointSet has wrong first colocated points group." );
const std::vector< geode::index_t > second_colocated_points_group{ 3, 5 };
OPENGEODE_EXCEPTION(
colocated_points_groups.issues()[1] == second_colocated_points_group,
colocated_points_groups.issues()[1] == first_colocated_points_group
|| colocated_points_groups.issues()[1]
== second_colocated_points_group,
"[Test] (3D) PointSet has wrong second colocated points group." );
}

Expand Down
10 changes: 7 additions & 3 deletions tests/inspector/test-solid-colocation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,16 @@ void check_colocation()
OPENGEODE_EXCEPTION( nb_colocated_points == 5,
"[Test] Solid has wrong number of colocated points." );
const std::vector< geode::index_t > first_colocated_points_group{ 0, 1, 6 };
const std::vector< geode::index_t > second_colocated_points_group{ 3, 5 };
OPENGEODE_EXCEPTION(
colocated_points_groups.issues()[0] == first_colocated_points_group,
colocated_points_groups.issues()[0] == first_colocated_points_group
|| colocated_points_groups.issues()[0]
== second_colocated_points_group,
"[Test] Solid has wrong first colocated points group." );
const std::vector< geode::index_t > second_colocated_points_group{ 3, 5 };
OPENGEODE_EXCEPTION(
colocated_points_groups.issues()[1] == second_colocated_points_group,
colocated_points_groups.issues()[1] == second_colocated_points_group
|| colocated_points_groups.issues()[1]
== first_colocated_points_group,
"[Test] Solid has wrong second colocated points group." );
}

Expand Down
20 changes: 14 additions & 6 deletions tests/inspector/test-surface-colocation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,16 @@ void check_colocation2D()
OPENGEODE_EXCEPTION( nb_colocated_points == 5,
"[Test] Surface has wrong number of colocated points." );
const std::vector< geode::index_t > first_colocated_points_group{ 0, 1, 6 };
const std::vector< geode::index_t > second_colocated_points_group{ 3, 5 };
OPENGEODE_EXCEPTION(
colocated_points_groups.issues()[0] == first_colocated_points_group,
colocated_points_groups.issues()[0] == first_colocated_points_group
|| colocated_points_groups.issues()[0]
== second_colocated_points_group,
"[Test] Surface has wrong first colocated points group." );
const std::vector< geode::index_t > second_colocated_points_group{ 3, 5 };
OPENGEODE_EXCEPTION(
colocated_points_groups.issues()[1] == second_colocated_points_group,
colocated_points_groups.issues()[1] == second_colocated_points_group
|| colocated_points_groups.issues()[1]
== second_colocated_points_group,
"[Test] Surface has wrong second colocated points group." );
}

Expand Down Expand Up @@ -139,12 +143,16 @@ void check_colocation3D()
OPENGEODE_EXCEPTION( nb_colocated_points == 5,
"[Test] (3D) Surface has wrong number of colocated points." );
const std::vector< geode::index_t > first_colocated_points_group{ 0, 1, 6 };
const std::vector< geode::index_t > second_colocated_points_group{ 3, 5 };
OPENGEODE_EXCEPTION(
colocated_points_groups.issues()[0] == first_colocated_points_group,
colocated_points_groups.issues()[0] == first_colocated_points_group
|| colocated_points_groups.issues()[0]
== second_colocated_points_group,
"[Test] (3D) Surface has wrong first colocated points group." );
const std::vector< geode::index_t > second_colocated_points_group{ 3, 5 };
OPENGEODE_EXCEPTION(
colocated_points_groups.issues()[1] == second_colocated_points_group,
colocated_points_groups.issues()[1] == first_colocated_points_group
|| colocated_points_groups.issues()[1]
== second_colocated_points_group,
"[Test] (3D) Surface has wrong second colocated points group." );
}

Expand Down
Loading