fix integration tests about clip, glue1, and math2

gfngfn · Jan 6, 2024 · f094f86 · f094f86
1 parent 28eb57c
commit f094f86
Show file tree

Hide file tree

Showing 14 changed files with 329 additions and 234 deletions.
diff --git a/tests/.gitignore b/tests/.gitignore
@@ -1 +1,2 @@
-*.satysfi-lock
+*.saphe.lock.yaml
+*.satysfi-deps.yaml
diff --git a/tests/Makefile b/tests/Makefile
@@ -14,55 +14,56 @@ TARGETS = \
 #	refactor4.pdf \
 #	refactor6.pdf \
 
-EXPECTED_LOCKS=$(TARGETS:.pdf=.satysfi-lock-expected)
+EXPECTED_LOCKS=$(TARGETS:.pdf=.saphe.lock.yaml.expected)
 
-SATYSFI ?= satysfi
+SAPHE ?= saphe
 
 .PHONY: all promote clean
 
-.SUFFIXES: .saty .pdf
-
-.SUFFIXES: .saty .pdf .satysfi-lock .satysfi-lock-expected
+.SUFFIXES: .saty .pdf .saphe.lock.yaml .saphe.lock.yaml.expected
 
 # Keeps intermediate results:
-.PRECIOUS: %.satysfi-lock
+.PRECIOUS: %.saphe.lock.yaml
 
 # Generates a lock file from a document and checks that it is as expected:
-.saty.satysfi-lock:
-	$(SATYSFI) solve $<
-	diff $(<:.saty=.satysfi-lock) $(<:.saty=.satysfi-lock-expected)
+%.saphe.lock.yaml: %.saty %.saphe.yaml
+	$(SAPHE) solve $<
+	diff $(<:.saty=.saphe.lock.yaml) $(<:.saty=.saphe.lock.yaml.expected)
 
 # Typesets a document:
-%.pdf: %.saty %.satysfi-lock
-	$(SATYSFI) build $< -o $@
+%.pdf: %.saty %.saphe.lock.yaml
+	$(SAPHE) build $< -o $@
 
 # Promote a lock file to the corresponding expected lock file:
-%.satysfi-lock-expected: %.satysfi-lock
-	cp $*.satysfi-lock $*.satysfi-lock-expected
+%.saphe.lock.yaml.expected: %.saphe.lock.yaml
+	cp $*.saphe.lock.yaml $*.saphe.lock.yaml.expected
 
 # Entrypoint for typesetting documents:
 all:: $(TARGETS)
 
 all::
 	(cd images; make)
-	(cd text_mode; make)
-	(cd md; make)
+#TODO: run the following
+#	(cd text_mode; make)
+#	(cd md; make)
 
 # Entrypoint for promoting lock files:
 promote:: $(EXPECTED_LOCKS)
 
 promote::
 	(cd images; make promote)
-	(cd text_mode; make promote)
-	(cd md; make promote)
+#TODO: run the following
+#	(cd text_mode; make promote)
+#	(cd md; make promote)
 
 clean::
-	rm -f *.pdf *.satysfi-aux *.satysfi-lock
+	rm -f *.pdf *.satysfi-aux *.saphe.lock.yaml *.satysfi-deps.yaml
 
 clean::
 	(cd images; make clean)
-	(cd text_mode; make clean)
-	(cd md; make clean)
+#TODO: run the following
+#	(cd text_mode; make clean)
+#	(cd md; make clean)
 
 clip.pdf: head.satyh
 first.pdf: head.satyh

