Skip to content
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

Added tests for species filter #232

Merged
merged 4 commits into from
Nov 19, 2023
Merged

Added tests for species filter #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2fe5a1d
Added tests for species filter
klingbolt Nov 15, 2023
b050a20
Merge pull request #8 from klingbolt/xml_converter
klingbolt Nov 18, 2023
0758b09
Merge pull request #9 from klingbolt/xml_converter
klingbolt Nov 19, 2023
8782b75
Merge pull request #10 from klingbolt/xml_converter
klingbolt Nov 19, 2023
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
5 changes: 5 additions & 0 deletions xml_converter/intigration_tests/expected_outputs/proto_species_filter/markers.bin
View file
Open in desktop
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full Diff 
--- xml_converter/intigration_tests/expected_outputs/proto_species_filter/markers.bin.textproto._old	2023-11-19 23:29:10.555739564 +0000
+++ xml_converter/intigration_tests/expected_outputs/proto_species_filter/markers.bin.textproto._new	2023-11-19 23:29:10.563739448 +0000
@@ -0,0 +1,127 @@
+category {
+  name: "My Category"
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+    species_filter {
+      asura: true
+    }
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+    species_filter {
+      asura: true
+      charr: true
+    }
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+    species_filter {
+      asura: true
+      charr: true
+    }
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+    species_filter {
+      human: true
+      norn: true
+    }
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+    species_filter {
+      asura: true
+      charr: true
+      human: true
+      norn: true
+      sylvari: true
+    }
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+    species_filter {
+      asura: true
+    }
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+    species_filter {
+      asura: true
+      charr: true
+    }
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+    species_filter {
+      asura: true
+      charr: true
+    }
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+    species_filter {
+      human: true
+      norn: true
+    }
+  }
+  icon {
+    map_id: 50
+    position {
+      x: 169.81
+      y: 210.65
+      z: 215.83
+    }
+    species_filter {
+      asura: true
+      charr: true
+      human: true
+      norn: true
+      sylvari: true
+    }
+  }
+}

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@

­
My Category 2B\Ï)Cf¦RC{ÔWC‚ 2B\Ï)Cf¦RC{ÔWC‚ 2B\Ï)Cf¦RC{ÔWC‚ 2B\Ï)Cf¦RC{ÔWC‚  2B\Ï)Cf¦RC{ÔWC‚
 ( 2B\Ï)Cf¦RC{ÔWC‚ 2B\Ï)Cf¦RC{ÔWC‚ 2B\Ï)Cf¦RC{ÔWC‚ 2B\Ï)Cf¦RC{ÔWC‚  2B\Ï)Cf¦RC{ÔWC‚
 (
Expand Down
17 changes: 17 additions & 0 deletions xml_converter/intigration_tests/expected_outputs/xml_species_filter/xml_file.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<OverlayData>
<MarkerCategory DisplayName="My Category" Name="mycategory">
</MarkerCategory>

<POIs>
<POI Type="mycategory" MapID="50" XPos="169.809998" YPos="210.649994" ZPos="215.830002" Race="asura"/>
<POI Type="mycategory" MapID="50" XPos="169.809998" YPos="210.649994" ZPos="215.830002" Race="asura,charr"/>
<POI Type="mycategory" MapID="50" XPos="169.809998" YPos="210.649994" ZPos="215.830002" Race="asura,charr"/>
<POI Type="mycategory" MapID="50" XPos="169.809998" YPos="210.649994" ZPos="215.830002" Race="human,norn"/>
<POI Type="mycategory" MapID="50" XPos="169.809998" YPos="210.649994" ZPos="215.830002" Race="asura,charr,human,norn,sylvari"/>
<POI Type="mycategory" MapID="50" XPos="169.809998" YPos="210.649994" ZPos="215.830002" Race="asura"/>
<POI Type="mycategory" MapID="50" XPos="169.809998" YPos="210.649994" ZPos="215.830002" Race="asura,charr"/>
<POI Type="mycategory" MapID="50" XPos="169.809998" YPos="210.649994" ZPos="215.830002" Race="asura,charr"/>
<POI Type="mycategory" MapID="50" XPos="169.809998" YPos="210.649994" ZPos="215.830002" Race="human,norn"/>
<POI Type="mycategory" MapID="50" XPos="169.809998" YPos="210.649994" ZPos="215.830002" Race="asura,charr,human,norn,sylvari"/>
</POIs>
</OverlayData>
17 changes: 17 additions & 0 deletions xml_converter/intigration_tests/inputs/xml_species_filter/xml_file.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<OverlayData>
<MarkerCategory DisplayName="My Category" Name="mycategory">
</MarkerCategory>

<POIs>
<POI Race="asura" Type="mycategory" XPos="169.81" YPos="210.65" ZPos="215.83" MapID="50" />
<POI Race="asura,charr" Type="mycategory" XPos="169.81" YPos="210.65" ZPos="215.83" MapID="50" />
<POI Race="Asura, Charr" Type="mycategory" XPos="169.81" YPos="210.65" ZPos="215.83" MapID="50" />
<POI Race="Human,Norn" Type="mycategory" XPos="169.81" YPos="210.65" ZPos="215.83" MapID="50" />
<POI Race="asura,charr,human,norn,sylvari" Type="mycategory" XPos="169.81" YPos="210.65" ZPos="215.83" MapID="50" />
<POI Species="asura" Type="mycategory" XPos="169.81" YPos="210.65" ZPos="215.83" MapID="50" />
<POI Species="asura,charr" Type="mycategory" XPos="169.81" YPos="210.65" ZPos="215.83" MapID="50" />
<POI Species="Asura, Charr" Type="mycategory" XPos="169.81" YPos="210.65" ZPos="215.83" MapID="50" />
<POI Species="Human,Norn" Type="mycategory" XPos="169.81" YPos="210.65" ZPos="215.83" MapID="50" />
<POI Species="asura,charr,human,norn,sylvari" Type="mycategory" XPos="169.81" YPos="210.65" ZPos="215.83" MapID="50" />
</POIs>
</OverlayData>
6 changes: 6 additions & 0 deletions xml_converter/intigration_tests/testcases.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,4 +125,10 @@ class Testcase:
expected_output_xml_path="./expected_outputs/xml_specialization_filter",
expected_output_proto_path="./expected_outputs/proto_specialization_filter",
),
Testcase(
name="species_filter",
xml_input_paths=["./inputs/xml_species_filter"],
expected_output_xml_path="./expected_outputs/xml_species_filter",
expected_output_proto_path="./expected_outputs/proto_species_filter",
),
]
Loading