testengine.patch

     **                  to program mode for the period legacy code is running. See #3827-435.
     ** 003 VVT 20240325 Unused import statement removed.
     ** 004 VVT 20240408 Minor style fixes. See #8406-70.
     ** 005 ME  20241231 Use the context driver to support both chui/gui modes.
     */
     /*
     ** This program is free software: you can redistribute it and/or modify
-...
     import org.junit.platform.engine.*;
     import org.opentest4j.*;
     import com.goldencode.p2j.ui.client.chui.driver.console.*;
     import com.goldencode.p2j.util.*;
     /**
-...
     public class FWDEngineDescriptor
     extends AbstractBranchTestDescriptor
+    {
        /**
         * Switch between the shell and program terminal modes in ChUI.
         */
        private final static ConsoleHelper consoleHelper = ConsoleHelper.getDefaultConsoleHelper();
        /**
         * Default constructor for de-serialization only,
         * must never be used by applications.
-...
           super.cleanUp(context);
           // Assure we are in the program shell mode while FWD is not active
           consoleHelper.suspend();
           context.initStruct.driver.suspend();
+       }
        /**
-...
               AssertionFailedError
+       {
           // Assure we are in the program terminal mode while FWD is active
           consoleHelper.resume();
     	  context.initStruct.driver.resume();
           return super.prepare(context);
+       }

     ** -#- -I- --Date-- ---------------------------------Description---------------------------------
     ** 001 VVT 20230318 Created initial version.
     ** 002 VVT 20230428 Javadoc fixed.
     ** 003 ME  20241231 Save the client initialization structure to support both chui/gui modes.
     */
     /*
     ** This program is free software: you can redistribute it and/or modify
-...
     import org.junit.platform.engine.support.hierarchical.*;
     import com.goldencode.p2j.main.ClientCore;
     /**
      * Test engine execution context.
+     *
-...
        /** Proxy instance to execute remove operations on the server */
        final UnitTestEngine unitTestSupport;
        /** The client initialization structure to have access to the screen driver */
        final ClientCore.InitStruct initStruct;
        /**
         * The constructor.
+        *
         * @param unitTestSupport
         *        the remote protocol instance
         * @param initStruct
         * 		 the client initialization structure
         */
        FWDEngineExecutionContext(final UnitTestEngine unitTestSupport)
        FWDEngineExecutionContext(final UnitTestEngine unitTestSupport, final ClientCore.InitStruct initStruct)
+       {
           this.unitTestSupport = unitTestSupport;
           this.initStruct = initStruct;
+       }
+    }

     ** 004 GBB 20230512 Logging methods replaced by CentralLogger/ConversionStatus.
     ** 005 CA  20240311 Allow server:clientConfig:outputToFile to be set for the FWD unit test client, too.
     ** 006 VVT 20240618 Forced ConsoleHelper.terminate() after test engine initialization failure. See #8529-7.
     ** 007 ME  20241231 Use the client initialization structure to support both chui/gui modes.
     **                  Allow usage of environment variable to specify the xml configuration file (Eclipse).
     */
     /*
     ** This program is free software: you can redistribute it and/or modify
-...
     import com.goldencode.p2j.cfg.*;
     import com.goldencode.p2j.main.*;
     import com.goldencode.p2j.net.*;
     import com.goldencode.p2j.ui.client.chui.driver.console.*;
     import com.goldencode.p2j.ui.client.driver.*;
     /**
-...
         * Unit test support on the server proxy instance.
         */
        private static UnitTestEngine unitTestSupport;
        /**
         * Client initialization structure, screen driver supports chui/gui modes.
         */
        private static ClientCore.InitStruct is;
        /**
         * Initialize the engine.
-...
              ScreenDriver<?> driver = (uuid == null) ? null : ClientCore.processTemporaryClient(uuid, bc);
              ClientCore.loadNativeLibrary();
              final ClientCore.InitStruct is = new ClientCore.InitStruct();
              is = new ClientCore.InitStruct();
              ClientCore.setOutputToFile(bc);
              is.driver = driver;
              ClientCore.initialize(is,
-...
+          }
           catch (Throwable thr)
+          {
              ConsoleHelper.terminate();
         	 is.driver.shutdown();
              LOG.warning("Test engine cannot initialize and will be disabled: " + thr);
-...
              case NONE:
                 final ConfigurationParameters configurationParameters = discoveryRequest
                          .getConfigurationParameters();
                 if (initialize(
                          configurationParameters.get(CFG_FWD_CONFIG_FILE).orElse(DEFAULT_FWD_CONFIG_FILE)))
+                {
                    state = State.INITIALIZED;
                    break;
+                }
                 String configFile = configurationParameters.get(CFG_FWD_CONFIG_FILE).orElse(System.getenv(CFG_FWD_CONFIG_FILE));
     			if (initialize(configFile != null ? configFile : DEFAULT_FWD_CONFIG_FILE)) {
     				state = State.INITIALIZED;
     				break;
+    			}
                 //$FALL-THROUGH$
              case INOPERABLE:
-...
        @Override
        protected FWDEngineExecutionContext createExecutionContext(ExecutionRequest request)
+       {
           return new FWDEngineExecutionContext(unitTestSupport);
           return new FWDEngineExecutionContext(unitTestSupport, is);
+       }
        /**

Project

General

Profile

FWD » Core Development » Base Language