Skip to content

Commit

Permalink
Fix weeding tests because big_weed was removed (#186)
Browse files Browse the repository at this point in the history
I was too impatient, when I pushed
13b7d6f.
So this fixes the failing tests.
Big_weed was removed but some tests still used it.
  • Loading branch information
pascalzauberzeug committed Sep 25, 2024
1 parent 13b7d6f commit 81581ef
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions tests/test_weeding.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
async def test_working_with_weeding_screw(system: System, detector: rosys.vision.DetectorSimulation):
detector.simulated_objects.append(rosys.vision.SimulatedObject(category_name='maize',
position=rosys.geometry.Point3d(x=0.2, y=0.0, z=0)))
detector.simulated_objects.append(rosys.vision.SimulatedObject(category_name='big_weed',
detector.simulated_objects.append(rosys.vision.SimulatedObject(category_name='weed',
position=rosys.geometry.Point3d(x=0.2, y=0.05, z=0)))
system.current_implement = system.implements['Weed Screw']
system.current_navigation = system.straight_line_navigation
Expand All @@ -22,7 +22,7 @@ async def test_working_with_weeding_screw(system: System, detector: rosys.vision
async def test_keep_crops_safe(system: System, detector: rosys.vision.DetectorSimulation):
detector.simulated_objects.append(rosys.vision.SimulatedObject(category_name='maize',
position=rosys.geometry.Point3d(x=0.2, y=0.0, z=0)))
detector.simulated_objects.append(rosys.vision.SimulatedObject(category_name='big_weed',
detector.simulated_objects.append(rosys.vision.SimulatedObject(category_name='weed',
position=rosys.geometry.Point3d(x=0.2, y=system.field_friend.DRILL_RADIUS-0.01, z=0)))
system.current_implement = system.implements['Weed Screw']
system.current_navigation = system.straight_line_navigation
Expand All @@ -32,11 +32,11 @@ async def test_keep_crops_safe(system: System, detector: rosys.vision.DetectorSi
assert detector.simulated_objects[0].category_name == 'maize'


@pytest.mark.skip(reason='Needs to be rewritten to ignore specific weeds')
@pytest.mark.skip(reason='We currently do not differentiate between different weed types')
async def test_weeding_screw_only_targets_big_weed(system: System, detector: rosys.vision.DetectorSimulation):
detector.simulated_objects.append(rosys.vision.SimulatedObject(category_name='weed',
position=rosys.geometry.Point3d(x=0.2, y=0.0, z=0)))
detector.simulated_objects.append(rosys.vision.SimulatedObject(category_name='big_weed',
detector.simulated_objects.append(rosys.vision.SimulatedObject(category_name='coin',
position=rosys.geometry.Point3d(x=0.15, y=0, z=0)))
system.current_implement = system.implements['Weed Screw']
system.current_navigation = system.straight_line_navigation
Expand All @@ -47,9 +47,9 @@ async def test_weeding_screw_only_targets_big_weed(system: System, detector: ros


async def test_weeding_screw_does_not_skip_close_weed(system: System, detector: rosys.vision.DetectorSimulation):
detector.simulated_objects.append(rosys.vision.SimulatedObject(category_name='big_weed',
detector.simulated_objects.append(rosys.vision.SimulatedObject(category_name='weed',
position=rosys.geometry.Point3d(x=0.2, y=0, z=0)))
detector.simulated_objects.append(rosys.vision.SimulatedObject(category_name='big_weed',
detector.simulated_objects.append(rosys.vision.SimulatedObject(category_name='weed',
position=rosys.geometry.Point3d(x=0.2+system.field_friend.DRILL_RADIUS-0.01, y=0.05, z=0)))
system.current_implement = system.implements['Weed Screw']
system.current_navigation = system.straight_line_navigation
Expand All @@ -61,9 +61,9 @@ async def test_weeding_screw_does_not_skip_close_weed(system: System, detector:
async def test_weeding_screw_focus_on_weed_close_to_crop(system: System, detector: rosys.vision.DetectorSimulation):
detector.simulated_objects.append(rosys.vision.SimulatedObject(category_name='maize',
position=rosys.geometry.Point3d(x=0.2, y=0.0, z=0)))
detector.simulated_objects.append(rosys.vision.SimulatedObject(category_name='big_weed',
detector.simulated_objects.append(rosys.vision.SimulatedObject(category_name='weed',
position=rosys.geometry.Point3d(x=0.1, y=0, z=0)))
detector.simulated_objects.append(rosys.vision.SimulatedObject(category_name='big_weed',
detector.simulated_objects.append(rosys.vision.SimulatedObject(category_name='weed',
position=rosys.geometry.Point3d(x=0.16, y=0, z=0)))
system.current_implement = system.implements['Weed Screw']
system.current_navigation = system.straight_line_navigation
Expand All @@ -73,7 +73,7 @@ async def test_weeding_screw_focus_on_weed_close_to_crop(system: System, detecto
system.automator.start()
await forward(40)
assert len(detector.simulated_objects) == 2
assert detector.simulated_objects[1].category_name == 'big_weed'
assert detector.simulated_objects[1].category_name == 'weed'
assert detector.simulated_objects[1].position.x == 0.1


Expand Down

0 comments on commit 81581ef

Please sign in to comment.