diff --git a/tests/clip.saphe.lock.yaml.expected b/tests/clip.saphe.lock.yaml.expected
@@ -0,0 +1,59 @@
+ecosystem: ^0.0.1
+locks:
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.font-ipa-ex.0.0.1
+  dependencies: []
+  test_only: false
+  registered:
+    registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3
+    package_name: font-ipa-ex
+    version: 0.0.1
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.font-junicode.0.0.1
+  dependencies: []
+  test_only: false
+  registered:
+    registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3
+    package_name: font-junicode
+    version: 0.0.1
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.font-latin-modern.0.0.1
+  dependencies: []
+  test_only: false
+  registered:
+    registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3
+    package_name: font-latin-modern
+    version: 0.0.1
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.font-latin-modern-math.0.0.1
+  dependencies: []
+  test_only: false
+  registered:
+    registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3
+    package_name: font-latin-modern-math
+    version: 0.0.1
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.math.0.0.1
+  dependencies:
+  - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.stdlib.0.0.1
+    used_as: Stdlib
+  test_only: false
+  registered:
+    registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3
+    package_name: math
+    version: 0.0.1
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.stdlib.0.0.1
+  dependencies: []
+  test_only: false
+  registered:
+    registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3
+    package_name: stdlib
+    version: 0.0.1
+dependencies:
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.font-ipa-ex.0.0.1
+  used_as: FontIpaEx
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.font-junicode.0.0.1
+  used_as: FontJunicode
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.font-latin-modern.0.0.1
+  used_as: FontLatinModern
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.font-latin-modern-math.0.0.1
+  used_as: FontLatinModernMath
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.math.0.0.1
+  used_as: Math
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.stdlib.0.0.1
+  used_as: Stdlib
diff --git a/tests/clip.saphe.yaml b/tests/clip.saphe.yaml
@@ -0,0 +1,43 @@
+ecosystem: "^0.0.1"
+language: "^0.1.0"
+name: "clip" #TODO: remove this
+authors:
+  - "Takashi Suwa"
+registries:
+  - name: "default"
+    git:
+      url: "https://github.com/SATySFi/default-registry"
+      branch: "temp-dev-saphe"
+contents:
+  document:
+    dependencies:
+      - used_as: "Stdlib"
+        registered:
+          registry: "default"
+          name: "stdlib"
+          requirement: "^0.0.1"
+      - used_as: "Math"
+        registered:
+          registry: "default"
+          name: "math"
+          requirement: "^0.0.1"
+      - used_as: "FontJunicode"
+        registered:
+          registry: "default"
+          name: "font-junicode"
+          requirement: "^0.0.1"
+      - used_as: "FontIpaEx"
+        registered:
+          registry: "default"
+          name: "font-ipa-ex"
+          requirement: "^0.0.1"
+      - used_as: "FontLatinModern"
+        registered:
+          registry: "default"
+          name: "font-latin-modern"
+          requirement: "^0.0.1"
+      - used_as: "FontLatinModernMath"
+        registered:
+          registry: "default"
+          name: "font-latin-modern-math"
+          requirement: "^0.0.1"
diff --git a/tests/clip.saty b/tests/clip.saty
@@ -1,23 +1,3 @@
-#[config (|
-  registries = [
-    (|
-      name = `default`,
-      remote =
-        Git(|
-          url = `https://github.com/SATySFi/default-registry`,
-          branch = `format-1`,
-        |)
-    |)
-  ],
-  dependencies = [
-    (| name = `stdlib`, registry = `default`, requirement = `^0.0.1` |),
-    (| name = `math`, registry = `default`, requirement = `^0.0.1` |),
-    (| name = `font-junicode`, registry = `default`, requirement = `^0.0.1` |),
-    (| name = `font-ipa-ex`, registry = `default`, requirement = `^0.0.1` |),
-    (| name = `font-latin-modern`, registry = `default`, requirement = `^0.0.1` |),
-    (| name = `font-latin-modern-math`, registry = `default`, requirement = `^0.0.1` |),
-  ],
-|)]
 use package open Stdlib
 use open Head of `head`
 

