tools/FxTestRunner/src/client/test/runner/CommonTestRunnerWorker.java

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

*** 1,7 ****
  /*
!  * Copyright (c) 2009, 2012, 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
--- 1,7 ----
  /*
!  * Copyright (c) 2009, 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
*** 35,45 ****
  import org.junit.runner.JUnitCore;
  import org.junit.runner.Request;
  import org.junit.runner.Result;
  import org.junit.runner.notification.Failure;
  import org.junit.runner.notification.RunListener;
! import test.javaclient.shared.screenshots.ImagesManager;

  
  /**
   *
   * @author shura, mrkam, Sergey Grinev, Victor Shubov
   */
--- 35,45 ----
  import org.junit.runner.JUnitCore;
  import org.junit.runner.Request;
  import org.junit.runner.Result;
  import org.junit.runner.notification.Failure;
  import org.junit.runner.notification.RunListener;
! import test.javaclient.shared.screenshots.GoldenImageManager;

  
  /**
   *
   * @author shura, mrkam, Sergey Grinev, Victor Shubov
   */
*** 200,215 ****
                  switch (trc.type) {
                      case SET_TEST_CLASS:
                          testClassName = trc.param;
                          break;
                      case SET_BASEDIR:
!                         //TODO: this design is a bit flawed as we introducing backward

!                         //dependency on SharedTestUtils here.

!                         ImagesManager.getInstance().setBaseDir(trc.param);

                          break;
                      case SET_ABSOLUTE_DIR:
!                         ImagesManager.getInstance().setAbsoluteDir(trc.param);

                          break;
                      case SET_TEST_NAME:
                          testName = trc.param;
                          break;
                      case SET_ERR:
--- 200,219 ----
                  switch (trc.type) {
                      case SET_TEST_CLASS:
                          testClassName = trc.param;
                          break;
                      case SET_BASEDIR:
!                         //Looks like method is required for some remote invocation and could be

!                         //used later if it will be decided to run jnlp-mode again. 

!                         //So commenting instead of removing.      

!                         //GoldenImageManager.setBaseDir(trc.param);

                          break;
                      case SET_ABSOLUTE_DIR:
!                         //Looks like method is required for some remote invocation and could be

!                         //used later if it will be decided to run jnlp-mode again. 

!                         //So commenting instead of removing.                              

!                         //GoldenImageManager.setAbsoluteDir(trc.param);

                          break;
                      case SET_TEST_NAME:
                          testName = trc.param;
                          break;
                      case SET_ERR: