Merge pull request #21 from The-Nefarious-Developer/windows-fix

Windows fix

Author: NickChecan

com.developer.nefarious.zjoule.plugin/META-INF/MANIFEST.MF

@@ -11,7 +11,8 @@ Require-Bundle:
  org.eclipse.core.resources;bundle-version="3.21.0",
  org.eclipse.ui.ide;bundle-version="3.22.300",
  org.eclipse.jface,
- org.eclipse.swt
+ org.eclipse.swt,
+ org.eclipse.wst.wsdl.ui;bundle-version="1.3.101"
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Automatic-Module-Name: com.developer.nefarious.zjoule.plugin
 Import-Package: 
@@ -30,6 +31,7 @@ Export-Package:
  com.developer.nefarious.zjoule.plugin.core.events,
  com.developer.nefarious.zjoule.plugin.core.functions,
  com.developer.nefarious.zjoule.plugin.core.ui,
+ com.developer.nefarious.zjoule.plugin.core.utils,
  com.developer.nefarious.zjoule.plugin.login,
  com.developer.nefarious.zjoule.plugin.login.api,
  com.developer.nefarious.zjoule.plugin.login.events,

com.developer.nefarious.zjoule.plugin/src/com/developer/nefarious/zjoule/plugin/core/ui/ViewListener.java

@@ -19,6 +19,7 @@
 import com.developer.nefarious.zjoule.plugin.core.functions.LoginHandler;
 import com.developer.nefarious.zjoule.plugin.core.functions.LogoutHandler;
 import com.developer.nefarious.zjoule.plugin.core.functions.PromptHandler;
+import com.developer.nefarious.zjoule.plugin.core.utils.SystemProvider;
 
 import jakarta.inject.Inject;
 
