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

Test for Proto Differ to ignore same comments #19

Closed
wants to merge 4 commits into from
Closed

Test for Proto Differ to ignore same comments #19

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
1c008ec
test modified file1
klingbolt Feb 5, 2025
e25070f
test modified file2
klingbolt Feb 5, 2025
3e946ae
return file1 to original
klingbolt Feb 5, 2025
fb63c0b
return test1 to first change
klingbolt Feb 5, 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
2 changes: 1 addition & 1 deletion xml_converter/integration_tests/test_cases/xml_category_inheritance/input/pack/xml_file.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<POI Type="mycategory" MapID="50" />
<POI Type="mycategory" XPos="170.81" MapID="50" />
<POI Type="mycategory" YPos="211.65" MapID="50" />

<POI Type="mycategory" MapID="50" XPos="100.809998" YPos="200.649994" ZPos="300.830002"/>
<POI Type="nestedlevel1" MapID="50" />
<POI Type="nestedlevel1.nestedlevel2" MapID="50" />
<POI Type="nestedlevel1.nestedlevel2.nestedlevel3" MapID="50" />
Expand Down
Binary file modified ...ter/integration_tests/test_cases/xml_category_inheritance/output_proto/markers.guildpoint
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/integration_tests/test_cases/xml_category_inheritance/output_proto/markers.guildpoint.textproto._old	2025-02-05 01:39:54.069336166 +0000
+++ xml_converter/integration_tests/test_cases/xml_category_inheritance/output_proto/markers.guildpoint.textproto._new	2025-02-05 01:39:54.076336111 +0000
@@ -23,6 +23,14 @@
       z: 215.83
     }
   }
+  icon {
+    map_id: 50
+    position {
+      x: 100.81
+      y: 200.65
+      z: 300.830017
+    }
+  }
   id: "(\350\314\006\302\223^\226"
 }
 category {

Copy link
Owner Author

Choose a reason for hiding this comment

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

Changing a file to generate a diff. Called File1

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/integration_tests/test_cases/xml_category_inheritance/output_proto/markers.guildpoint.textproto._old	2025-02-05 02:28:19.965347476 +0000
+++ xml_converter/integration_tests/test_cases/xml_category_inheritance/output_proto/markers.guildpoint.textproto._new	2025-02-05 02:28:19.972347558 +0000
@@ -23,6 +23,14 @@
       z: 215.83
     }
   }
+  icon {
+    map_id: 50
+    position {
+      x: 200.81
+      y: 400.65
+      z: 600.83
+    }
+  }
   id: "(\350\314\006\302\223^\226"
 }
 category {

Copy link
Owner Author

Choose a reason for hiding this comment

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

Another change to File1 generates a new comment. No comment of File2

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/integration_tests/test_cases/xml_category_inheritance/output_proto/markers.guildpoint.textproto._old	2025-02-05 02:30:09.035981693 +0000
+++ xml_converter/integration_tests/test_cases/xml_category_inheritance/output_proto/markers.guildpoint.textproto._new	2025-02-05 02:30:09.043981757 +0000
@@ -23,6 +23,14 @@
       z: 215.83
     }
   }
+  icon {
+    map_id: 50
+    position {
+      x: 100.81
+      y: 200.65
+      z: 300.830017
+    }
+  }
   id: "(\350\314\006\302\223^\226"
 }
 category {

Copy link
Owner Author

Choose a reason for hiding this comment

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

Changing File1 back to first commit generates a new comment. This keeps a record of changes to the file within the same PR.

Binary file not shown.
1 change: 1 addition & 0 deletions xml_converter/integration_tests/test_cases/xml_category_inheritance/output_xml/xml_file.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<POI Type="mycategory" MapID="50" XPos="169.809998" YPos="210.649994" ZPos="215.830002"/>
<POI Type="mycategory" MapID="50" XPos="170.809998" YPos="210.649994" ZPos="215.830002"/>
<POI Type="mycategory" MapID="50" XPos="169.809998" YPos="211.649994" ZPos="215.830002"/>
<POI Type="mycategory" MapID="50" XPos="100.809998" YPos="200.649994" ZPos="300.830017"/>
<POI Type="nestedlevel1" MapID="50" XPos="111.000000" YPos="0.000000" ZPos="0.000000"/>
<POI Type="nestedlevel1.nestedlevel2" MapID="50" XPos="111.000000" YPos="222.000000" ZPos="0.000000"/>
<POI Type="nestedlevel1.nestedlevel2.nestedlevel3" MapID="50" XPos="111.000000" YPos="222.000000" ZPos="333.000000"/>
Expand Down
1 change: 1 addition & 0 deletions xml_converter/integration_tests/test_cases/xml_category_name/input/pack/xml_file.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
<POI Type="mycategory" XPos="169.81" YPos="210.65" ZPos="215.83" MapID="50" />
<POI Type="Mycategory" XPos="169.81" YPos="210.65" ZPos="215.83" MapID="50" />
<POI Type="mYcAtEgOrY" XPos="169.81" YPos="210.65" ZPos="215.83" MapID="50" />
<POI Type="mycategory" MapID="50" XPos="100.809998" YPos="200.649994" ZPos="300.830002"/>
</POIs>
</OverlayData>
4 changes: 2 additions & 2 deletions xml_converter/integration_tests/test_cases/xml_category_name/output_proto/markers.guildpoint
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/integration_tests/test_cases/xml_category_name/output_proto/markers.guildpoint.textproto._old	2025-02-05 02:19:19.103009556 +0000
+++ xml_converter/integration_tests/test_cases/xml_category_name/output_proto/markers.guildpoint.textproto._new	2025-02-05 02:19:19.111009642 +0000
@@ -24,5 +24,13 @@
       z: 215.83
     }
   }
+  icon {
+    map_id: 50
+    position {
+      x: 100.81
+      y: 200.65
+      z: 300.830017
+    }
+  }
   id: "(\350\314\006\302\223^\226"
 }

Copy link
Owner Author

Choose a reason for hiding this comment

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

Changing a 2nd file. This commit did not generate a diff for File1

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

V
My Category 2B\Ï)Cf¦RC{ÔWC 2B\Ï)Cf¦RC{ÔWC 2B\Ï)Cf¦RC{ÔWCB(èÌ“^–
k
My Category 2B\Ï)Cf¦RC{ÔWC 2B\Ï)Cf¦RC{ÔWC 2B\Ï)Cf¦RC{ÔWC 2B¸žÉBf¦HC>j–CB(èÌ“^–
Expand Down
1 change: 1 addition & 0 deletions xml_converter/integration_tests/test_cases/xml_category_name/output_xml/xml_file.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<POI Type="mycategory" MapID="50" XPos="169.809998" YPos="210.649994" ZPos="215.830002"/>
<POI Type="Mycategory" MapID="50" XPos="169.809998" YPos="210.649994" ZPos="215.830002"/>
<POI Type="mYcAtEgOrY" MapID="50" XPos="169.809998" YPos="210.649994" ZPos="215.830002"/>
<POI Type="mycategory" MapID="50" XPos="100.809998" YPos="200.649994" ZPos="300.830017"/>
</POIs>
</OverlayData>

Loading