diff --git a/tests/clip.satysfi-lock-expected b/tests/clip.satysfi-lock-expected
diff --git a/tests/glue1.saphe.lock.yaml.expected b/tests/glue1.saphe.lock.yaml.expected
@@ -0,0 +1,59 @@
+ecosystem: ^0.0.1
+locks:
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.font-ipa-ex.0.0.1
+  dependencies: []
+  test_only: false
+  registered:
+    registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3
+    package_name: font-ipa-ex
+    version: 0.0.1
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.font-junicode.0.0.1
+  dependencies: []
+  test_only: false
+  registered:
+    registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3
+    package_name: font-junicode
+    version: 0.0.1
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.font-latin-modern.0.0.1
+  dependencies: []
+  test_only: false
+  registered:
+    registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3
+    package_name: font-latin-modern
+    version: 0.0.1
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.font-latin-modern-math.0.0.1
+  dependencies: []
+  test_only: false
+  registered:
+    registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3
+    package_name: font-latin-modern-math
+    version: 0.0.1
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.math.0.0.1
+  dependencies:
+  - name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.stdlib.0.0.1
+    used_as: Stdlib
+  test_only: false
+  registered:
+    registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3
+    package_name: math
+    version: 0.0.1
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.stdlib.0.0.1
+  dependencies: []
+  test_only: false
+  registered:
+    registry_hash_value: 6f2b80e9bb7c4e8af2104999fc25dbb3
+    package_name: stdlib
+    version: 0.0.1
+dependencies:
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.font-ipa-ex.0.0.1
+  used_as: FontIpaEx
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.font-junicode.0.0.1
+  used_as: FontJunicode
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.font-latin-modern.0.0.1
+  used_as: FontLatinModern
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.font-latin-modern-math.0.0.1
+  used_as: FontLatinModernMath
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.math.0.0.1
+  used_as: Math
+- name: registered.6f2b80e9bb7c4e8af2104999fc25dbb3.stdlib.0.0.1
+  used_as: Stdlib
diff --git a/tests/glue1.saphe.yaml b/tests/glue1.saphe.yaml
@@ -0,0 +1,43 @@
+ecosystem: "^0.0.1"
+language: "^0.1.0"
+name: "glue1" #TODO: remove this
+authors:
+  - "Takashi Suwa"
+registries:
+  - name: "default"
+    git:
+      url: "https://github.com/SATySFi/default-registry"
+      branch: "temp-dev-saphe"
+contents:
+  document:
+    dependencies:
+      - used_as: "Stdlib"
+        registered:
+          registry: "default"
+          name: "stdlib"
+          requirement: "^0.0.1"
+      - used_as: "Math"
+        registered:
+          registry: "default"
+          name: "math"
+          requirement: "^0.0.1"
+      - used_as: "FontJunicode"
+        registered:
+          registry: "default"
+          name: "font-junicode"
+          requirement: "^0.0.1"
+      - used_as: "FontIpaEx"
+        registered:
+          registry: "default"
+          name: "font-ipa-ex"
+          requirement: "^0.0.1"
+      - used_as: "FontLatinModern"
+        registered:
+          registry: "default"
+          name: "font-latin-modern"
+          requirement: "^0.0.1"
+      - used_as: "FontLatinModernMath"
+        registered:
+          registry: "default"
+          name: "font-latin-modern-math"
+          requirement: "^0.0.1"
diff --git a/tests/glue1.saty b/tests/glue1.saty
@@ -1,23 +1,3 @@
-#[config (|
-  registries = [
-    (|
-      name = `default`,
-      remote =
-        Git(|
-          url = `https://github.com/SATySFi/default-registry`,
-          branch = `format-1`,
-        |)
-    |)
-  ],
-  dependencies = [
-    (| name = `stdlib`, registry = `default`, requirement = `^0.0.1` |),
-    (| name = `math`, registry = `default`, requirement = `^0.0.1` |),
-    (| name = `font-junicode`, registry = `default`, requirement = `^0.0.1` |),
-    (| name = `font-ipa-ex`, registry = `default`, requirement = `^0.0.1` |),
-    (| name = `font-latin-modern`, registry = `default`, requirement = `^0.0.1` |),
-    (| name = `font-latin-modern-math`, registry = `default`, requirement = `^0.0.1` |),
-  ],
-|)]
 use Head of `head`
 
 let open Head in