functional/FXCssTests/test/test/css/controls/style/size/SizeStyleBaseTest.java

rev 320 : 8151500: [TEST] Implement multiple golden image support
Summary: Makes possible using any number of golden images.

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation. Oracle designates this

@@ -39,12 +39,11 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import test.css.controls.api.SizeStyleApp;
 import test.javaclient.shared.TestBase;
-import test.javaclient.shared.screenshots.ImagesManager;
-import test.javaclient.shared.screenshots.ScreenshotUtils;
+import test.javaclient.shared.screenshots.GoldenImageManager;
 
 /**
  *
  * @author sergey.lugovoy@oracle.com
  */

@@ -185,13 +184,13 @@
                 RasterComparator comparator = sceneWrap.getEnvironment().getProperty(RasterComparator.class);
                 if (comparator.compare((Raster) testedImage, (Raster) goldenImage)) {
                     return true;
                 }
                 else {
-                    String cssStyleImage = ImagesManager.getInstance().getScreenshotPath(getPageName() + testName + "_css");
-                    String apiImage = ImagesManager.getInstance().getScreenshotPath(getPageName() + testName + "_api");
-                    String diffPath   = ImagesManager.getInstance().getScreenshotPath(getPageName() + testName + "_diff");
+                    String cssStyleImage = GoldenImageManager.getScreenshotPath(getPageName() + testName + "_css");
+                    String apiImage = GoldenImageManager.getScreenshotPath(getPageName() + testName + "_api");
+                    String diffPath   = GoldenImageManager.getScreenshotPath(getPageName() + testName + "_diff");
                     testedImage.save(cssStyleImage);
                     goldenImage.save(apiImage);
                     testedImage.compareTo(goldenImage).save(diffPath);
                 }
                 return null;