Added tracking for the top level categories in each pack. #357
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ng if there are any duplicates between packs. Added an argument to bypass this if nessecary. Addded tests for both cases
klingbolt
changed the title
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
Full Diff
--- xml_converter/integration_tests/test_cases/proto_and_xml_input_allow_duplicates/input/pack2/markers.bin.textproto._old 2024-09-30 00:43:16.418871175 +0000
+++ xml_converter/integration_tests/test_cases/proto_and_xml_input_allow_duplicates/input/pack2/markers.bin.textproto._new 2024-09-30 00:43:16.426871135 +0000
@@ -0,0 +1,12 @@
+category {
+ name: "MyCategory"
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "(\350\314\006\302\223^\226"
+}
There was a problem hiding this comment.
Full Diff
--- xml_converter/integration_tests/test_cases/proto_and_xml_input_allow_duplicates/output_proto/markers.bin.textproto._old 2024-09-30 00:43:16.435871091 +0000
+++ xml_converter/integration_tests/test_cases/proto_and_xml_input_allow_duplicates/output_proto/markers.bin.textproto._new 2024-09-30 00:43:16.442871057 +0000
@@ -0,0 +1,28 @@
+category {
+ name: "MyCategory"
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "(\350\314\006\302\223^\226"
+}
There was a problem hiding this comment.
Full Diff
--- xml_converter/integration_tests/test_cases/proto_and_xml_input_no_duplicates/input/pack2/markers.bin.textproto._old 2024-09-30 00:43:16.449871023 +0000
+++ xml_converter/integration_tests/test_cases/proto_and_xml_input_no_duplicates/input/pack2/markers.bin.textproto._new 2024-09-30 00:43:16.457870984 +0000
@@ -0,0 +1,12 @@
+category {
+ name: "MyCategory"
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "(\350\314\006\302\223^\226"
+}
AsherGlick
requested changes
Oct 1, 2024
…mbining set, error handling for argument parsing
There was a problem hiding this comment.
Full Diff
--- xml_converter/integration_tests/test_cases/proto_and_xml_input_allow_duplicates/input/pack2/markers.bin.textproto._old 2024-10-02 03:05:21.892076970 +0000
+++ xml_converter/integration_tests/test_cases/proto_and_xml_input_allow_duplicates/input/pack2/markers.bin.textproto._new 2024-10-02 03:05:21.900077036 +0000
@@ -0,0 +1,12 @@
+category {
+ name: "MyCategory"
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "(\350\314\006\302\223^\226"
+}
There was a problem hiding this comment.
Full Diff
--- xml_converter/integration_tests/test_cases/proto_and_xml_input_allow_duplicates/output_proto/markers.bin.textproto._old 2024-10-02 03:05:21.908077101 +0000
+++ xml_converter/integration_tests/test_cases/proto_and_xml_input_allow_duplicates/output_proto/markers.bin.textproto._new 2024-10-02 03:05:21.916077166 +0000
@@ -0,0 +1,28 @@
+category {
+ name: "MyCategory"
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "(\350\314\006\302\223^\226"
+}
There was a problem hiding this comment.
Full Diff
--- xml_converter/integration_tests/test_cases/proto_and_xml_input_no_duplicates/input/pack2/markers.bin.textproto._old 2024-10-02 03:05:21.923077223 +0000
+++ xml_converter/integration_tests/test_cases/proto_and_xml_input_no_duplicates/input/pack2/markers.bin.textproto._new 2024-10-02 03:05:21.931077289 +0000
@@ -0,0 +1,12 @@
+category {
+ name: "MyCategory"
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "(\350\314\006\302\223^\226"
+}
AsherGlick
reviewed
Oct 16, 2024
AsherGlick
reviewed
Oct 16, 2024
AsherGlick
reviewed
Oct 16, 2024
AsherGlick
requested changes
Oct 16, 2024
… conflicts are communicated
There was a problem hiding this comment.
Full Diff
--- xml_converter/integration_tests/test_cases/proto_and_xml_input_allow_duplicates/input/pack2/markers.bin.textproto._old 2024-11-11 02:57:11.383991655 +0000
+++ xml_converter/integration_tests/test_cases/proto_and_xml_input_allow_duplicates/input/pack2/markers.bin.textproto._new 2024-11-11 02:57:11.391991647 +0000
@@ -0,0 +1,12 @@
+category {
+ name: "MyCategory"
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "(\350\314\006\302\223^\226"
+}
There was a problem hiding this comment.
Full Diff
--- xml_converter/integration_tests/test_cases/proto_and_xml_input_allow_duplicates/output_proto/markers.bin.textproto._old 2024-11-11 02:57:11.399991639 +0000
+++ xml_converter/integration_tests/test_cases/proto_and_xml_input_allow_duplicates/output_proto/markers.bin.textproto._new 2024-11-11 02:57:11.407991629 +0000
@@ -0,0 +1,28 @@
+category {
+ name: "MyCategory"
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "(\350\314\006\302\223^\226"
+}
There was a problem hiding this comment.
Full Diff
--- xml_converter/integration_tests/test_cases/proto_and_xml_input_no_duplicates/input/pack2/markers.bin.textproto._old 2024-11-11 02:57:11.415991621 +0000
+++ xml_converter/integration_tests/test_cases/proto_and_xml_input_no_duplicates/input/pack2/markers.bin.textproto._new 2024-11-11 02:57:11.423991613 +0000
@@ -0,0 +1,12 @@
+category {
+ name: "MyCategory"
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "(\350\314\006\302\223^\226"
+}
AsherGlick
requested changes
Nov 12, 2024
xml_converter/integration_tests/test_cases/proto_and_xml_input_no_duplicates/testcase.yaml
Outdated
Show resolved
Hide resolved
xml_converter/integration_tests/test_cases/proto_and_xml_input_no_duplicates/testcase.yaml
Outdated
Show resolved
Hide resolved
…file by suffix function to return relative paths
There was a problem hiding this comment.
Full Diff
--- xml_converter/integration_tests/test_cases/proto_and_xml_input_allow_duplicates/input/pack2/markers.bin.textproto._old 2024-11-13 00:22:41.909758062 +0000
+++ xml_converter/integration_tests/test_cases/proto_and_xml_input_allow_duplicates/input/pack2/markers.bin.textproto._new 2024-11-13 00:22:41.917758143 +0000
@@ -0,0 +1,12 @@
+category {
+ name: "MyCategory"
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "(\350\314\006\302\223^\226"
+}
There was a problem hiding this comment.
Full Diff
--- xml_converter/integration_tests/test_cases/proto_and_xml_input_allow_duplicates/output_proto/markers.bin.textproto._old 2024-11-13 00:22:41.961758593 +0000
+++ xml_converter/integration_tests/test_cases/proto_and_xml_input_allow_duplicates/output_proto/markers.bin.textproto._new 2024-11-13 00:22:41.969758675 +0000
@@ -0,0 +1,28 @@
+category {
+ name: "MyCategory"
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "(\350\314\006\302\223^\226"
+}
There was a problem hiding this comment.
Full Diff
--- xml_converter/integration_tests/test_cases/proto_and_xml_input_no_duplicates/input/pack2/markers.bin.textproto._old 2024-11-13 00:22:41.977758756 +0000
+++ xml_converter/integration_tests/test_cases/proto_and_xml_input_no_duplicates/input/pack2/markers.bin.textproto._new 2024-11-13 00:22:41.985758838 +0000
@@ -0,0 +1,12 @@
+category {
+ name: "MyCategory"
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "(\350\314\006\302\223^\226"
+}
There was a problem hiding this comment.
Full Diff
--- xml_converter/integration_tests/test_cases/proto_and_xml_input_allow_duplicates/input/pack2/markers.bin.textproto._old 2024-11-14 07:24:27.334909730 +0000
+++ xml_converter/integration_tests/test_cases/proto_and_xml_input_allow_duplicates/input/pack2/markers.bin.textproto._new 2024-11-14 07:24:27.342909771 +0000
@@ -0,0 +1,12 @@
+category {
+ name: "MyCategory"
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "(\350\314\006\302\223^\226"
+}
There was a problem hiding this comment.
Full Diff
--- xml_converter/integration_tests/test_cases/proto_and_xml_input_allow_duplicates/output_proto/markers.bin.textproto._old 2024-11-14 07:24:27.354909833 +0000
+++ xml_converter/integration_tests/test_cases/proto_and_xml_input_allow_duplicates/output_proto/markers.bin.textproto._new 2024-11-14 07:24:27.358909854 +0000
@@ -0,0 +1,28 @@
+category {
+ name: "MyCategory"
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "(\350\314\006\302\223^\226"
+}
There was a problem hiding this comment.
Full Diff
--- xml_converter/integration_tests/test_cases/proto_and_xml_input_no_duplicates/input/pack2/markers.bin.textproto._old 2024-11-14 07:24:27.366909895 +0000
+++ xml_converter/integration_tests/test_cases/proto_and_xml_input_no_duplicates/input/pack2/markers.bin.textproto._new 2024-11-14 07:24:27.374909938 +0000
@@ -0,0 +1,12 @@
+category {
+ name: "MyCategory"
+ icon {
+ map_id: 50
+ position {
+ x: 169.81
+ y: 210.65
+ z: 215.83
+ }
+ }
+ id: "(\350\314\006\302\223^\226"
+}
AsherGlick
approved these changes
Nov 14, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Stops writing if there are any duplicates between packs. Added an argument to bypass this if necessary. Added tests for both cases