improve backend test and add results

4 files changed, 22 insertions, 23 deletions

diff --git a/backendtest/BACKEND-TEST-FRAMEWORK b/backendtest/BACKEND-TEST-FRAMEWORK
index b1414003..96e2db03 100644
--- a/backendtest/BACKEND-TEST-FRAMEWORK
+++ b/backendtest/BACKEND-TEST-FRAMEWORK
@@ -35,6 +35,6 @@ roadmap:
   done - interpret the incoming scene data in test client
   next:
     done - receive the render job results
-    construct the test scene in server side
+    done - construct the test scene in server side
     later - create EDSL for backend tests (configuring data + schema + pipeline)
     done - compare result with the validated image
\ No newline at end of file
diff --git a/backendtest/EditorExamplesTest.hs b/backendtest/EditorExamplesTest.hs
index 742b3e59..4e405745 100644
--- a/backendtest/EditorExamplesTest.hs
+++ b/backendtest/EditorExamplesTest.hs
@@ -86,15 +86,16 @@ getRenderJob = do
         , pipeline = ppl
         }
 
-  img <- unpack . B64.encode <$> BS.readFile "./backendtest/logo256x256.png"
-
-  return $ RenderJob
-    { meshes      = V.fromList [cubeMesh]
-    , TD.textures = V.fromList [img]
-    , schema      = inputSchema
-    , scenes      = V.fromList [scene 64]
-    , pipelines   = V.fromList ppls
-    }
+  img <- unpack . B64.encode <$> BS.readFile "./backend-test-data/editor/logo256x256.png"
+
+  let job = RenderJob
+        { meshes      = V.fromList [cubeMesh]
+        , TD.textures = V.fromList [img]
+        , schema      = inputSchema
+        , scenes      = V.fromList [scene 64]
+        , pipelines   = V.fromList ppls
+        }
+  return ("editor",job)
 
 g_vertex_buffer_data =
     [ V4   1.0    1.0  (-1.0) 1.0
diff --git a/backendtest/TestServer.hs b/backendtest/TestServer.hs
index 58e49254..a84fc72b 100644
--- a/backendtest/TestServer.hs
+++ b/backendtest/TestServer.hs
@@ -38,32 +38,30 @@ application pending = do
   flip finally disconnect $ do
     -- receive client info
     decodeStrict <$> WS.receiveData conn >>= \case
-      Nothing -> putStrLn "invalid client info"
+      Nothing -> fail "invalid client info"
       Just ci@ClientInfo{..} -> print ci
     -- send pipeline
-    --renderJob@RenderJob{..} <- testRenderJob
-    renderJob@RenderJob{..} <- EditorExamplesTest.getRenderJob -- TODO
+    (testName,renderJob@RenderJob{..}) <- EditorExamplesTest.getRenderJob -- TODO
     WS.sendTextData conn . encode $ renderJob
-    -- TODO: get render result: pipeline x scene x frame
-    forM_ [one..length pipelines] $ \pIdx -> do
-      putStrLn $ "pipeline: " ++ pipelineName (pipelines V.! (pIdx - 1))
+    -- get render result: pipeline x scene x frame
+    forM_ pipelines $ \PipelineInfo{..} -> do
       forM_ (zip [one..] $ V.toList scenes) $ \(sIdx,Scene{..}) ->
         forM_ [one..length frames] $ \fIdx -> do
+          let name = "backend-test-data/" ++ testName ++ "/result/" ++ takeBaseName pipelineName ++ "_scn" ++ printf "%02d" sIdx ++ "_" ++ printf "%02d" fIdx ++ ".png"
           decodeStrict <$> WS.receiveData conn >>= \case
-            Nothing -> putStrLn "invalid RenderJobResult"
-            Just (RenderJobError e) -> fail $ "render error:\n" ++ e -- TODO: test failed
+            Nothing -> fail $ name ++ " - invalid RenderJobResult"
+            Just (RenderJobError e) -> fail $ name ++ " - render error:\n" ++ e -- TODO: test failed
             Just (RenderJobResult FrameResult{..}) -> do
-              let name = "backend-test-images/ppl" ++ printf "%02d" pIdx ++ "_scn" ++ printf "%02d" sIdx ++ "_" ++ printf "%02d" fIdx ++ ".png"
               createDirectoryIfMissing True (takeDirectory name)
               compareOrSaveImage name =<< toImage frImageWidth frImageHeight . either error id . B64.decode =<< WS.receiveData conn
-              putStrLn $ name ++ "\t" ++ unwords (map showTime . V.toList $ frRenderTimes)
+              --putStrLn $ name ++ "\t" ++ unwords (map showTime . V.toList $ frRenderTimes)
     putStrLn "render job done"
     forever $ threadDelay 1000000
 
 compareOrSaveImage name img@(Image w h pixels) = do
   doesFileExist name >>= \case
     False -> do
-      putStrLn $ "save image: " ++ name
+      putStrLn $ "new image: " ++ name
       savePngImage name (ImageRGBA8 img)
     True -> do
       Right (ImageRGBA8 (Image origW origH origPixels)) <- readImage name
@@ -72,8 +70,8 @@ compareOrSaveImage name img@(Image w h pixels) = do
           threshold = 0
       case (w /= origW || h /= origH || diff > threshold) of
         True -> do
-          putStrLn $ "images differ!!! " ++ show diff
-        False -> putStrLn $ "image match " ++ show diff
+          fail $ name ++ " - differ!!! " ++ show diff
+        False -> putStrLn $ name ++ " OK"
 
 toImage :: Int -> Int -> BS.ByteString -> IO (Image PixelRGBA8)
 toImage w h buf = do
diff --git a/backendtest/logo256x256.png b/backendtest/logo256x256.png
deleted file mode 100644
index 2c0c985c..00000000
--- a/backendtest/logo256x256.png
+++ /dev/null