@@ -54,7 +55,8 @@ public class ViewListener extends ViewPart {
      */
     @Override
     public void createPartControl(final Composite parent) {
-        browser = BrowserFactory.create(parent, SWT.WEBKIT);
+    	int style = (isWindows()) ? SWT.EDGE : SWT.WEBKIT;
+        browser = BrowserFactory.create(parent, style);
         selectionListener = SelectionListener.create(browser);
         IViewRender viewRender = ViewRender.create();
         partListener = PartListener.create(browser);
@@ -74,8 +76,24 @@ public void createPartControl(final Composite parent) {
 
         setUpToolbar();
     }
-
+    
     /**
+     * Checks if the current operating system is a version of Windows.
+     * <p>
+     * This method determines the operating system by checking if the string
+     * returned by {@link SystemProvider#getCurrentSystem()} contains the substring "win"
+     * (case insensitive).
+     * </p>
+     *
+     * @return {@code true} if the operating system name contains "win", indicating a Windows OS;
+     *         {@code false} otherwise.
+     * @see SystemProvider#getCurrentSystem()
+     */
+    private boolean isWindows() {
+		return SystemProvider.getCurrentSystem().toLowerCase().contains("win");
+	}
+
+	/**
      * Disposes of the view and its associated resources, including listeners and the browser.
      */
     @Override

com.developer.nefarious.zjoule.plugin/src/com/developer/nefarious/zjoule/plugin/core/utils/SystemProvider.java

@@ -0,0 +1,33 @@
+package com.developer.nefarious.zjoule.plugin.core.utils;
+
+/**
+ * Utility class for providing information about the current operating system.
+ * <p>
+ * This class is designed to be used as a utility and cannot be instantiated.
+ * It provides a static method to retrieve the name of the operating system
+ * as reported by the Java Virtual Machine (JVM).
+ * </p>
+ */
+public abstract class SystemProvider {
+	
+	/**
+     * Retrieves the name of the operating system on which the JVM is currently running.
+     * <p>
+     * This method wraps the {@code System.getProperty("os.name")} call, which 
+     * provides the operating system name as a {@code String}.
+     * </p>
+     *
+     * @return the name of the operating system, such as "Windows 10", "Linux", or "Mac OS X".
+     *         The exact value is determined by the underlying JVM implementation.
+     * @see System#getProperty(String)
+     */
+	public static String getCurrentSystem() {
+		return System.getProperty("os.name");
+	}
+	
+	/**
+     * Private constructor to prevent instantiation of this utility class.
+     */
+	private SystemProvider() { }
+
+}

com.developer.nefarious.zjoule.test/src/com/developer/nefarious/zjoule/test/core/ui/ViewListenerTest.java

@@ -42,6 +42,7 @@
 import com.developer.nefarious.zjoule.plugin.core.ui.IViewRender;
 import com.developer.nefarious.zjoule.plugin.core.ui.ViewListener;
 import com.developer.nefarious.zjoule.plugin.core.ui.ViewRender;
+import com.developer.nefarious.zjoule.plugin.core.utils.SystemProvider;
 
 public class ViewListenerTest {
 
@@ -64,6 +65,8 @@ public class ViewListenerTest {
 	private MockedStatic<ClearHandler> mockedStaticClearHandler;
 
 	private MockedStatic<LogoutHandler> mockedStaticLogoutHandler;
+	
+	private MockedStatic<SystemProvider> mockedSystemProvider;
 
 	@Mock
 	private Shell mockShell;
@@ -111,8 +114,8 @@ public void setUp() {
 		mockedStaticLoginHandler = mockStatic(LoginHandler.class);
 		mockedStaticClearHandler = mockStatic(ClearHandler.class);
 		mockedStaticLogoutHandler = mockStatic(LogoutHandler.class);
+		mockedSystemProvider = mockStatic(SystemProvider.class);
 
-		mockedStaticBrowserFactory.when(() -> BrowserFactory.create(mockParent, SWT.WEBKIT)).thenReturn(mockBrowser);
 		mockedStaticSelectionListener.when(() -> SelectionListener.create(mockBrowser)).thenReturn(mockSelectionListener);
 		mockedStaticViewRender.when(ViewRender::create).thenReturn(mockViewRender);
 		mockedStaticPartListener.when(() -> PartListener.create(mockBrowser)).thenReturn(mockPartListener);
@@ -125,10 +128,59 @@ public void setUp() {
 		cut = spy(new ViewListener());
 		cut.setShell(mockShell);
 	}
+	
+	@Test
+	public void shouldPlumbPartControlForWindows() {
+		// Arrange
+		mockedSystemProvider.when(SystemProvider::getCurrentSystem).thenReturn("Windows 95");
+		mockedStaticBrowserFactory.when(() -> BrowserFactory.create(mockParent, SWT.EDGE)).thenReturn(mockBrowser);
+		
+		String mockBuildResult = "html-text";
+		when(mockViewRender.build()).thenReturn(mockBuildResult);
+
+		IWorkbenchPartSite mockSite = mock(IWorkbenchPartSite.class);
+		doReturn(mockSite).when(cut).getSite();
+
+		IWorkbenchPage mockPage = mock(IWorkbenchPage.class);
+		when(mockSite.getPage()).thenReturn(mockPage);
+
+		IViewSite mockViewSite = mock(IViewSite.class);
+		doReturn(mockViewSite).when(cut).getViewSite();
+		IActionBars mockActionBars = mock(IActionBars.class);
+		when(mockViewSite.getActionBars()).thenReturn(mockActionBars);
+
+		IToolBarManager mockToolBarManager = mock(IToolBarManager.class);
+		when(mockActionBars.getToolBarManager()).thenReturn(mockToolBarManager);
+
+		IMenuManager mockMenuManager = mock(IMenuManager.class);
+		when(mockActionBars.getMenuManager()).thenReturn(mockMenuManager);
+
+		// Act
+		cut.createPartControl(mockParent);
+
+		// Assert
+		verify(mockBrowser).setText(mockBuildResult);
+		verify(mockBrowser).addDisposeListener(any(DisposeListener.class));
+		verify(mockPage).addPartListener(mockPartListener);
+		verify(mockPage).addSelectionListener(mockSelectionListener);
+
+		ArgumentCaptor<Runnable> captor = ArgumentCaptor.forClass(Runnable.class);
+        verify(mockDisplay).asyncExec(captor.capture());
+        Runnable actualRunnable = captor.getValue();
+        assertTrue(actualRunnable instanceof Initialization);
+
+        verify(mockToolBarManager).add(mockLoginHandler);
+        verify(mockMenuManager).add(mockClearHandler);
+        verify(mockMenuManager).add(any(Separator.class));
+        verify(mockMenuManager).add(mockLogoutHandler);
+	}
 
 	@Test
-	public void shouldPlumbPartControl() {
+	public void shouldPlumbPartControlForOtherSystems() {
 		// Arrange
+		mockedSystemProvider.when(SystemProvider::getCurrentSystem).thenReturn("Mac OS");
+		mockedStaticBrowserFactory.when(() -> BrowserFactory.create(mockParent, SWT.WEBKIT)).thenReturn(mockBrowser);
+		
 		String mockBuildResult = "html-text";
 		when(mockViewRender.build()).thenReturn(mockBuildResult);
 
@@ -169,6 +221,7 @@ public void shouldPlumbPartControl() {
         verify(mockMenuManager).add(mockLogoutHandler);
 	}
 
+	//CHECKSTYLE:OFF CyclomaticComplexity
 	@AfterEach
 	public void tearDown() {
 		if (mockedStaticBrowserFactory != null) {
@@ -198,7 +251,11 @@ public void tearDown() {
 		if (mockedStaticLogoutHandler != null) {
 			mockedStaticLogoutHandler.close();
 		}
+		if (mockedSystemProvider != null) {
+			mockedSystemProvider.close();
+		}
 	}
+	//CHECKSTYLE:ON CyclomaticComplexity
 
 	@Test
 	public void testDispose() {

com.developer.nefarious.zjoule.test/src/com/developer/nefarious/zjoule/test/core/utils/SystemProviderTest.java

@@ -0,0 +1,19 @@
+package com.developer.nefarious.zjoule.test.core.utils;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import com.developer.nefarious.zjoule.plugin.core.utils.SystemProvider;
+
+public class SystemProviderTest {
+	
+	public void shouldReturnTheCurrentSystem() {
+		// Arrange
+		// Act
+		String returnValue = SystemProvider.getCurrentSystem();
+		// Assert
+		assertNotNull(returnValue);
+		assertFalse(returnValue.isBlank());
+	}
+
+}