Added arbitrary data merge tests.

2025-07-23 04:36:50 +00:00 · 2021-10-22 11:49:15 +01:00
parent d6d564c027
commit 12b3267d5c
9 changed files with 170 additions and 8 deletions
--- a/src/test/resources/arbitrary/demo1/.qortal/cache
+++ b/src/test/resources/arbitrary/demo1/.qortal/cache
@@ -1 +1 @@
-2ea5a99a-3b85-4f1f-a259-436787f90bd1
+db2d9ab2-a97e-43bf-a259-ebbc1a1b0c59
--- a/src/test/resources/arbitrary/demo1/dir1/lorem4.txt
+++ b/src/test/resources/arbitrary/demo1/dir1/lorem4.txt
@@ -1 +1,10 @@
-Sed non lacus ante.
+Pellentesque mollis risus laoreet neque lobortis, ut euismod nisl gravida.
+Nullam sit amet scelerisque sapien, id aliquet elit. Suspendisse eu
+accumsan eros. Nullam non nunc ut risus facilisis posuere sed sed ipsum.
+Pellentesque habitant morbi tristique senectus et netus et malesuada fames
+ac turpis egestas. Nullam magna felis, vehicula a accumsan luctus, vulputate
+vitae justo. Integer mollis lacus eu nisi iaculis, ac ultrices sem aliquam.
+Sed ac lacus eget nibh posuere sodales. Phasellus sodales, augue ac
+tincidunt scelerisque, mi erat varius mauris, sed blandit ex nisl ut
+justo. Etiam ac nisl venenatis, malesuada odio vitae, blandit velit.
+Phasellus congue leo a porttitor hendrerit.
--- a/src/test/resources/arbitrary/demo2/dir1/dir2/lorem5.txt
+++ b/src/test/resources/arbitrary/demo2/dir1/dir2/lorem5.txt
@@ -1 +1 @@
-Pellentesque laoreet laoreet dui ut volutpat.
+Pellentesque laoreet laoreet dui ut volutpat. Sentence added.
--- a/src/test/resources/arbitrary/demo2/dir1/lorem4.txt
+++ b/src/test/resources/arbitrary/demo2/dir1/lorem4.txt
@@ -1 +1,11 @@
-Sed non lacus ante.
+Pellentesque mollis risus laoreet neque lobortis, ut euismod nisl gravida.
+Nullam sit amet scelerisque sapien, id aliquet elit. Suspendisse eu
+accumsan eros. Nullam non nunc ut risus facilisis posuere sed sed ipsum.
+Pellentesque habitant morbi tristique senectus et netus et malesuada fames
+ac turpis egestas. Nullam magna felis; vehicula a accumsan luctus, vulputate
+vitae justo. Integer mollis lacus eu nisi iaculis, ac ultrices sem aliquam.
+Sed ac lacus eget nibh posuere sodales. Phasellus sodales, augue ac
+tincidunt scelerisque, mi erat Varius mauris, sed blandit ex nisl ut
+justo. Etiam ac nisl venenatis, malesuada odio vitae, blandit velit.
+Phasellus congue leo a porttitor hendrerit.
+Line added.
--- a/src/test/resources/arbitrary/demo2/lorem1.txt
+++ b/src/test/resources/arbitrary/demo2/lorem1.txt
@@ -1 +1 @@
-Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+Lorem ipsum dolor sit amet, adipiscing elit.
--- a/src/test/resources/arbitrary/demo2/lorem2.txt
+++ b/src/test/resources/arbitrary/demo2/lorem2.txt
@@ -1 +1,2 @@
-Quisque viverra neque quis eros dapibus
+Quisque viverra neque
+quis eros dapibus