[43_2] Re-organize integration tests

XmacsLabs · Dec 9, 2023 · fff93e3 · fff93e3
1 parent 7ad1e89
commit fff93e3
Show file tree

Hide file tree

Showing 24 changed files with 23 additions and 22 deletions.
diff --git a/TeXmacs/tests/12_1.scm b/TeXmacs/tests/12_1.scm
@@ -6,7 +6,7 @@
   (regression-test-group
    "get-tag-name" "tag-name"
    get-tag-name utf8->cork 
-   (test "get-tag-name" "$TEXMACS_PATH/tests/12_1.bib" "数理逻辑2010汪芳庭")))
+   (test "get-tag-name" "$TEXMACS_PATH/tests/bib/12_1.bib" "数理逻辑2010汪芳庭")))
 
 (tm-define (test_12_1)
   (let ((n (+ (test-get-tag-name))))

diff --git a/TeXmacs/tests/17_1.scm b/TeXmacs/tests/17_1.scm
@@ -1,7 +1,7 @@
 (inherit-modules (texmacs texmacs tm-tools))
 
 (define (test-count-characters)
-  (load-buffer "$TEXMACS_PATH/tests/17_1.tm")
+  (load-buffer "$TEXMACS_PATH/tests/tm/17_1.tm")
   (regression-test-group
    "count-characters" "result"
    count-characters :none

diff --git a/TeXmacs/tests/43_2.scm b/TeXmacs/tests/43_2.scm
@@ -7,7 +7,7 @@
 
 (define (load-latex path)
   (with path (string-append "$TEXMACS_PATH/tests/tex/" path)
-    (string-load path)))
+    (string-replace (string-load path)  "\r\n" "\n")))
 
 (define (test-export-as-latex)
   (regression-test-group

diff --git a/TeXmacs/tests/43_3.scm b/TeXmacs/tests/43_3.scm
@@ -7,7 +7,7 @@
 
 (define (load-latex path)
   (with path (string-append "$TEXMACS_PATH/tests/tex/" path)
-    (string-load path)))
+    (string-replace (string-load path)  "\r\n" "\n")))
 
 (define (test-export-as-latex)
   (regression-test-group

diff --git a/TeXmacs/tests/64_1.scm b/TeXmacs/tests/64_1.scm
@@ -7,25 +7,25 @@
     (embedded-propose tree 4)))
 
 (define (test-ascii-filename)
-  (load-buffer "$TEXMACS_PATH/tests/64_1.tm")
+  (load-buffer "$TEXMACS_PATH/tests/tm/64_1.tm")
   (let ((image-ascii (tree-ref (root-tree) 1 1))
         (image-untitled (tree-ref (root-tree) 1 2))
         (image-cork (tree-ref (root-tree) 1 3)))
     (regression-test-group
       "embedded-propose on latin filename" "embedded-propose-latin"
-      embedded-propose-4th (file-under-path "$TEXMACS_PATH/tests")
+      embedded-propose-4th (file-under-path "$TEXMACS_PATH/tests/tm")
       (test "cork encoding" image-cork "学生：张佳.png")
       (test "ascii"  image-ascii "64_1.png")
       (test "extension only" image-untitled "64_1-image-4.png"))))
 
 (define (test-cjk-filename)
-  (load-buffer "$TEXMACS_PATH/tests/64_1_中文文件名.tm")
+  (load-buffer "$TEXMACS_PATH/tests/tm/64_1_中文文件名.tm")
   (let ((image-ascii (tree-ref (root-tree) 1 1))
         (image-untitled (tree-ref (root-tree) 1 2))
         (image-cork (tree-ref (root-tree) 1 3)))
     (regression-test-group
       "embedded-propose on unicode filename" "embedded-propose-unicode"
-      embedded-propose-4th (file-under-path "$TEXMACS_PATH/tests")
+      embedded-propose-4th (file-under-path "$TEXMACS_PATH/tests/tm")
       (test "cork encoding" image-cork "学生：张佳.png")
       (test "ascii"  image-ascii "64_1.png")
       (test "extension only" image-untitled "64_1_中文文件名-image-4.png"))))

diff --git a/TeXmacs/tests/9_1.scm b/TeXmacs/tests/9_1.scm
@@ -1,19 +1,19 @@
 (define (test-no-title)
-  (load-buffer "$TEXMACS_PATH/tests/9_1_无标题.tm")
+  (load-buffer "$TEXMACS_PATH/tests/tm/9_1_无标题.tm")
   (regression-test-group
    "get-metadata" "result"
    get-metadata :none
    (test "no title" "title" "9_1_无标题.tm")))
 
 (define (test-title)
-  (load-buffer "$TEXMACS_PATH/tests/9_1_with_title.tm")
+  (load-buffer "$TEXMACS_PATH/tests/tm/9_1_with_title.tm")
   (regression-test-group
    "get-metadata" "result"
    get-metadata :none
    (test "with title" "title" "标题")))
 
 (define (test-metadata)
-  (load-buffer "$TEXMACS_PATH/tests/9_1_with_metadata.tm")
+  (load-buffer "$TEXMACS_PATH/tests/tm/9_1_with_metadata.tm")
   (regression-test-group
    "get-metadata" "result"
    get-metadata :none

diff --git a/TeXmacs/tests/12_1.bib → TeXmacs/tests/bib/12_1.bib b/TeXmacs/tests/12_1.bib → TeXmacs/tests/bib/12_1.bib
diff --git a/TeXmacs/tests/12_4.bib → TeXmacs/tests/bib/12_4.bib b/TeXmacs/tests/12_4.bib → TeXmacs/tests/bib/12_4.bib
diff --git a/TeXmacs/tests/12_4.tm → TeXmacs/tests/tm/12_4.tm b/TeXmacs/tests/12_4.tm → TeXmacs/tests/tm/12_4.tm
diff --git a/TeXmacs/tests/17_1.tm → TeXmacs/tests/tm/17_1.tm b/TeXmacs/tests/17_1.tm → TeXmacs/tests/tm/17_1.tm
diff --git a/TeXmacs/tests/29_1_1.tm → TeXmacs/tests/tm/29_1_1.tm b/TeXmacs/tests/29_1_1.tm → TeXmacs/tests/tm/29_1_1.tm
diff --git a/TeXmacs/tests/46_3.tm → TeXmacs/tests/tm/46_3.tm b/TeXmacs/tests/46_3.tm → TeXmacs/tests/tm/46_3.tm
diff --git a/TeXmacs/tests/63_1.tm → TeXmacs/tests/tm/63_1.tm b/TeXmacs/tests/63_1.tm → TeXmacs/tests/tm/63_1.tm
diff --git a/TeXmacs/tests/64_1.tm → TeXmacs/tests/tm/64_1.tm b/TeXmacs/tests/64_1.tm → TeXmacs/tests/tm/64_1.tm
diff --git a/TeXmacs/tests/64_1_中文文件名.tm → TeXmacs/tests/tm/64_1_中文文件名.tm b/TeXmacs/tests/64_1_中文文件名.tm → TeXmacs/tests/tm/64_1_中文文件名.tm
diff --git a/TeXmacs/tests/69_5.tm → TeXmacs/tests/tm/69_5.tm b/TeXmacs/tests/69_5.tm → TeXmacs/tests/tm/69_5.tm
diff --git a/TeXmacs/tests/69_5_中文名.tm → TeXmacs/tests/tm/69_5_中文名.tm b/TeXmacs/tests/69_5_中文名.tm → TeXmacs/tests/tm/69_5_中文名.tm
diff --git a/TeXmacs/tests/9_1_with_metadata.tm → TeXmacs/tests/tm/9_1_with_metadata.tm b/TeXmacs/tests/9_1_with_metadata.tm → TeXmacs/tests/tm/9_1_with_metadata.tm
diff --git a/TeXmacs/tests/9_1_with_title.tm → TeXmacs/tests/tm/9_1_with_title.tm b/TeXmacs/tests/9_1_with_title.tm → TeXmacs/tests/tm/9_1_with_title.tm
diff --git a/TeXmacs/tests/9_1_无标题.tm → TeXmacs/tests/tm/9_1_无标题.tm b/TeXmacs/tests/9_1_无标题.tm → TeXmacs/tests/tm/9_1_无标题.tm
diff --git a/TeXmacs/tests/9_2_中文文件名.tm → TeXmacs/tests/tm/9_2_中文文件名.tm b/TeXmacs/tests/9_2_中文文件名.tm → TeXmacs/tests/tm/9_2_中文文件名.tm
diff --git a/TeXmacs/tests/9_3_href_and_anchor.tm → TeXmacs/tests/tm/9_3_href_and_anchor.tm b/TeXmacs/tests/9_3_href_and_anchor.tm → TeXmacs/tests/tm/9_3_href_and_anchor.tm
diff --git a/tests/Plugins/Pdf/pdf_make_attachment_test.cpp b/tests/Plugins/Pdf/pdf_make_attachment_test.cpp
@@ -35,7 +35,7 @@ void
 TestHummusPdfMakeAttachment::test_pdf_hummus_make_single_attachment () {
 
   array<url> attachmen_0;
-  attachmen_0 << url ("$TEXMACS_PATH/tests/29_1_1.tm");
+  attachmen_0 << url ("$TEXMACS_PATH/tests/tm/29_1_1.tm");
   bool attach_judge= pdf_hummus_make_attachments (
       url ("$TEXMACS_PATH/tests/images/29_1_1.pdf"), attachmen_0,
       url ("$TEXMACS_PATH/tests/images/29_1_1_attach.pdf"));
@@ -55,7 +55,7 @@ TestHummusPdfMakeAttachment::test_pdf_hummus_make_single_attachment () {
   QVERIFY (tm_exist_judge);
 
   QVERIFY (attachment[0] == url ("$TEXMACS_PATH/tests/images/29_1_1.tm"));
-  QVERIFY (string_load (url ("$TEXMACS_PATH/tests/29_1_1.tm")) ==
+  QVERIFY (string_load (url ("$TEXMACS_PATH/tests/tm/29_1_1.tm")) ==
            string_load (url ("$TEXMACS_PATH/tests/images/29_1_1.tm")));
   remove (url ("$TEXMACS_PATH/tests/images/29_1_1_attach.pdf"));
   remove (attachment[0]);
@@ -130,7 +130,7 @@ TestHummusPdfMakeAttachment::test_pdf_hummus_make_zero_attachment () {
 void
 TestHummusPdfMakeAttachment::test_pdf_hummus_make_attachment_for_wrong_pdf () {
   array<url> attachment_0;
-  attachment_0 << url ("$TEXMACS_PATH/tests/29_1_1.tm");
+  attachment_0 << url ("$TEXMACS_PATH/tests/tm/29_1_1.tm");
   bool attach_judge= pdf_hummus_make_attachments (
       url ("$TEXMACS_PATH/tests/images/29_4_4.pdf"), attachment_0,
       url ("$TEXMACS_PATH/tests/images/29_4_4_attach.pdf"));
@@ -144,7 +144,7 @@ void
 TestHummusPdfMakeAttachment::test_pdf_hummus_make_attachment_for_no_pdf () {
   QVERIFY (!is_regular (url ("$TEXMACS_PATH/tests/images/29_4_5.pdf")));
   array<url> attachment_0;
-  attachment_0 << url ("$TEXMACS_PATH/tests/29_1_1.tm");
+  attachment_0 << url ("$TEXMACS_PATH/tests/tm/29_1_1.tm");
   bool attach_judge= pdf_hummus_make_attachments (
       url ("$TEXMACS_PATH/tests/images/29_4_5.pdf"), attachment_0,
       url ("$TEXMACS_PATH/tests/images/29_4_5_attach.pdf"));
@@ -157,11 +157,11 @@ TestHummusPdfMakeAttachment::test_pdf_hummus_make_attachment_for_no_pdf () {
 void
 TestHummusPdfMakeAttachment::test_get_linked_file_paths () {
   array<url> attachment_0;
-  attachment_0 << url ("$TEXMACS_PATH/tests/29_1_1.tm");
-  string     texmacs_doc_1= string_load (url ("$TEXMACS_PATH/tests/29_1_1.tm"));
-  tree       texmacs_tree_1= texmacs_to_tree (texmacs_doc_1);
-  array<url> linked_0      = get_linked_file_paths (
-      texmacs_tree_1, url ("$TEXMACS_PATH/tests/29_1_1.tm"));
+  attachment_0 << url ("$TEXMACS_PATH/tests/tm/29_1_1.tm");
+  string texmacs_doc_1 = string_load (url ("$TEXMACS_PATH/tests/tm/29_1_1.tm"));
+  tree   texmacs_tree_1= texmacs_to_tree (texmacs_doc_1);
+  array<url> linked_0  = get_linked_file_paths (
+      texmacs_tree_1, url ("$TEXMACS_PATH/tests/tm/29_1_1.tm"));
   QVERIFY (N (linked_0) == 0);
 
   string texmacs_doc_2=

diff --git a/xmake/research.lua b/xmake/research.lua
@@ -163,8 +163,9 @@ function add_target_research_on_others()
     if is_mode("releasedbg") then
         if is_plat("mingw", "windows") then
             add_installfiles({
-                "TeXmacs(/tests/*.tm)",
-                "TeXmacs(/tests/*.bib)",
+                "TeXmacs(/tests/tm/*.tm)",
+                "TeXmacs(/tests/tex/*.tex)",
+                "TeXmacs(/tests/bib/*.bib)",
             })
         else
             add_installfiles({