Update tests for iipsrv 1.3

Author: anarchivist

README.md

@@ -1,9 +1,8 @@
 # iipsrv
 
 A single-container deployment of [IIPImage](https://iipimage.sourceforge.io),
-running on [nginx](http://nginx.org/en/) with FastCGI.
-
-(Forked from [iiip-nginx-single](https://git.lib.berkeley.edu/lap/iiip-nginx-single).)
+running on lighttpd. This is based on the upstream `iipsrv/iipsrv`
+base image, except with updated packages.
 
 ## Configuration
 
@@ -41,7 +40,7 @@ Note that nginx/IIPImage runs on port 80, and is exposed on host port 80.
 By default, the [`iipsrv-entrypoint.sh`](iipsrv-entrypoint.sh) script will
 cause files to be served from the `test/data` directory.
 
-You can override this mount by passing a `$FILESYSTEM` value to
+You can override this mount by passing a `$FILESYSTEM_PREFIX` value to
 the container; see below under ["Custom configuration"](#custom-configuration).
 
 #### Testing
@@ -53,13 +52,12 @@ To test that the container has come up correctly, using the image file
 curl -v 'http://localhost/iiif/test.tif/info.json'
 ```
 
-This should produce a IIIF [information response](https://iiif.io/api/image/2.0/#information-request)
+This should produce a IIIF [information response](https://iiif.io/api/image/3.0/#51-image-information-request)
 in JSON format, e.g.:
 
 ```json
 {
-  "@context" : "http://iiif.io/api/image/2/context.json",
-  "@id" : "http://localhost/iiif/test.tif",
+  "@context" : "http://iiif.io/api/image/3/context.json",
   "protocol" : "http://iiif.io/api/image",
   "width" : 2769,
   "height" : 3855,
@@ -72,15 +70,23 @@ in JSON format, e.g.:
   "tiles" : [
      { "width" : 256, "height" : 256, "scaleFactors" : [ 1, 2, 4, 8, 16 ] }
   ],
-  "profile" : [
-     "http://iiif.io/api/image/2/level1.json",
-     { "formats" : [ "jpg" ],
-       "qualities" : [ "native","color","gray","bitonal" ],
-       "supports" : ["regionByPct","regionSquare","sizeByForcedWh","sizeByWh","sizeAboveFull","rotationBy90s","mirroring"],
-       "maxWidth" : 5000,
-       "maxHeight" : 5000
-     }
+  "id" : "http://localhost/iiif/test.tif",
+  "type": "ImageService3",
+  "profile" : "level2",
+  "maxWidth" : 5000,
+  "maxHeight" : 5000,
+  "extraQualities": ["color","gray","bitonal"],
+  "extraFormats": ["tif","webp","avif"],
+  "extraFeatures": ["regionByPct","sizeByPct","sizeByConfinedWh","sizeUpscaling","rotationBy90s","mirroring"],
+  "service": [
+    {
+      "@context": "http://iiif.io/api/annex/services/physdim/1/context.json",
+      "profile": "http://iiif.io/api/annex/services/physdim",
+      "physicalScale": 0.00846667,
+      "physicalUnits": "cm"
+    }
   ]
+
 }
 ```
 

test/default.jpg

@@ -1,6 +1,5 @@
 {
-  "@context" : "http://iiif.io/api/image/2/context.json",
-  "@id" : "http://localhost/iiif/test.tif",
+  "@context" : "http://iiif.io/api/image/3/context.json",
   "protocol" : "http://iiif.io/api/image",
   "width" : 2769,
   "height" : 3855,
@@ -13,13 +12,21 @@
   "tiles" : [
      { "width" : 256, "height" : 256, "scaleFactors" : [ 1, 2, 4, 8, 16 ] }
   ],
-  "profile" : [
-     "http://iiif.io/api/image/2/level1.json",
-     { "formats" : [ "jpg" ],
-       "qualities" : [ "native","color","gray","bitonal" ],
-       "supports" : ["regionByPct","regionSquare","sizeByForcedWh","sizeByWh","sizeAboveFull","rotationBy90s","mirroring"],
-       "maxWidth" : 5000,
-       "maxHeight" : 5000
-     }
+  "id" : "http://localhost/iiif/test.tif",
+  "type": "ImageService3",
+  "profile" : "level1",
+  "maxWidth" : 5000,
+  "maxHeight" : 5000,
+  "extraQualities": ["color","gray","bitonal"],
+  "extraFormats": ["tif","webp"],
+  "extraFeatures": ["regionByPct","sizeByPct","sizeByConfinedWh","sizeUpscaling","rotationBy90s","mirroring"],
+  "service": [
+    {
+      "@context": "http://iiif.io/api/annex/services/physdim/1/context.json",
+      "profile": "http://iiif.io/api/annex/services/physdim",
+      "physicalScale": 0.00846667,
+      "physicalUnits": "cm"
+    }
   ]
+
 }

test/info.json

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 ############################################################
 # Helper functions
@@ -26,13 +26,13 @@ assert_identical() {
     echo "${actual_file} did not match expected ${expected_file}"
 
     local expected_md5=$(md5sum "${expected_file}")
-    local expected_size=$(wc -c "${expected_file}" | /usr/bin/grep -Eo '[[:digit:]]+')
+    local expected_size=$(wc -c "${expected_file}" | grep -Eo '[[:digit:]]+')
 
     echo "Expected: ${expected_md5}"
     echo "          ${expected_size} bytes"
 
     local actual_md5=$(md5sum "${actual_file}")
-    local actual_size=$(wc -c "${actual_file}" | /usr/bin/grep -Eo '[[:digit:]]+')
+    local actual_size=$(wc -c "${actual_file}" | grep -Eo '[[:digit:]]+')
 
     echo "Actual:   ${actual_md5}"
     echo "          ${actual_size} bytes"