Merge branch 'formatting' into 'main'

Update formatting/copyright

See merge request cit/mathworks/jupyter-matlab-proxy!11

Author: dpwrussell

gui/src/actionCreators/actionCreators.spec.js

@@ -1,4 +1,4 @@
-// Copyright 2020 The MathWorks, Inc.
+// Copyright 2020-2021 The MathWorks, Inc.
 
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
@@ -14,17 +14,17 @@ const mockStore = configureMockStore(middlewares);
 describe.each([
   [actionCreators.setTutorialHidden, [true], {type:actions.SET_TUTORIAL_HIDDEN, hidden:true}],
   [actionCreators.setTutorialHidden, [false],  {type:actions.SET_TUTORIAL_HIDDEN, hidden:false}],
-  [actionCreators.setOverlayVisibility, [true],  {type:actions.SET_OVERLAY_VISIBILITY, visibility:true}],  
+  [actionCreators.setOverlayVisibility, [true],  {type:actions.SET_OVERLAY_VISIBILITY, visibility:true}],
   [actionCreators.setOverlayVisibility, [false],  {type:actions.SET_OVERLAY_VISIBILITY, visibility:false}],
   [actionCreators.setTriggerPosition, [12,12],  {type:actions.SET_TRIGGER_POSITION, x:12, y:12}],
   [actionCreators.setTriggerPosition, [52,112],  {type:actions.SET_TRIGGER_POSITION, x:52, y:112}],
   ])('Test Set actionCreators', (method, input, expectedAction) => {
     test(`check if an action of type  ${expectedAction.type} is returned when method actionCreator.${method.name}() is called`, () => {
-        expect(method(...input)).toEqual(expectedAction);        
+        expect(method(...input)).toEqual(expectedAction);
     });
-  }); 
+  });
+
 
-  
   describe.each([
   [actionCreators.requestServerStatus, {type:actions.REQUEST_SERVER_STATUS, fetchAbortController:new AbortController()}],
   [actionCreators.requestSetLicensing, {type:actions.REQUEST_SET_LICENSING, fetchAbortController:new AbortController()}],
@@ -40,24 +40,24 @@ describe.each([
 
     test(`check if an action of type  ${expectedAction.type} is returned with an AbortController when method actionCreator.${method.name}() is called`, () => {
         expect(method(abortController)).toEqual(expectedAction);
-        
+
     });
-  });  
+  });
+
 
-  
   describe.each([
   [actionCreators.receiveSetLicensing, {type: 'MHLM'}, {type:actions.RECEIVE_SET_LICENSING, status:{type:'MHLM'}}],
   [actionCreators.receiveStopMatlab,{matlabStatus:'down'}, {type:actions.RECEIVE_STOP_MATLAB, status:{matlabStatus:'down'}}],
   [actionCreators.receiveStartMatlab,{matlabStatus:'up'}, {type:actions.RECEIVE_START_MATLAB, status:{matlabStatus:'up'}}],
-  [actionCreators.receiveError, {message:'ERROR: License Manager Error -9', logs: null}, {type:actions.RECEIVE_ERROR, error: {message:'ERROR: License Manager Error -9', logs: null}}],  
+  [actionCreators.receiveError, {message:'ERROR: License Manager Error -9', logs: null}, {type:actions.RECEIVE_ERROR, error: {message:'ERROR: License Manager Error -9', logs: null}}],
   [actionCreators.receiveTerminateIntegration,{licensing:{}}, {type:actions.RECEIVE_TERMINATE_INTEGRATION, status:{licensing:{}}, loadUrl:'../'}],
   ])('Test Receive actionCreators', (method, input, expectedAction) => {
 
     test(`check if an action of type  ${expectedAction.type} is returned when method actionCreator.${method.name}() is called`, () => {
         expect(method(input)).toEqual(expectedAction);
-        
+
     });
-  });  
+  });
 
 
 

gui/src/components/App/App.spec.js

@@ -1,4 +1,4 @@
-// Copyright 2020 The MathWorks, Inc.
+// Copyright 2020-2021 The MathWorks, Inc.
 
 import React from 'react';
 import { render, fireEvent, within } from '../../test/utils/react-test';
