Merge pull request #6048 from thc202/automation/tests-tidy

automation: prevent ZAP home usage in tests

Author: thc202

addOns/automation/src/test/java/org/zaproxy/addon/automation/AutomationEnvironmentUnitTest.java

@@ -1192,7 +1192,7 @@ void shouldSetUpProxyFullDetails() {
         given(extensionLoader.getExtension(ExtensionNetwork.class)).willReturn(extNetwork);
         ArgumentCaptor<HttpProxy> proxyCaptor = ArgumentCaptor.forClass(HttpProxy.class);
 
-        Control.initSingletonForTesting(Model.getSingleton(), extensionLoader);
+        Control.initSingletonForTesting(mock(Model.class), extensionLoader);
 
         // When
         AutomationEnvironment env = new AutomationEnvironment(contextData, progress);
@@ -1240,7 +1240,7 @@ void shouldSetUpProxyNoCreds() {
         given(extensionLoader.getExtension(ExtensionNetwork.class)).willReturn(extNetwork);
         ArgumentCaptor<HttpProxy> proxyCaptor = ArgumentCaptor.forClass(HttpProxy.class);
 
-        Control.initSingletonForTesting(Model.getSingleton(), extensionLoader);
+        Control.initSingletonForTesting(mock(Model.class), extensionLoader);
 
         // When
         AutomationEnvironment env = new AutomationEnvironment(contextData, progress);
@@ -1289,7 +1289,7 @@ void shouldSetUpProxyNoRealm() {
         given(extensionLoader.getExtension(ExtensionNetwork.class)).willReturn(extNetwork);
         ArgumentCaptor<HttpProxy> proxyCaptor = ArgumentCaptor.forClass(HttpProxy.class);
 
-        Control.initSingletonForTesting(Model.getSingleton(), extensionLoader);
+        Control.initSingletonForTesting(mock(Model.class), extensionLoader);
 
         // When
         AutomationEnvironment env = new AutomationEnvironment(contextData, progress);