From 60d202471ed5013d1ab607a4c34b82448d708261 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Sat, 29 Feb 2020 22:03:46 +0000 Subject: Add a bunch of `as Location` unit tests --- dhall/tests/import/success/unit/asLocation/AbsoluteA.dhall | 1 + dhall/tests/import/success/unit/asLocation/AbsoluteB.dhall | 2 ++ dhall/tests/import/success/unit/asLocation/Canonicalize1A.dhall | 1 + dhall/tests/import/success/unit/asLocation/Canonicalize1B.dhall | 2 ++ dhall/tests/import/success/unit/asLocation/Canonicalize2A.dhall | 1 + dhall/tests/import/success/unit/asLocation/Canonicalize2B.dhall | 2 ++ dhall/tests/import/success/unit/asLocation/Canonicalize3A.dhall | 1 + dhall/tests/import/success/unit/asLocation/Canonicalize3B.dhall | 2 ++ dhall/tests/import/success/unit/asLocation/Canonicalize4A.dhall | 1 + dhall/tests/import/success/unit/asLocation/Canonicalize4B.dhall | 2 ++ dhall/tests/import/success/unit/asLocation/Canonicalize5A.dhall | 1 + dhall/tests/import/success/unit/asLocation/Canonicalize5B.dhall | 2 ++ dhall/tests/import/success/unit/asLocation/Chain1A.dhall | 1 + dhall/tests/import/success/unit/asLocation/Chain1B.dhall | 2 ++ dhall/tests/import/success/unit/asLocation/Chain2A.dhall | 1 + dhall/tests/import/success/unit/asLocation/Chain2B.dhall | 2 ++ dhall/tests/import/success/unit/asLocation/Chain3A.dhall | 1 + dhall/tests/import/success/unit/asLocation/Chain3B.dhall | 2 ++ dhall/tests/import/success/unit/asLocation/DontTryResolvingA.dhall | 1 + dhall/tests/import/success/unit/asLocation/DontTryResolvingB.dhall | 1 + dhall/tests/import/success/unit/asLocation/EnvA.dhall | 1 + dhall/tests/import/success/unit/asLocation/EnvB.dhall | 2 ++ dhall/tests/import/success/unit/asLocation/HashA.dhall | 1 + dhall/tests/import/success/unit/asLocation/HashB.dhall | 2 ++ dhall/tests/import/success/unit/asLocation/HomeA.dhall | 1 + dhall/tests/import/success/unit/asLocation/HomeB.dhall | 2 ++ dhall/tests/import/success/unit/asLocation/MissingA.dhall | 1 + dhall/tests/import/success/unit/asLocation/MissingB.dhall | 1 + dhall/tests/import/success/unit/asLocation/RelativeA.dhall | 1 + dhall/tests/import/success/unit/asLocation/RelativeB.dhall | 2 ++ dhall/tests/import/success/unit/asLocation/RemoteA.dhall | 1 + dhall/tests/import/success/unit/asLocation/RemoteB.dhall | 2 ++ 32 files changed, 46 insertions(+) create mode 100644 dhall/tests/import/success/unit/asLocation/AbsoluteA.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/AbsoluteB.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/Canonicalize1A.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/Canonicalize1B.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/Canonicalize2A.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/Canonicalize2B.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/Canonicalize3A.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/Canonicalize3B.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/Canonicalize4A.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/Canonicalize4B.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/Canonicalize5A.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/Canonicalize5B.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/Chain1A.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/Chain1B.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/Chain2A.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/Chain2B.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/Chain3A.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/Chain3B.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/DontTryResolvingA.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/DontTryResolvingB.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/EnvA.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/EnvB.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/HashA.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/HashB.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/HomeA.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/HomeB.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/MissingA.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/MissingB.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RelativeA.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RelativeB.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RemoteA.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RemoteB.dhall (limited to 'dhall/tests/import') diff --git a/dhall/tests/import/success/unit/asLocation/AbsoluteA.dhall b/dhall/tests/import/success/unit/asLocation/AbsoluteA.dhall new file mode 100644 index 0000000..dcf45d1 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/AbsoluteA.dhall @@ -0,0 +1 @@ +/absolute/import as Location diff --git a/dhall/tests/import/success/unit/asLocation/AbsoluteB.dhall b/dhall/tests/import/success/unit/asLocation/AbsoluteB.dhall new file mode 100644 index 0000000..1c1add7 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/AbsoluteB.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Remote : Text | Local : Text | Missing >.Local + "/absolute/import" diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize1A.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize1A.dhall new file mode 100644 index 0000000..e636ed1 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/Canonicalize1A.dhall @@ -0,0 +1 @@ +./foo/./bar/import.dhall as Location diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize1B.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize1B.dhall new file mode 100644 index 0000000..3a8a926 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/Canonicalize1B.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Remote : Text | Local : Text | Missing >.Local + "./dhall/tests/import/success/unit/asLocation/foo/bar/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize2A.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize2A.dhall new file mode 100644 index 0000000..c6ef89f --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/Canonicalize2A.dhall @@ -0,0 +1 @@ +./foo/baz/../bar/import.dhall as Location diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize2B.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize2B.dhall new file mode 100644 index 0000000..3a8a926 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/Canonicalize2B.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Remote : Text | Local : Text | Missing >.Local + "./dhall/tests/import/success/unit/asLocation/foo/bar/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize3A.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize3A.dhall new file mode 100644 index 0000000..e6be780 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/Canonicalize3A.dhall @@ -0,0 +1 @@ +./../bar/import.dhall as Location diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize3B.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize3B.dhall new file mode 100644 index 0000000..b223da6 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/Canonicalize3B.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Remote : Text | Local : Text | Missing >.Local + "./dhall/tests/import/success/unit/bar/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize4A.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize4A.dhall new file mode 100644 index 0000000..ffccd47 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/Canonicalize4A.dhall @@ -0,0 +1 @@ +../../bar/import.dhall as Location diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize4B.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize4B.dhall new file mode 100644 index 0000000..b6301f8 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/Canonicalize4B.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Remote : Text | Local : Text | Missing >.Local + "./dhall/tests/import/success/bar/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize5A.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize5A.dhall new file mode 100644 index 0000000..7e58f0b --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/Canonicalize5A.dhall @@ -0,0 +1 @@ +./foo/../../bar/import.dhall as Location diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize5B.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize5B.dhall new file mode 100644 index 0000000..b223da6 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/Canonicalize5B.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Remote : Text | Local : Text | Missing >.Local + "./dhall/tests/import/success/unit/bar/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/Chain1A.dhall b/dhall/tests/import/success/unit/asLocation/Chain1A.dhall new file mode 100644 index 0000000..7b20bc3 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/Chain1A.dhall @@ -0,0 +1 @@ +./RelativeA.dhall diff --git a/dhall/tests/import/success/unit/asLocation/Chain1B.dhall b/dhall/tests/import/success/unit/asLocation/Chain1B.dhall new file mode 100644 index 0000000..6aee0b5 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/Chain1B.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Local : Text | Missing | Remote : Text >.Local + "./dhall/tests/import/success/unit/asLocation/some/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/Chain2A.dhall b/dhall/tests/import/success/unit/asLocation/Chain2A.dhall new file mode 100644 index 0000000..cdbd10d --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/Chain2A.dhall @@ -0,0 +1 @@ +./Canonicalize4A.dhall diff --git a/dhall/tests/import/success/unit/asLocation/Chain2B.dhall b/dhall/tests/import/success/unit/asLocation/Chain2B.dhall new file mode 100644 index 0000000..6aba54e --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/Chain2B.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Local : Text | Missing | Remote : Text >.Local + "./dhall/tests/import/success/bar/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/Chain3A.dhall b/dhall/tests/import/success/unit/asLocation/Chain3A.dhall new file mode 100644 index 0000000..b44f0d4 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/Chain3A.dhall @@ -0,0 +1 @@ +./../asLocation/Canonicalize4A.dhall diff --git a/dhall/tests/import/success/unit/asLocation/Chain3B.dhall b/dhall/tests/import/success/unit/asLocation/Chain3B.dhall new file mode 100644 index 0000000..6aba54e --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/Chain3B.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Local : Text | Missing | Remote : Text >.Local + "./dhall/tests/import/success/bar/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/DontTryResolvingA.dhall b/dhall/tests/import/success/unit/asLocation/DontTryResolvingA.dhall new file mode 100644 index 0000000..e70016c --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/DontTryResolvingA.dhall @@ -0,0 +1 @@ +(missing as Location) ? 42 -- `missing` fails as an import, but definitely resolves as Location diff --git a/dhall/tests/import/success/unit/asLocation/DontTryResolvingB.dhall b/dhall/tests/import/success/unit/asLocation/DontTryResolvingB.dhall new file mode 100644 index 0000000..dd5e798 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/DontTryResolvingB.dhall @@ -0,0 +1 @@ +< Environment : Text | Remote : Text | Local : Text | Missing >.Missing diff --git a/dhall/tests/import/success/unit/asLocation/EnvA.dhall b/dhall/tests/import/success/unit/asLocation/EnvA.dhall new file mode 100644 index 0000000..eb4b4a6 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/EnvA.dhall @@ -0,0 +1 @@ +env:HOME as Location diff --git a/dhall/tests/import/success/unit/asLocation/EnvB.dhall b/dhall/tests/import/success/unit/asLocation/EnvB.dhall new file mode 100644 index 0000000..4947caa --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/EnvB.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Remote : Text | Local : Text | Missing >.Environment + "HOME" diff --git a/dhall/tests/import/success/unit/asLocation/HashA.dhall b/dhall/tests/import/success/unit/asLocation/HashA.dhall new file mode 100644 index 0000000..79f4fda --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/HashA.dhall @@ -0,0 +1 @@ +./some/import.dhall sha256:f9340badf94a684e652e0a384f64363293d8b632d971f3453f7ee22f10ab6e75 as Location diff --git a/dhall/tests/import/success/unit/asLocation/HashB.dhall b/dhall/tests/import/success/unit/asLocation/HashB.dhall new file mode 100644 index 0000000..6aee0b5 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/HashB.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Local : Text | Missing | Remote : Text >.Local + "./dhall/tests/import/success/unit/asLocation/some/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/HomeA.dhall b/dhall/tests/import/success/unit/asLocation/HomeA.dhall new file mode 100644 index 0000000..18cc2cd --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/HomeA.dhall @@ -0,0 +1 @@ +~/some/import.dhall as Location diff --git a/dhall/tests/import/success/unit/asLocation/HomeB.dhall b/dhall/tests/import/success/unit/asLocation/HomeB.dhall new file mode 100644 index 0000000..8b4f0fd --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/HomeB.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Remote : Text | Local : Text | Missing >.Local + "~/some/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/MissingA.dhall b/dhall/tests/import/success/unit/asLocation/MissingA.dhall new file mode 100644 index 0000000..e06a30b --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/MissingA.dhall @@ -0,0 +1 @@ +missing as Location diff --git a/dhall/tests/import/success/unit/asLocation/MissingB.dhall b/dhall/tests/import/success/unit/asLocation/MissingB.dhall new file mode 100644 index 0000000..dd5e798 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/MissingB.dhall @@ -0,0 +1 @@ +< Environment : Text | Remote : Text | Local : Text | Missing >.Missing diff --git a/dhall/tests/import/success/unit/asLocation/RelativeA.dhall b/dhall/tests/import/success/unit/asLocation/RelativeA.dhall new file mode 100644 index 0000000..b514f79 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RelativeA.dhall @@ -0,0 +1 @@ +./some/import.dhall as Location diff --git a/dhall/tests/import/success/unit/asLocation/RelativeB.dhall b/dhall/tests/import/success/unit/asLocation/RelativeB.dhall new file mode 100644 index 0000000..b3bd255 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RelativeB.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Remote : Text | Local : Text | Missing >.Local + "./dhall/tests/import/success/unit/asLocation/some/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/RemoteA.dhall b/dhall/tests/import/success/unit/asLocation/RemoteA.dhall new file mode 100644 index 0000000..e0be314 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RemoteA.dhall @@ -0,0 +1 @@ +https://prelude.dhall-lang.org/package.dhall as Location diff --git a/dhall/tests/import/success/unit/asLocation/RemoteB.dhall b/dhall/tests/import/success/unit/asLocation/RemoteB.dhall new file mode 100644 index 0000000..8ab6366 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RemoteB.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Remote : Text | Local : Text | Missing >.Remote + "https://prelude.dhall-lang.org/package.dhall" -- cgit v1.2.3 From 36fc9b140373ffacd90ab45750f97424d3808748 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Sat, 29 Feb 2020 22:50:31 +0000 Subject: Run tests from dhall dir --- dhall/tests/import/success/unit/asLocation/Canonicalize1B.dhall | 2 +- dhall/tests/import/success/unit/asLocation/Canonicalize2B.dhall | 2 +- dhall/tests/import/success/unit/asLocation/Canonicalize3B.dhall | 2 +- dhall/tests/import/success/unit/asLocation/Canonicalize4B.dhall | 2 +- dhall/tests/import/success/unit/asLocation/Canonicalize5B.dhall | 2 +- dhall/tests/import/success/unit/asLocation/Chain1B.dhall | 2 +- dhall/tests/import/success/unit/asLocation/Chain2B.dhall | 2 +- dhall/tests/import/success/unit/asLocation/Chain3B.dhall | 2 +- dhall/tests/import/success/unit/asLocation/HashB.dhall | 2 +- dhall/tests/import/success/unit/asLocation/RelativeB.dhall | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) (limited to 'dhall/tests/import') diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize1B.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize1B.dhall index 3a8a926..b7d9f3d 100644 --- a/dhall/tests/import/success/unit/asLocation/Canonicalize1B.dhall +++ b/dhall/tests/import/success/unit/asLocation/Canonicalize1B.dhall @@ -1,2 +1,2 @@ < Environment : Text | Remote : Text | Local : Text | Missing >.Local - "./dhall/tests/import/success/unit/asLocation/foo/bar/import.dhall" + "./tests/import/success/unit/asLocation/foo/bar/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize2B.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize2B.dhall index 3a8a926..b7d9f3d 100644 --- a/dhall/tests/import/success/unit/asLocation/Canonicalize2B.dhall +++ b/dhall/tests/import/success/unit/asLocation/Canonicalize2B.dhall @@ -1,2 +1,2 @@ < Environment : Text | Remote : Text | Local : Text | Missing >.Local - "./dhall/tests/import/success/unit/asLocation/foo/bar/import.dhall" + "./tests/import/success/unit/asLocation/foo/bar/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize3B.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize3B.dhall index b223da6..d54f065 100644 --- a/dhall/tests/import/success/unit/asLocation/Canonicalize3B.dhall +++ b/dhall/tests/import/success/unit/asLocation/Canonicalize3B.dhall @@ -1,2 +1,2 @@ < Environment : Text | Remote : Text | Local : Text | Missing >.Local - "./dhall/tests/import/success/unit/bar/import.dhall" + "./tests/import/success/unit/bar/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize4B.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize4B.dhall index b6301f8..7dd93f7 100644 --- a/dhall/tests/import/success/unit/asLocation/Canonicalize4B.dhall +++ b/dhall/tests/import/success/unit/asLocation/Canonicalize4B.dhall @@ -1,2 +1,2 @@ < Environment : Text | Remote : Text | Local : Text | Missing >.Local - "./dhall/tests/import/success/bar/import.dhall" + "./tests/import/success/bar/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize5B.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize5B.dhall index b223da6..d54f065 100644 --- a/dhall/tests/import/success/unit/asLocation/Canonicalize5B.dhall +++ b/dhall/tests/import/success/unit/asLocation/Canonicalize5B.dhall @@ -1,2 +1,2 @@ < Environment : Text | Remote : Text | Local : Text | Missing >.Local - "./dhall/tests/import/success/unit/bar/import.dhall" + "./tests/import/success/unit/bar/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/Chain1B.dhall b/dhall/tests/import/success/unit/asLocation/Chain1B.dhall index 6aee0b5..3055c8e 100644 --- a/dhall/tests/import/success/unit/asLocation/Chain1B.dhall +++ b/dhall/tests/import/success/unit/asLocation/Chain1B.dhall @@ -1,2 +1,2 @@ < Environment : Text | Local : Text | Missing | Remote : Text >.Local - "./dhall/tests/import/success/unit/asLocation/some/import.dhall" + "./tests/import/success/unit/asLocation/some/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/Chain2B.dhall b/dhall/tests/import/success/unit/asLocation/Chain2B.dhall index 6aba54e..20df611 100644 --- a/dhall/tests/import/success/unit/asLocation/Chain2B.dhall +++ b/dhall/tests/import/success/unit/asLocation/Chain2B.dhall @@ -1,2 +1,2 @@ < Environment : Text | Local : Text | Missing | Remote : Text >.Local - "./dhall/tests/import/success/bar/import.dhall" + "./tests/import/success/bar/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/Chain3B.dhall b/dhall/tests/import/success/unit/asLocation/Chain3B.dhall index 6aba54e..20df611 100644 --- a/dhall/tests/import/success/unit/asLocation/Chain3B.dhall +++ b/dhall/tests/import/success/unit/asLocation/Chain3B.dhall @@ -1,2 +1,2 @@ < Environment : Text | Local : Text | Missing | Remote : Text >.Local - "./dhall/tests/import/success/bar/import.dhall" + "./tests/import/success/bar/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/HashB.dhall b/dhall/tests/import/success/unit/asLocation/HashB.dhall index 6aee0b5..3055c8e 100644 --- a/dhall/tests/import/success/unit/asLocation/HashB.dhall +++ b/dhall/tests/import/success/unit/asLocation/HashB.dhall @@ -1,2 +1,2 @@ < Environment : Text | Local : Text | Missing | Remote : Text >.Local - "./dhall/tests/import/success/unit/asLocation/some/import.dhall" + "./tests/import/success/unit/asLocation/some/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/RelativeB.dhall b/dhall/tests/import/success/unit/asLocation/RelativeB.dhall index b3bd255..1ef12f2 100644 --- a/dhall/tests/import/success/unit/asLocation/RelativeB.dhall +++ b/dhall/tests/import/success/unit/asLocation/RelativeB.dhall @@ -1,2 +1,2 @@ < Environment : Text | Remote : Text | Local : Text | Missing >.Local - "./dhall/tests/import/success/unit/asLocation/some/import.dhall" + "./tests/import/success/unit/asLocation/some/import.dhall" -- cgit v1.2.3 From 81ce30dde067ca0067fda32b1e0ade1dbdfbdf58 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Sat, 29 Feb 2020 23:21:18 +0000 Subject: Implement `as Location` imports --- dhall/tests/import/success/unit/asLocation/Chain3A.dhall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dhall/tests/import') diff --git a/dhall/tests/import/success/unit/asLocation/Chain3A.dhall b/dhall/tests/import/success/unit/asLocation/Chain3A.dhall index b44f0d4..57751f6 100644 --- a/dhall/tests/import/success/unit/asLocation/Chain3A.dhall +++ b/dhall/tests/import/success/unit/asLocation/Chain3A.dhall @@ -1 +1 @@ -./../asLocation/Canonicalize4A.dhall +../asLocation/Canonicalize4A.dhall -- cgit v1.2.3 From e277fb2f7316fef5c20e7c485eeba1f14328d621 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Sun, 1 Mar 2020 15:36:44 +0000 Subject: Run tests from repo root as specified in spec --- dhall/tests/import/success/unit/asLocation/Canonicalize1B.dhall | 2 +- dhall/tests/import/success/unit/asLocation/Canonicalize2B.dhall | 2 +- dhall/tests/import/success/unit/asLocation/Canonicalize3B.dhall | 2 +- dhall/tests/import/success/unit/asLocation/Canonicalize4B.dhall | 2 +- dhall/tests/import/success/unit/asLocation/Canonicalize5B.dhall | 2 +- dhall/tests/import/success/unit/asLocation/Chain1B.dhall | 2 +- dhall/tests/import/success/unit/asLocation/Chain2B.dhall | 2 +- dhall/tests/import/success/unit/asLocation/Chain3B.dhall | 2 +- dhall/tests/import/success/unit/asLocation/HashB.dhall | 2 +- dhall/tests/import/success/unit/asLocation/RelativeB.dhall | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) (limited to 'dhall/tests/import') diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize1B.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize1B.dhall index b7d9f3d..3a8a926 100644 --- a/dhall/tests/import/success/unit/asLocation/Canonicalize1B.dhall +++ b/dhall/tests/import/success/unit/asLocation/Canonicalize1B.dhall @@ -1,2 +1,2 @@ < Environment : Text | Remote : Text | Local : Text | Missing >.Local - "./tests/import/success/unit/asLocation/foo/bar/import.dhall" + "./dhall/tests/import/success/unit/asLocation/foo/bar/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize2B.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize2B.dhall index b7d9f3d..3a8a926 100644 --- a/dhall/tests/import/success/unit/asLocation/Canonicalize2B.dhall +++ b/dhall/tests/import/success/unit/asLocation/Canonicalize2B.dhall @@ -1,2 +1,2 @@ < Environment : Text | Remote : Text | Local : Text | Missing >.Local - "./tests/import/success/unit/asLocation/foo/bar/import.dhall" + "./dhall/tests/import/success/unit/asLocation/foo/bar/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize3B.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize3B.dhall index d54f065..b223da6 100644 --- a/dhall/tests/import/success/unit/asLocation/Canonicalize3B.dhall +++ b/dhall/tests/import/success/unit/asLocation/Canonicalize3B.dhall @@ -1,2 +1,2 @@ < Environment : Text | Remote : Text | Local : Text | Missing >.Local - "./tests/import/success/unit/bar/import.dhall" + "./dhall/tests/import/success/unit/bar/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize4B.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize4B.dhall index 7dd93f7..b6301f8 100644 --- a/dhall/tests/import/success/unit/asLocation/Canonicalize4B.dhall +++ b/dhall/tests/import/success/unit/asLocation/Canonicalize4B.dhall @@ -1,2 +1,2 @@ < Environment : Text | Remote : Text | Local : Text | Missing >.Local - "./tests/import/success/bar/import.dhall" + "./dhall/tests/import/success/bar/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize5B.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize5B.dhall index d54f065..b223da6 100644 --- a/dhall/tests/import/success/unit/asLocation/Canonicalize5B.dhall +++ b/dhall/tests/import/success/unit/asLocation/Canonicalize5B.dhall @@ -1,2 +1,2 @@ < Environment : Text | Remote : Text | Local : Text | Missing >.Local - "./tests/import/success/unit/bar/import.dhall" + "./dhall/tests/import/success/unit/bar/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/Chain1B.dhall b/dhall/tests/import/success/unit/asLocation/Chain1B.dhall index 3055c8e..6aee0b5 100644 --- a/dhall/tests/import/success/unit/asLocation/Chain1B.dhall +++ b/dhall/tests/import/success/unit/asLocation/Chain1B.dhall @@ -1,2 +1,2 @@ < Environment : Text | Local : Text | Missing | Remote : Text >.Local - "./tests/import/success/unit/asLocation/some/import.dhall" + "./dhall/tests/import/success/unit/asLocation/some/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/Chain2B.dhall b/dhall/tests/import/success/unit/asLocation/Chain2B.dhall index 20df611..6aba54e 100644 --- a/dhall/tests/import/success/unit/asLocation/Chain2B.dhall +++ b/dhall/tests/import/success/unit/asLocation/Chain2B.dhall @@ -1,2 +1,2 @@ < Environment : Text | Local : Text | Missing | Remote : Text >.Local - "./tests/import/success/bar/import.dhall" + "./dhall/tests/import/success/bar/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/Chain3B.dhall b/dhall/tests/import/success/unit/asLocation/Chain3B.dhall index 20df611..6aba54e 100644 --- a/dhall/tests/import/success/unit/asLocation/Chain3B.dhall +++ b/dhall/tests/import/success/unit/asLocation/Chain3B.dhall @@ -1,2 +1,2 @@ < Environment : Text | Local : Text | Missing | Remote : Text >.Local - "./tests/import/success/bar/import.dhall" + "./dhall/tests/import/success/bar/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/HashB.dhall b/dhall/tests/import/success/unit/asLocation/HashB.dhall index 3055c8e..6aee0b5 100644 --- a/dhall/tests/import/success/unit/asLocation/HashB.dhall +++ b/dhall/tests/import/success/unit/asLocation/HashB.dhall @@ -1,2 +1,2 @@ < Environment : Text | Local : Text | Missing | Remote : Text >.Local - "./tests/import/success/unit/asLocation/some/import.dhall" + "./dhall/tests/import/success/unit/asLocation/some/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/RelativeB.dhall b/dhall/tests/import/success/unit/asLocation/RelativeB.dhall index 1ef12f2..b3bd255 100644 --- a/dhall/tests/import/success/unit/asLocation/RelativeB.dhall +++ b/dhall/tests/import/success/unit/asLocation/RelativeB.dhall @@ -1,2 +1,2 @@ < Environment : Text | Remote : Text | Local : Text | Missing >.Local - "./tests/import/success/unit/asLocation/some/import.dhall" + "./dhall/tests/import/success/unit/asLocation/some/import.dhall" -- cgit v1.2.3 From 24ff14dc98b83ddc12239a0eae4852c9cd87d41f Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Sun, 1 Mar 2020 16:37:10 +0000 Subject: Add a lot of import tests --- dhall/tests/import/data/cycle.dhall | 1 + dhall/tests/import/data/doesNotTypecheck.dhall | 1 + dhall/tests/import/data/example.txt | 1 + dhall/tests/import/data/fieldOrder/1.dhall | 1 + dhall/tests/import/data/fieldOrder/2.dhall | 1 + dhall/tests/import/data/importBoundary.dhall | 3 +++ dhall/tests/import/data/nested.dhall | 1 + dhall/tests/import/data/referentiallyOpaque.dhall | 18 ++++++++++++++++++ dhall/tests/import/data/simple.dhall | 1 + dhall/tests/import/data/simpleLocation.dhall | 1 + dhall/tests/import/failure/unit/EnvUnset.dhall | 1 + dhall/tests/import/failure/unit/EnvUnsetAsText.dhall | 1 + .../tests/import/success/unit/AlternativeChain1A.dhall | 1 + .../tests/import/success/unit/AlternativeChain1B.dhall | 1 + .../tests/import/success/unit/AlternativeChain2A.dhall | 1 + .../tests/import/success/unit/AlternativeChain2B.dhall | 1 + dhall/tests/import/success/unit/AlternativeEnvA.dhall | 1 + dhall/tests/import/success/unit/AlternativeEnvB.dhall | 1 + .../import/success/unit/AlternativeHashMismatchA.dhall | 1 + .../import/success/unit/AlternativeHashMismatchB.dhall | 1 + .../import/success/unit/AlternativeImportErrorA.dhall | 1 + .../import/success/unit/AlternativeImportErrorB.dhall | 1 + .../success/unit/AlternativeNestedImportErrorA.dhall | 1 + .../success/unit/AlternativeNestedImportErrorB.dhall | 1 + .../import/success/unit/AlternativeNoError1A.dhall | 1 + .../import/success/unit/AlternativeNoError1B.dhall | 1 + .../import/success/unit/AlternativeNoError2A.dhall | 1 + .../import/success/unit/AlternativeNoError2B.dhall | 1 + .../import/success/unit/AlternativeNoError3A.dhall | 1 + .../import/success/unit/AlternativeNoError3B.dhall | 1 + .../import/success/unit/AlternativeParseErrorA.dhall | 1 + .../import/success/unit/AlternativeParseErrorB.dhall | 1 + .../import/success/unit/AlternativeSubExprA.dhall | 1 + .../import/success/unit/AlternativeSubExprB.dhall | 1 + .../import/success/unit/AlternativeTypeErrorA.dhall | 1 + .../import/success/unit/AlternativeTypeErrorB.dhall | 1 + dhall/tests/import/success/unit/AsTextA.dhall | 1 + dhall/tests/import/success/unit/AsTextB.dhall | 3 +++ dhall/tests/import/success/unit/EnvSetA.dhall | 1 + dhall/tests/import/success/unit/EnvSetAsTextA.dhall | 1 + dhall/tests/import/success/unit/EnvSetAsTextB.dhall | 1 + dhall/tests/import/success/unit/EnvSetB.dhall | 1 + dhall/tests/import/success/unit/NormalizeA.dhall | 1 + dhall/tests/import/success/unit/NormalizeB.dhall | 1 + dhall/tests/import/success/unit/SimpleA.dhall | 1 + dhall/tests/import/success/unit/SimpleB.dhall | 1 + dhall/tests/import/success/unit/SimpleRemoteA.dhall | 1 + dhall/tests/import/success/unit/SimpleRemoteB.dhall | 1 + 48 files changed, 69 insertions(+) create mode 100644 dhall/tests/import/data/cycle.dhall create mode 100644 dhall/tests/import/data/doesNotTypecheck.dhall create mode 100644 dhall/tests/import/data/example.txt create mode 100644 dhall/tests/import/data/fieldOrder/1.dhall create mode 100644 dhall/tests/import/data/fieldOrder/2.dhall create mode 100644 dhall/tests/import/data/importBoundary.dhall create mode 100644 dhall/tests/import/data/nested.dhall create mode 100644 dhall/tests/import/data/referentiallyOpaque.dhall create mode 100644 dhall/tests/import/data/simple.dhall create mode 100644 dhall/tests/import/data/simpleLocation.dhall create mode 100644 dhall/tests/import/failure/unit/EnvUnset.dhall create mode 100644 dhall/tests/import/failure/unit/EnvUnsetAsText.dhall create mode 100644 dhall/tests/import/success/unit/AlternativeChain1A.dhall create mode 100644 dhall/tests/import/success/unit/AlternativeChain1B.dhall create mode 100644 dhall/tests/import/success/unit/AlternativeChain2A.dhall create mode 100644 dhall/tests/import/success/unit/AlternativeChain2B.dhall create mode 100644 dhall/tests/import/success/unit/AlternativeEnvA.dhall create mode 100644 dhall/tests/import/success/unit/AlternativeEnvB.dhall create mode 100644 dhall/tests/import/success/unit/AlternativeHashMismatchA.dhall create mode 100644 dhall/tests/import/success/unit/AlternativeHashMismatchB.dhall create mode 100644 dhall/tests/import/success/unit/AlternativeImportErrorA.dhall create mode 100644 dhall/tests/import/success/unit/AlternativeImportErrorB.dhall create mode 100644 dhall/tests/import/success/unit/AlternativeNestedImportErrorA.dhall create mode 100644 dhall/tests/import/success/unit/AlternativeNestedImportErrorB.dhall create mode 100644 dhall/tests/import/success/unit/AlternativeNoError1A.dhall create mode 100644 dhall/tests/import/success/unit/AlternativeNoError1B.dhall create mode 100644 dhall/tests/import/success/unit/AlternativeNoError2A.dhall create mode 100644 dhall/tests/import/success/unit/AlternativeNoError2B.dhall create mode 100644 dhall/tests/import/success/unit/AlternativeNoError3A.dhall create mode 100644 dhall/tests/import/success/unit/AlternativeNoError3B.dhall create mode 100644 dhall/tests/import/success/unit/AlternativeParseErrorA.dhall create mode 100644 dhall/tests/import/success/unit/AlternativeParseErrorB.dhall create mode 100644 dhall/tests/import/success/unit/AlternativeSubExprA.dhall create mode 100644 dhall/tests/import/success/unit/AlternativeSubExprB.dhall create mode 100644 dhall/tests/import/success/unit/AlternativeTypeErrorA.dhall create mode 100644 dhall/tests/import/success/unit/AlternativeTypeErrorB.dhall create mode 100644 dhall/tests/import/success/unit/AsTextA.dhall create mode 100644 dhall/tests/import/success/unit/AsTextB.dhall create mode 100644 dhall/tests/import/success/unit/EnvSetA.dhall create mode 100644 dhall/tests/import/success/unit/EnvSetAsTextA.dhall create mode 100644 dhall/tests/import/success/unit/EnvSetAsTextB.dhall create mode 100644 dhall/tests/import/success/unit/EnvSetB.dhall create mode 100644 dhall/tests/import/success/unit/NormalizeA.dhall create mode 100644 dhall/tests/import/success/unit/NormalizeB.dhall create mode 100644 dhall/tests/import/success/unit/SimpleA.dhall create mode 100644 dhall/tests/import/success/unit/SimpleB.dhall create mode 100644 dhall/tests/import/success/unit/SimpleRemoteA.dhall create mode 100644 dhall/tests/import/success/unit/SimpleRemoteB.dhall (limited to 'dhall/tests/import') diff --git a/dhall/tests/import/data/cycle.dhall b/dhall/tests/import/data/cycle.dhall new file mode 100644 index 0000000..c370a8d --- /dev/null +++ b/dhall/tests/import/data/cycle.dhall @@ -0,0 +1 @@ +../failure/cycle.dhall diff --git a/dhall/tests/import/data/doesNotTypecheck.dhall b/dhall/tests/import/data/doesNotTypecheck.dhall new file mode 100644 index 0000000..b748e2d --- /dev/null +++ b/dhall/tests/import/data/doesNotTypecheck.dhall @@ -0,0 +1 @@ +0 0 diff --git a/dhall/tests/import/data/example.txt b/dhall/tests/import/data/example.txt new file mode 100644 index 0000000..af5626b --- /dev/null +++ b/dhall/tests/import/data/example.txt @@ -0,0 +1 @@ +Hello, world! diff --git a/dhall/tests/import/data/fieldOrder/1.dhall b/dhall/tests/import/data/fieldOrder/1.dhall new file mode 100644 index 0000000..797e071 --- /dev/null +++ b/dhall/tests/import/data/fieldOrder/1.dhall @@ -0,0 +1 @@ +{ foo = 1, bar = True } diff --git a/dhall/tests/import/data/fieldOrder/2.dhall b/dhall/tests/import/data/fieldOrder/2.dhall new file mode 100644 index 0000000..c16b568 --- /dev/null +++ b/dhall/tests/import/data/fieldOrder/2.dhall @@ -0,0 +1 @@ +{ bar = True, foo = 1 } diff --git a/dhall/tests/import/data/importBoundary.dhall b/dhall/tests/import/data/importBoundary.dhall new file mode 100644 index 0000000..e6f1074 --- /dev/null +++ b/dhall/tests/import/data/importBoundary.dhall @@ -0,0 +1,3 @@ +-- This file contains a free variable. This should be a type error, even if the variable +-- is in scope in the importing expression +x diff --git a/dhall/tests/import/data/nested.dhall b/dhall/tests/import/data/nested.dhall new file mode 100644 index 0000000..bf88f65 --- /dev/null +++ b/dhall/tests/import/data/nested.dhall @@ -0,0 +1 @@ +{ x = ./simple.dhall sha256:15f52ecf91c94c1baac02d5a4964b2ed8fa401641a2c8a95e8306ec7c1e3b8d2 } diff --git a/dhall/tests/import/data/referentiallyOpaque.dhall b/dhall/tests/import/data/referentiallyOpaque.dhall new file mode 100644 index 0000000..ff33765 --- /dev/null +++ b/dhall/tests/import/data/referentiallyOpaque.dhall @@ -0,0 +1,18 @@ +{- This is a "referentially opaque" import (i.e. an import that is not + globally addressable), which cannot be imported by a "referentially + transparent" import (i.e. an import that is globally addressable). + + This test file is used in a failing test to verify that referentially + transparent imports cannot import referentially opaque imports. In the test + suite this file is actually imported via its GitHub URL (not its local file + path), so it plays the role of the referentially transparent import. Then, + this file attempts to import a referentially opaque import (an environment + variable in this case) to verify that the import fails. + + For this test file we need to select a referentially opaque import that + would succeed if imported on its own, so that a non-compliant implementation + doesn't fail this test for the wrong reason (i.e. due to the import not + being present). We thus use the `DHALL_TEST_VAR` environment variable, that + is expected to be set when running import tests. +-} +env:DHALL_TEST_VAR as Text diff --git a/dhall/tests/import/data/simple.dhall b/dhall/tests/import/data/simple.dhall new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/dhall/tests/import/data/simple.dhall @@ -0,0 +1 @@ +3 diff --git a/dhall/tests/import/data/simpleLocation.dhall b/dhall/tests/import/data/simpleLocation.dhall new file mode 100644 index 0000000..1d3e43b --- /dev/null +++ b/dhall/tests/import/data/simpleLocation.dhall @@ -0,0 +1 @@ +./simple.dhall as Location diff --git a/dhall/tests/import/failure/unit/EnvUnset.dhall b/dhall/tests/import/failure/unit/EnvUnset.dhall new file mode 100644 index 0000000..af77cce --- /dev/null +++ b/dhall/tests/import/failure/unit/EnvUnset.dhall @@ -0,0 +1 @@ +env:DHALL_TEST_UNSET diff --git a/dhall/tests/import/failure/unit/EnvUnsetAsText.dhall b/dhall/tests/import/failure/unit/EnvUnsetAsText.dhall new file mode 100644 index 0000000..9a9db6d --- /dev/null +++ b/dhall/tests/import/failure/unit/EnvUnsetAsText.dhall @@ -0,0 +1 @@ +env:DHALL_TEST_UNSET as Text diff --git a/dhall/tests/import/success/unit/AlternativeChain1A.dhall b/dhall/tests/import/success/unit/AlternativeChain1A.dhall new file mode 100644 index 0000000..15fbf4b --- /dev/null +++ b/dhall/tests/import/success/unit/AlternativeChain1A.dhall @@ -0,0 +1 @@ +missing ? missing ? 42 diff --git a/dhall/tests/import/success/unit/AlternativeChain1B.dhall b/dhall/tests/import/success/unit/AlternativeChain1B.dhall new file mode 100644 index 0000000..d81cc07 --- /dev/null +++ b/dhall/tests/import/success/unit/AlternativeChain1B.dhall @@ -0,0 +1 @@ +42 diff --git a/dhall/tests/import/success/unit/AlternativeChain2A.dhall b/dhall/tests/import/success/unit/AlternativeChain2A.dhall new file mode 100644 index 0000000..f3ba4b5 --- /dev/null +++ b/dhall/tests/import/success/unit/AlternativeChain2A.dhall @@ -0,0 +1 @@ +missing ? 42 ? 10 diff --git a/dhall/tests/import/success/unit/AlternativeChain2B.dhall b/dhall/tests/import/success/unit/AlternativeChain2B.dhall new file mode 100644 index 0000000..d81cc07 --- /dev/null +++ b/dhall/tests/import/success/unit/AlternativeChain2B.dhall @@ -0,0 +1 @@ +42 diff --git a/dhall/tests/import/success/unit/AlternativeEnvA.dhall b/dhall/tests/import/success/unit/AlternativeEnvA.dhall new file mode 100644 index 0000000..1807534 --- /dev/null +++ b/dhall/tests/import/success/unit/AlternativeEnvA.dhall @@ -0,0 +1 @@ +env:DHALL_TEST_UNSET ? 42 diff --git a/dhall/tests/import/success/unit/AlternativeEnvB.dhall b/dhall/tests/import/success/unit/AlternativeEnvB.dhall new file mode 100644 index 0000000..d81cc07 --- /dev/null +++ b/dhall/tests/import/success/unit/AlternativeEnvB.dhall @@ -0,0 +1 @@ +42 diff --git a/dhall/tests/import/success/unit/AlternativeHashMismatchA.dhall b/dhall/tests/import/success/unit/AlternativeHashMismatchA.dhall new file mode 100644 index 0000000..8f7fb02 --- /dev/null +++ b/dhall/tests/import/success/unit/AlternativeHashMismatchA.dhall @@ -0,0 +1 @@ +../../data/simple.dhall sha256:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ? 42 diff --git a/dhall/tests/import/success/unit/AlternativeHashMismatchB.dhall b/dhall/tests/import/success/unit/AlternativeHashMismatchB.dhall new file mode 100644 index 0000000..d81cc07 --- /dev/null +++ b/dhall/tests/import/success/unit/AlternativeHashMismatchB.dhall @@ -0,0 +1 @@ +42 diff --git a/dhall/tests/import/success/unit/AlternativeImportErrorA.dhall b/dhall/tests/import/success/unit/AlternativeImportErrorA.dhall new file mode 100644 index 0000000..9ecc640 --- /dev/null +++ b/dhall/tests/import/success/unit/AlternativeImportErrorA.dhall @@ -0,0 +1 @@ +missing ? 42 diff --git a/dhall/tests/import/success/unit/AlternativeImportErrorB.dhall b/dhall/tests/import/success/unit/AlternativeImportErrorB.dhall new file mode 100644 index 0000000..d81cc07 --- /dev/null +++ b/dhall/tests/import/success/unit/AlternativeImportErrorB.dhall @@ -0,0 +1 @@ +42 diff --git a/dhall/tests/import/success/unit/AlternativeNestedImportErrorA.dhall b/dhall/tests/import/success/unit/AlternativeNestedImportErrorA.dhall new file mode 100644 index 0000000..d681287 --- /dev/null +++ b/dhall/tests/import/success/unit/AlternativeNestedImportErrorA.dhall @@ -0,0 +1 @@ +../../failure/missing.dhall ? 42 diff --git a/dhall/tests/import/success/unit/AlternativeNestedImportErrorB.dhall b/dhall/tests/import/success/unit/AlternativeNestedImportErrorB.dhall new file mode 100644 index 0000000..d81cc07 --- /dev/null +++ b/dhall/tests/import/success/unit/AlternativeNestedImportErrorB.dhall @@ -0,0 +1 @@ +42 diff --git a/dhall/tests/import/success/unit/AlternativeNoError1A.dhall b/dhall/tests/import/success/unit/AlternativeNoError1A.dhall new file mode 100644 index 0000000..f7c9caf --- /dev/null +++ b/dhall/tests/import/success/unit/AlternativeNoError1A.dhall @@ -0,0 +1 @@ +42 ? 10 diff --git a/dhall/tests/import/success/unit/AlternativeNoError1B.dhall b/dhall/tests/import/success/unit/AlternativeNoError1B.dhall new file mode 100644 index 0000000..d81cc07 --- /dev/null +++ b/dhall/tests/import/success/unit/AlternativeNoError1B.dhall @@ -0,0 +1 @@ +42 diff --git a/dhall/tests/import/success/unit/AlternativeNoError2A.dhall b/dhall/tests/import/success/unit/AlternativeNoError2A.dhall new file mode 100644 index 0000000..877afd2 --- /dev/null +++ b/dhall/tests/import/success/unit/AlternativeNoError2A.dhall @@ -0,0 +1 @@ +42 ? missing diff --git a/dhall/tests/import/success/unit/AlternativeNoError2B.dhall b/dhall/tests/import/success/unit/AlternativeNoError2B.dhall new file mode 100644 index 0000000..d81cc07 --- /dev/null +++ b/dhall/tests/import/success/unit/AlternativeNoError2B.dhall @@ -0,0 +1 @@ +42 diff --git a/dhall/tests/import/success/unit/AlternativeNoError3A.dhall b/dhall/tests/import/success/unit/AlternativeNoError3A.dhall new file mode 100644 index 0000000..91bcda2 --- /dev/null +++ b/dhall/tests/import/success/unit/AlternativeNoError3A.dhall @@ -0,0 +1 @@ +env:DHALL_TEST_VAR ? 10 diff --git a/dhall/tests/import/success/unit/AlternativeNoError3B.dhall b/dhall/tests/import/success/unit/AlternativeNoError3B.dhall new file mode 100644 index 0000000..d81cc07 --- /dev/null +++ b/dhall/tests/import/success/unit/AlternativeNoError3B.dhall @@ -0,0 +1 @@ +42 diff --git a/dhall/tests/import/success/unit/AlternativeParseErrorA.dhall b/dhall/tests/import/success/unit/AlternativeParseErrorA.dhall new file mode 100644 index 0000000..d427c5d --- /dev/null +++ b/dhall/tests/import/success/unit/AlternativeParseErrorA.dhall @@ -0,0 +1 @@ +../../data/example.txt ? 42 diff --git a/dhall/tests/import/success/unit/AlternativeParseErrorB.dhall b/dhall/tests/import/success/unit/AlternativeParseErrorB.dhall new file mode 100644 index 0000000..d81cc07 --- /dev/null +++ b/dhall/tests/import/success/unit/AlternativeParseErrorB.dhall @@ -0,0 +1 @@ +42 diff --git a/dhall/tests/import/success/unit/AlternativeSubExprA.dhall b/dhall/tests/import/success/unit/AlternativeSubExprA.dhall new file mode 100644 index 0000000..2c13f4b --- /dev/null +++ b/dhall/tests/import/success/unit/AlternativeSubExprA.dhall @@ -0,0 +1 @@ +missing + 10 ? 42 diff --git a/dhall/tests/import/success/unit/AlternativeSubExprB.dhall b/dhall/tests/import/success/unit/AlternativeSubExprB.dhall new file mode 100644 index 0000000..d81cc07 --- /dev/null +++ b/dhall/tests/import/success/unit/AlternativeSubExprB.dhall @@ -0,0 +1 @@ +42 diff --git a/dhall/tests/import/success/unit/AlternativeTypeErrorA.dhall b/dhall/tests/import/success/unit/AlternativeTypeErrorA.dhall new file mode 100644 index 0000000..24ae717 --- /dev/null +++ b/dhall/tests/import/success/unit/AlternativeTypeErrorA.dhall @@ -0,0 +1 @@ +../../data/doesNotTypecheck.dhall ? 42 diff --git a/dhall/tests/import/success/unit/AlternativeTypeErrorB.dhall b/dhall/tests/import/success/unit/AlternativeTypeErrorB.dhall new file mode 100644 index 0000000..d81cc07 --- /dev/null +++ b/dhall/tests/import/success/unit/AlternativeTypeErrorB.dhall @@ -0,0 +1 @@ +42 diff --git a/dhall/tests/import/success/unit/AsTextA.dhall b/dhall/tests/import/success/unit/AsTextA.dhall new file mode 100644 index 0000000..9edb0ed --- /dev/null +++ b/dhall/tests/import/success/unit/AsTextA.dhall @@ -0,0 +1 @@ +../../data/example.txt as Text diff --git a/dhall/tests/import/success/unit/AsTextB.dhall b/dhall/tests/import/success/unit/AsTextB.dhall new file mode 100644 index 0000000..1997a89 --- /dev/null +++ b/dhall/tests/import/success/unit/AsTextB.dhall @@ -0,0 +1,3 @@ +'' +Hello, world! +'' diff --git a/dhall/tests/import/success/unit/EnvSetA.dhall b/dhall/tests/import/success/unit/EnvSetA.dhall new file mode 100644 index 0000000..f851f2a --- /dev/null +++ b/dhall/tests/import/success/unit/EnvSetA.dhall @@ -0,0 +1 @@ +env:DHALL_TEST_VAR diff --git a/dhall/tests/import/success/unit/EnvSetAsTextA.dhall b/dhall/tests/import/success/unit/EnvSetAsTextA.dhall new file mode 100644 index 0000000..139b241 --- /dev/null +++ b/dhall/tests/import/success/unit/EnvSetAsTextA.dhall @@ -0,0 +1 @@ +env:DHALL_TEST_VAR as Text diff --git a/dhall/tests/import/success/unit/EnvSetAsTextB.dhall b/dhall/tests/import/success/unit/EnvSetAsTextB.dhall new file mode 100644 index 0000000..192548e --- /dev/null +++ b/dhall/tests/import/success/unit/EnvSetAsTextB.dhall @@ -0,0 +1 @@ +"42" diff --git a/dhall/tests/import/success/unit/EnvSetB.dhall b/dhall/tests/import/success/unit/EnvSetB.dhall new file mode 100644 index 0000000..d81cc07 --- /dev/null +++ b/dhall/tests/import/success/unit/EnvSetB.dhall @@ -0,0 +1 @@ +42 diff --git a/dhall/tests/import/success/unit/NormalizeA.dhall b/dhall/tests/import/success/unit/NormalizeA.dhall new file mode 100644 index 0000000..2f89d08 --- /dev/null +++ b/dhall/tests/import/success/unit/NormalizeA.dhall @@ -0,0 +1 @@ +../../../../../dhall-lang/tests/normalization/success/unit/OperatorPlusOneAndOneA.dhall diff --git a/dhall/tests/import/success/unit/NormalizeB.dhall b/dhall/tests/import/success/unit/NormalizeB.dhall new file mode 100644 index 0000000..0cfbf08 --- /dev/null +++ b/dhall/tests/import/success/unit/NormalizeB.dhall @@ -0,0 +1 @@ +2 diff --git a/dhall/tests/import/success/unit/SimpleA.dhall b/dhall/tests/import/success/unit/SimpleA.dhall new file mode 100644 index 0000000..035ee8b --- /dev/null +++ b/dhall/tests/import/success/unit/SimpleA.dhall @@ -0,0 +1 @@ +../../data/simple.dhall diff --git a/dhall/tests/import/success/unit/SimpleB.dhall b/dhall/tests/import/success/unit/SimpleB.dhall new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/dhall/tests/import/success/unit/SimpleB.dhall @@ -0,0 +1 @@ +3 diff --git a/dhall/tests/import/success/unit/SimpleRemoteA.dhall b/dhall/tests/import/success/unit/SimpleRemoteA.dhall new file mode 100644 index 0000000..30e0a79 --- /dev/null +++ b/dhall/tests/import/success/unit/SimpleRemoteA.dhall @@ -0,0 +1 @@ +https://raw.githubusercontent.com/dhall-lang/dhall-lang/0b983b92aa2222dc3e292c20550ee37dea3f41df/tests/import/data/simple.dhall diff --git a/dhall/tests/import/success/unit/SimpleRemoteB.dhall b/dhall/tests/import/success/unit/SimpleRemoteB.dhall new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/dhall/tests/import/success/unit/SimpleRemoteB.dhall @@ -0,0 +1 @@ +3 -- cgit v1.2.3 From 386f34af802a812c2af8ece2cc427cfb5a7c1fe8 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Sun, 1 Mar 2020 17:26:59 +0000 Subject: Implement `missing` and `env:VAR` imports --- dhall/tests/import/failure/missing.txt | 1 + dhall/tests/import/failure/unit/EnvUnset.txt | 1 + 2 files changed, 2 insertions(+) create mode 100644 dhall/tests/import/failure/missing.txt create mode 100644 dhall/tests/import/failure/unit/EnvUnset.txt (limited to 'dhall/tests/import') diff --git a/dhall/tests/import/failure/missing.txt b/dhall/tests/import/failure/missing.txt new file mode 100644 index 0000000..4666330 --- /dev/null +++ b/dhall/tests/import/failure/missing.txt @@ -0,0 +1 @@ +Missing diff --git a/dhall/tests/import/failure/unit/EnvUnset.txt b/dhall/tests/import/failure/unit/EnvUnset.txt new file mode 100644 index 0000000..482b68c --- /dev/null +++ b/dhall/tests/import/failure/unit/EnvUnset.txt @@ -0,0 +1 @@ +MissingEnvVar -- cgit v1.2.3 From df4495f30708180591b630bb720cfe81ff4118ce Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Sun, 1 Mar 2020 18:18:01 +0000 Subject: Implement `as Text` imports --- dhall/tests/import/failure/alternativeEnv.txt | 1 + dhall/tests/import/failure/alternativeEnvMissing.txt | 1 + dhall/tests/import/failure/unit/EnvUnsetAsText.txt | 1 + dhall/tests/import/success/unit/EnvSetAsTextB.dhall | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 dhall/tests/import/failure/alternativeEnv.txt create mode 100644 dhall/tests/import/failure/alternativeEnvMissing.txt create mode 100644 dhall/tests/import/failure/unit/EnvUnsetAsText.txt (limited to 'dhall/tests/import') diff --git a/dhall/tests/import/failure/alternativeEnv.txt b/dhall/tests/import/failure/alternativeEnv.txt new file mode 100644 index 0000000..482b68c --- /dev/null +++ b/dhall/tests/import/failure/alternativeEnv.txt @@ -0,0 +1 @@ +MissingEnvVar diff --git a/dhall/tests/import/failure/alternativeEnvMissing.txt b/dhall/tests/import/failure/alternativeEnvMissing.txt new file mode 100644 index 0000000..4666330 --- /dev/null +++ b/dhall/tests/import/failure/alternativeEnvMissing.txt @@ -0,0 +1 @@ +Missing diff --git a/dhall/tests/import/failure/unit/EnvUnsetAsText.txt b/dhall/tests/import/failure/unit/EnvUnsetAsText.txt new file mode 100644 index 0000000..482b68c --- /dev/null +++ b/dhall/tests/import/failure/unit/EnvUnsetAsText.txt @@ -0,0 +1 @@ +MissingEnvVar diff --git a/dhall/tests/import/success/unit/EnvSetAsTextB.dhall b/dhall/tests/import/success/unit/EnvSetAsTextB.dhall index 192548e..a79bb82 100644 --- a/dhall/tests/import/success/unit/EnvSetAsTextB.dhall +++ b/dhall/tests/import/success/unit/EnvSetAsTextB.dhall @@ -1 +1 @@ -"42" +"6 * 7" -- cgit v1.2.3 From 5a9a5859eec0cf7deebf7fa07fe99f8dc8722ec8 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Sun, 1 Mar 2020 19:37:24 +0000 Subject: Implement remote `as Location` resolution --- dhall/tests/import/success/unit/asLocation/Chain1A.dhall | 2 +- dhall/tests/import/success/unit/asLocation/Relative1A.dhall | 1 + dhall/tests/import/success/unit/asLocation/Relative1B.dhall | 2 ++ dhall/tests/import/success/unit/asLocation/Relative2A.dhall | 1 + dhall/tests/import/success/unit/asLocation/Relative2B.dhall | 2 ++ dhall/tests/import/success/unit/asLocation/RelativeA.dhall | 1 - dhall/tests/import/success/unit/asLocation/RelativeB.dhall | 2 -- dhall/tests/import/success/unit/asLocation/RemoteA.dhall | 2 +- dhall/tests/import/success/unit/asLocation/RemoteB.dhall | 4 ++-- dhall/tests/import/success/unit/asLocation/RemoteCanonicalize1A.dhall | 1 + dhall/tests/import/success/unit/asLocation/RemoteCanonicalize1B.dhall | 2 ++ dhall/tests/import/success/unit/asLocation/RemoteCanonicalize2A.dhall | 1 + dhall/tests/import/success/unit/asLocation/RemoteCanonicalize2B.dhall | 2 ++ dhall/tests/import/success/unit/asLocation/RemoteCanonicalize3A.dhall | 1 + dhall/tests/import/success/unit/asLocation/RemoteCanonicalize3B.dhall | 2 ++ dhall/tests/import/success/unit/asLocation/RemoteCanonicalize4A.dhall | 1 + dhall/tests/import/success/unit/asLocation/RemoteCanonicalize4B.dhall | 2 ++ dhall/tests/import/success/unit/asLocation/RemoteChain1A.dhall | 1 + dhall/tests/import/success/unit/asLocation/RemoteChain1B.dhall | 2 ++ dhall/tests/import/success/unit/asLocation/RemoteChain2A.dhall | 1 + dhall/tests/import/success/unit/asLocation/RemoteChain2B.dhall | 2 ++ dhall/tests/import/success/unit/asLocation/RemoteChain3A.dhall | 1 + dhall/tests/import/success/unit/asLocation/RemoteChain3B.dhall | 2 ++ 23 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 dhall/tests/import/success/unit/asLocation/Relative1A.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/Relative1B.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/Relative2A.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/Relative2B.dhall delete mode 100644 dhall/tests/import/success/unit/asLocation/RelativeA.dhall delete mode 100644 dhall/tests/import/success/unit/asLocation/RelativeB.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RemoteCanonicalize1A.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RemoteCanonicalize1B.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RemoteCanonicalize2A.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RemoteCanonicalize2B.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RemoteCanonicalize3A.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RemoteCanonicalize3B.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RemoteCanonicalize4A.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RemoteCanonicalize4B.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RemoteChain1A.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RemoteChain1B.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RemoteChain2A.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RemoteChain2B.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RemoteChain3A.dhall create mode 100644 dhall/tests/import/success/unit/asLocation/RemoteChain3B.dhall (limited to 'dhall/tests/import') diff --git a/dhall/tests/import/success/unit/asLocation/Chain1A.dhall b/dhall/tests/import/success/unit/asLocation/Chain1A.dhall index 7b20bc3..cf633fe 100644 --- a/dhall/tests/import/success/unit/asLocation/Chain1A.dhall +++ b/dhall/tests/import/success/unit/asLocation/Chain1A.dhall @@ -1 +1 @@ -./RelativeA.dhall +./Relative1A.dhall diff --git a/dhall/tests/import/success/unit/asLocation/Relative1A.dhall b/dhall/tests/import/success/unit/asLocation/Relative1A.dhall new file mode 100644 index 0000000..b514f79 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/Relative1A.dhall @@ -0,0 +1 @@ +./some/import.dhall as Location diff --git a/dhall/tests/import/success/unit/asLocation/Relative1B.dhall b/dhall/tests/import/success/unit/asLocation/Relative1B.dhall new file mode 100644 index 0000000..6aee0b5 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/Relative1B.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Local : Text | Missing | Remote : Text >.Local + "./dhall/tests/import/success/unit/asLocation/some/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/Relative2A.dhall b/dhall/tests/import/success/unit/asLocation/Relative2A.dhall new file mode 100644 index 0000000..ec59586 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/Relative2A.dhall @@ -0,0 +1 @@ +../some/import.dhall as Location diff --git a/dhall/tests/import/success/unit/asLocation/Relative2B.dhall b/dhall/tests/import/success/unit/asLocation/Relative2B.dhall new file mode 100644 index 0000000..9842f7c --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/Relative2B.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Local : Text | Missing | Remote : Text >.Local + "./dhall/tests/import/success/unit/some/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/RelativeA.dhall b/dhall/tests/import/success/unit/asLocation/RelativeA.dhall deleted file mode 100644 index b514f79..0000000 --- a/dhall/tests/import/success/unit/asLocation/RelativeA.dhall +++ /dev/null @@ -1 +0,0 @@ -./some/import.dhall as Location diff --git a/dhall/tests/import/success/unit/asLocation/RelativeB.dhall b/dhall/tests/import/success/unit/asLocation/RelativeB.dhall deleted file mode 100644 index b3bd255..0000000 --- a/dhall/tests/import/success/unit/asLocation/RelativeB.dhall +++ /dev/null @@ -1,2 +0,0 @@ -< Environment : Text | Remote : Text | Local : Text | Missing >.Local - "./dhall/tests/import/success/unit/asLocation/some/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/RemoteA.dhall b/dhall/tests/import/success/unit/asLocation/RemoteA.dhall index e0be314..54ea028 100644 --- a/dhall/tests/import/success/unit/asLocation/RemoteA.dhall +++ b/dhall/tests/import/success/unit/asLocation/RemoteA.dhall @@ -1 +1 @@ -https://prelude.dhall-lang.org/package.dhall as Location +https://example.com/foo/import.dhall as Location diff --git a/dhall/tests/import/success/unit/asLocation/RemoteB.dhall b/dhall/tests/import/success/unit/asLocation/RemoteB.dhall index 8ab6366..e22cfac 100644 --- a/dhall/tests/import/success/unit/asLocation/RemoteB.dhall +++ b/dhall/tests/import/success/unit/asLocation/RemoteB.dhall @@ -1,2 +1,2 @@ -< Environment : Text | Remote : Text | Local : Text | Missing >.Remote - "https://prelude.dhall-lang.org/package.dhall" +< Environment : Text | Local : Text | Missing | Remote : Text >.Remote + "https://example.com/foo/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize1A.dhall b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize1A.dhall new file mode 100644 index 0000000..3e6378e --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize1A.dhall @@ -0,0 +1 @@ +https://example.com/foo/./bar/import.dhall as Location diff --git a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize1B.dhall b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize1B.dhall new file mode 100644 index 0000000..0064a13 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize1B.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Local : Text | Missing | Remote : Text >.Remote + "https://example.com/foo/bar/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize2A.dhall b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize2A.dhall new file mode 100644 index 0000000..d3fd11e --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize2A.dhall @@ -0,0 +1 @@ +https://example.com/foo/bar/../baz/import.dhall as Location diff --git a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize2B.dhall b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize2B.dhall new file mode 100644 index 0000000..d85236b --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize2B.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Local : Text | Missing | Remote : Text >.Remote + "https://example.com/foo/baz/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize3A.dhall b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize3A.dhall new file mode 100644 index 0000000..2074fbf --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize3A.dhall @@ -0,0 +1 @@ +https://example.com/foo/bar/../../baz/import.dhall as Location diff --git a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize3B.dhall b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize3B.dhall new file mode 100644 index 0000000..45a2857 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize3B.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Local : Text | Missing | Remote : Text >.Remote + "https://example.com/baz/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize4A.dhall b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize4A.dhall new file mode 100644 index 0000000..9358f44 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize4A.dhall @@ -0,0 +1 @@ +https://example.com/../bar/import.dhall as Location diff --git a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize4B.dhall b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize4B.dhall new file mode 100644 index 0000000..b5ccbcd --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize4B.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Local : Text | Missing | Remote : Text >.Remote + "https://example.com/../bar/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/RemoteChain1A.dhall b/dhall/tests/import/success/unit/asLocation/RemoteChain1A.dhall new file mode 100644 index 0000000..7d081ab --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RemoteChain1A.dhall @@ -0,0 +1 @@ +https://raw.githubusercontent.com/dhall-lang/dhall-lang/0b983b92aa2222dc3e292c20550ee37dea3f41df/tests/import/data/simpleLocation.dhall diff --git a/dhall/tests/import/success/unit/asLocation/RemoteChain1B.dhall b/dhall/tests/import/success/unit/asLocation/RemoteChain1B.dhall new file mode 100644 index 0000000..8ac2c6b --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RemoteChain1B.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Local : Text | Missing | Remote : Text >.Remote + "https://raw.githubusercontent.com/dhall-lang/dhall-lang/0b983b92aa2222dc3e292c20550ee37dea3f41df/tests/import/data/simple.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/RemoteChain2A.dhall b/dhall/tests/import/success/unit/asLocation/RemoteChain2A.dhall new file mode 100644 index 0000000..9929517 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RemoteChain2A.dhall @@ -0,0 +1 @@ +https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/asLocation/Canonicalize3A.dhall diff --git a/dhall/tests/import/success/unit/asLocation/RemoteChain2B.dhall b/dhall/tests/import/success/unit/asLocation/RemoteChain2B.dhall new file mode 100644 index 0000000..685dc04 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RemoteChain2B.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Local : Text | Missing | Remote : Text >.Remote + "https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/bar/import.dhall" diff --git a/dhall/tests/import/success/unit/asLocation/RemoteChain3A.dhall b/dhall/tests/import/success/unit/asLocation/RemoteChain3A.dhall new file mode 100644 index 0000000..851108c --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RemoteChain3A.dhall @@ -0,0 +1 @@ +https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/asLocation/Canonicalize5A.dhall diff --git a/dhall/tests/import/success/unit/asLocation/RemoteChain3B.dhall b/dhall/tests/import/success/unit/asLocation/RemoteChain3B.dhall new file mode 100644 index 0000000..685dc04 --- /dev/null +++ b/dhall/tests/import/success/unit/asLocation/RemoteChain3B.dhall @@ -0,0 +1,2 @@ +< Environment : Text | Local : Text | Missing | Remote : Text >.Remote + "https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/bar/import.dhall" -- cgit v1.2.3 From 903d6c0bba36a6696eb337ae84b962f4cc48b5b5 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Wed, 4 Mar 2020 21:26:01 +0000 Subject: Implement remote imports and cleanup import chaining --- dhall/tests/import/success/unit/RemoteAsTextA.dhall | 1 + dhall/tests/import/success/unit/RemoteAsTextB.dhall | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 dhall/tests/import/success/unit/RemoteAsTextA.dhall create mode 100644 dhall/tests/import/success/unit/RemoteAsTextB.dhall (limited to 'dhall/tests/import') diff --git a/dhall/tests/import/success/unit/RemoteAsTextA.dhall b/dhall/tests/import/success/unit/RemoteAsTextA.dhall new file mode 100644 index 0000000..472d041 --- /dev/null +++ b/dhall/tests/import/success/unit/RemoteAsTextA.dhall @@ -0,0 +1 @@ +https://raw.githubusercontent.com/dhall-lang/dhall-lang/0b983b92aa2222dc3e292c20550ee37dea3f41df/tests/import/data/example.txt as Text diff --git a/dhall/tests/import/success/unit/RemoteAsTextB.dhall b/dhall/tests/import/success/unit/RemoteAsTextB.dhall new file mode 100644 index 0000000..1997a89 --- /dev/null +++ b/dhall/tests/import/success/unit/RemoteAsTextB.dhall @@ -0,0 +1,3 @@ +'' +Hello, world! +'' -- cgit v1.2.3 From 31cefbdf0364a3d224420365049885051734669b Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Wed, 4 Mar 2020 21:36:41 +0000 Subject: Cache imports correctly --- dhall/tests/import/failure/cycle.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dhall/tests/import') diff --git a/dhall/tests/import/failure/cycle.txt b/dhall/tests/import/failure/cycle.txt index 4e9488e..f5a1abf 100644 --- a/dhall/tests/import/failure/cycle.txt +++ b/dhall/tests/import/failure/cycle.txt @@ -1 +1 @@ -ImportCycle([Import { mode: Code, location: Local(Parent, FilePath { file_path: ["data", "cycle.dhall"] }), hash: None }, Import { mode: Code, location: Local(Parent, FilePath { file_path: ["failure", "cycle.dhall"] }), hash: None }], Import { mode: Code, location: Local(Parent, FilePath { file_path: ["data", "cycle.dhall"] }), hash: None }) +ImportCycle([Local("./dhall-lang/tests/import/data/cycle.dhall"), Local("./dhall-lang/tests/import/failure/cycle.dhall")], Local("./dhall-lang/tests/import/data/cycle.dhall")) -- cgit v1.2.3 From 8e6b020ba1426c215382a81395b809b688fa7726 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Wed, 4 Mar 2020 22:42:15 +0000 Subject: Forgot to commit test output --- dhall/tests/import/failure/referentiallyInsane.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 dhall/tests/import/failure/referentiallyInsane.txt (limited to 'dhall/tests/import') diff --git a/dhall/tests/import/failure/referentiallyInsane.txt b/dhall/tests/import/failure/referentiallyInsane.txt new file mode 100644 index 0000000..9b5fe91 --- /dev/null +++ b/dhall/tests/import/failure/referentiallyInsane.txt @@ -0,0 +1 @@ +SanityCheck -- cgit v1.2.3