@@ -62,32 +62,32 @@ describe('App Component', () => {
   });
 
   it('should render LicensingGatherer component within the App component when no licensing is provided', () => {
-    
+
     //Set lincensingInfo to empty object.
     initialState.serverStatus.licensingInfo = {};
     initialState.overlayVisibility = true;
 
     const { getByRole } = render(<App />, {
       initialState: initialState,
     });
-    
+
     const licensingGathererComponent = getByRole(
       'document'
     );
     expect(licensingGathererComponent).toBeInTheDocument();
   });
 
   it('should render Information Component within App Component after licensing is provided', () => {
-    
-    // Hide the tutorial and make the overlay visible.     
+
+    // Hide the tutorial and make the overlay visible.
     initialState.tutorialHidden = true;
     initialState.overlayVisibility = true;
-    
+
     //Rendering the App component with the above changes to the initial
     // state should render the Information Component.
     const { getByRole } = render(<App />, {
       initialState: initialState,
-    });    
+    });
 
     const informationComponent = getByRole('document');
     expect(informationComponent).toBeInTheDocument();
@@ -105,11 +105,11 @@ describe('App Component', () => {
     const { container } = render(<App />, {
       initialState: initialState,
     });
-    
+
 
     const paragraphElements = [...container.getElementsByTagName('p')];
 
-    
+
     expect(
       paragraphElements.some((p) =>
         p.textContent.includes('integration terminated')
@@ -172,22 +172,22 @@ describe('App Component', () => {
     const {  getByTestId, container, getByRole } = render(<App />, {
       initialState: initialState,
     });
-  
+
 
     // Grab the help button and click it.
     const helpBtn = getByTestId('helpBtn');
     fireEvent.click(helpBtn);
 
     const helpElement = container.querySelector('#confirmation-dialog-title');
-    
+
     expect(helpElement.textContent).toMatch('Help');
   });
 
   it('should set the window location from state', () => {
     initialState.loadUrl = 'http://localhost.com:5555';
     const hrefMock = jest.fn();
     delete window.location;
-    
+
     window.location = {href : hrefMock}
     const { debug } = render(<App />, { initialState: initialState });
 

gui/src/components/Confirmation/Confirmation.spec.js

@@ -1,3 +1,5 @@
+// Copyright 2021 The MathWorks, Inc.
+
 import React from 'react';
 import Confirmation from './index';
 import App from '../App'
@@ -8,7 +10,7 @@ describe('Confirmation Component', () => {
   beforeAll(() => {
     children = (
       <div data-testid="wrapperNode">
-        <div data-testid="childNode"></div>        
+        <div data-testid="childNode"></div>
       </div>
     );
     confirmMock = jest.fn().mockImplementation(() => {});
@@ -88,27 +90,27 @@ describe('Confirmation Component', () => {
     'Test to check if confirmation component disappears when %s is clicked',
     (input) => {
 
-  // Hide the tutorial and make the overlay visible.     
+  // Hide the tutorial and make the overlay visible.
     initialState.tutorialHidden = true;
     initialState.overlayVisibility = true;
 
     const { debug, getByTestId, container } = render(<App />, {
       initialState: initialState,
-    }); 
-    
+    });
+
     let startMatlabButton = getByTestId('startMatlabBtn');
     fireEvent.click(startMatlabButton);
 
     // Upon clicking on start/restart MATLAB, should display the confirmation component.
-    expect(container.querySelector('#confirmation')).toBeInTheDocument();  
+    expect(container.querySelector('#confirmation')).toBeInTheDocument();
 
     const btn = getByTestId(input);
     fireEvent.click(btn);
 
     // Upon clicking the input button, should return to rendering the Information Component
     // and close the confirmation component
-    expect(container.querySelector('#confirmation')).not.toBeInTheDocument();        
-    }    
+    expect(container.querySelector('#confirmation')).not.toBeInTheDocument();
+    }
   );
 
 });

gui/src/components/Confirmation/index.js

@@ -1,4 +1,4 @@
-// Copyright 2020 The MathWorks, Inc.
+// Copyright 2020-2021 The MathWorks, Inc.
 
 import React from 'react';
 import PropTypes from 'prop-types';

gui/src/components/Controls/Controls.spec.js

@@ -1,3 +1,5 @@
+// Copyright 2021 The MathWorks, Inc.
+
 import React from 'react';
 import Controls from './index';
 import App from '../App'
@@ -94,13 +96,13 @@ describe('Controls Component', () => {
 
   it('should restart matlab upon clicking the Start/Restart Matlab button', () => {
 
-    //Hide the tutorial and make the overlay visible.     
+    //Hide the tutorial and make the overlay visible.
     initialState.tutorialHidden = true;
     initialState.overlayVisibility = true;
 
     const { getByTestId, container } = render(<App />, {
       initialState: initialState,
-    }); 
+    });
 
     const startMatlabButton = getByTestId('startMatlabBtn');
     fireEvent.click(startMatlabButton);
@@ -110,8 +112,8 @@ describe('Controls Component', () => {
     const confirmButton = getByTestId('confirmButton');
     fireEvent.click(confirmButton);
 
-    let tableData = container.querySelector('.details');    
-    expect(tableData.innerHTML).toMatch('Running');    
+    let tableData = container.querySelector('.details');
+    expect(tableData.innerHTML).toMatch('Running');
   });
 
 });

gui/src/components/Controls/index.js

@@ -1,4 +1,4 @@
-// Copyright 2020 The MathWorks, Inc.
+// Copyright 2020-2021 The MathWorks, Inc.
 
 import React, { useMemo } from 'react';
 import PropTypes from 'prop-types';

gui/src/components/Error/Error.spec.js

@@ -1,3 +1,5 @@
+// Copyright 2021 The MathWorks, Inc.
+
 import React from 'react';
 import Error from './index';
 import { render } from '../../test/utils/react-test';

gui/src/components/Help/Help.spec.js

@@ -1,3 +1,5 @@
+// Copyright 2021 The MathWorks, Inc.
+
 import React from 'react';
 import App from '../App'
 import Help from './index';
@@ -50,19 +52,19 @@ describe('Help Component', () => {
 
     expect(closeHandler).toHaveBeenCalledTimes(1);
   });
-  
+
 
   it('should close the Help Modal and display Information component when Back button is clicked', () => {
-    
-    // Hide the tutorial and make the overlay visible.     
+
+    // Hide the tutorial and make the overlay visible.
     initialState.tutorialHidden = true;
     initialState.overlayVisibility = true;
-    
+
     //Rendering the App component with the above changes to the initial
     // state should render the Information Component.
     const { getByTestId, container } = render(<App />, {
       initialState: initialState,
-    });  
+    });
 
 
     // Grab and click on the Help Button
@@ -73,7 +75,7 @@ describe('Help Component', () => {
 
     // Check if Help dialog is rendered.
     expect(helpComponent).toBeInTheDocument();
-    
+
     // Grab and click on the Back button in the help Component.
     const backButton =  getByTestId('backBtn');
     fireEvent.click(backButton);

gui/src/components/Help/index.js

@@ -1,4 +1,4 @@
-// Copyright 2020 The MathWorks, Inc.
+// Copyright 2020-2021 The MathWorks, Inc.
 
 import React from 'react';
 import { useSelector } from 'react-redux';

gui/src/components/Information/Information.spec.js

@@ -1,3 +1,5 @@
+// Copyright 2021 The MathWorks, Inc.
+
 import React from 'react';
 import Information from './index';
 import App from '../App';
@@ -8,7 +10,7 @@ describe('Information Component', () => {
   beforeEach(() => {
     children = (
       <div data-testid="child">
-        Child1       
+        Child1
       </div>
     );
     closeHandler = jest.fn().mockImplementation(() => {});
@@ -61,7 +63,7 @@ describe('Information Component', () => {
       <Information closeHandler={closeHandler} children={children} />
     );
 
-    expect(getByTestId('child')).toBeInTheDocument();    
+    expect(getByTestId('child')).toBeInTheDocument();
   });
 
   it('should render Online Licensing info with licensing type MHLM', () => {
@@ -122,21 +124,21 @@ describe('Information Component', () => {
 
   //   const closeBtn = container.getElementsByClassName('close').item(0);
 
-  //   fireEvent.click(closeBtn);    
+  //   fireEvent.click(closeBtn);
   // });
 
 
   it('should close the Information Component and display the overlayTrigger when close button is clicked', () => {
-    
-    // Hide the tutorial and make the overlay visible.     
+
+    // Hide the tutorial and make the overlay visible.
     initialState.tutorialHidden = true;
     initialState.overlayVisibility = true;
-    
+
     //Rendering the App component with the above changes to the initial
     // state should render the Information Component.
     const { getByTestId, debug, container } = render(<App />, {
       initialState: initialState,
-    });  
+    });
 
     const informationComponent = container.querySelector('#information');