r10472: more tests

diff --git a/tests.lisp b/tests.lisp
index 605e28860f3182a12f7d2438fd1f11c1a6333722..6405c27d943c550c63b2f8f7440c9927c6e194c8 100644 (file)
--- a/tests.lisp
+++ b/tests.lisp
@@ -42,4 +42,48 @@
 (def-numeric-test
  :aov.1 (aov 50 36 24) 39.5977 26.9915 46.7930)
  
 (def-numeric-test
  :aov.1 (aov 50 36 24) 39.5977 26.9915 46.7930)
  

-(def-numeric-test 
\ No newline at end of file
+(def-numeric-test 
+ :fov.1 (fov 50 24 16 :magnification 1 :units :mm)
+ 24 16 28.8444 1 100 100)
+
+(def-numeric-test 
+ :fov.2 (fov 50 24 16 :magnification 1 :units :feet)
+ 2.583338E-4 1.7222258E-4 3.10478E-4 1 0.328083 100)
+
+(def-numeric-test 
+ :fov.3 (fov 50 24 16 :image-distance 100 :units :mm)
+ 24 16 28.8444 1 100 100)
+
+(def-numeric-test 
+ :fov.4 (fov 50 24 16 :image-distance 100 :units :feet)
+ 2.583338E-4 1.7222258E-4 3.10478E-4 1 0.328083 100)
+
+(def-numeric-test 
+ :fov.5 (fov 50 24 16 :object-distance 100 :units :mm)
+ 24 16 28.8444 1 100 100)
+
+(def-numeric-test 
+ :fov.6 (fov 50 24 16 :object-distance (cl-photo::mm->feet 100) :units :feet)
+ 2.583338E-4 1.7222258E-4 3.10478E-4 1 0.328083 100)
+
+
+(def-numeric-test 
+ :mag.1 (magnification :focal-length 50 :image-distance 100 :units :mm) 1)
+
+(def-numeric-test 
+ :mag.2 (magnification :focal-length 50 :image-distance 100 :units :feet) 1)
+
+(def-numeric-test 
+ :mag.3 (magnification :focal-length 50 :object-distance 100 :units :mm) 1)
+
+(def-numeric-test 
+ :mag.4 (magnification :focal-length 50 :object-distance (cl-photo::mm->feet 100)
+                       :units :feet) 1)
+
+(def-numeric-test 
+ :mag.5 (magnification :image-distance 100 :object-distance 100 :units :mm) 1)
+
+(def-numeric-test 
+ :mag.6 (magnification :image-distance 100 :object-distance (cl-photo::mm->feet 100)
+                       :units :feet) 1)
+