Removed Windows support

Author: nbhoski

src/main/java/com/mathworks/ci/UseMatlabVersionBuildWrapper.java

@@ -188,13 +188,8 @@ public void setUp(Context context, Run<?, ?> build, FilePath workspace, Launcher
         // Set Environment variable
         setEnv(initialEnvironment);
 
-        String nodeSpecificMatlab = "";
-        if(getNodeSpecificMatlab(Computer.currentComputer(), listener) != null) {
-             nodeSpecificMatlab = getNodeSpecificMatlab(Computer.currentComputer(), listener) + getNodeSpecificExecutable(launcher);
-        } else {
-            throw new IOException ("ERROR***");
-        }
 
+        String nodeSpecificMatlab = getNodeSpecificMatlab(Computer.currentComputer(), listener) + getNodeSpecificExecutable(launcher);
         FilePath matlabExecutablePath = new FilePath(launcher.getChannel(), nodeSpecificMatlab);
 
         if (!matlabExecutablePath.exists()) {

src/main/java/com/mathworks/ci/tools/MatlabInstallable.java

@@ -15,11 +15,7 @@ public class MatlabInstallable extends Installable {
     private String osName;
     public MatlabInstallable (String osName) throws InstallationFailedException {
         this.osName = osName;
-        switch (osName) {
-            case "win64":
-                this.url = Message.getValue ("tools.matlab.mpm.installer.win");
-                this.batchURL = Message.getValue ("tools.matlab.batch.executable.win");
-                break;
+        switch (this.osName) {
             case "glnxa64":
                 this.url = Message.getValue ("tools.matlab.mpm.installer.linux");
                 this.batchURL = Message.getValue ("tools.matlab.batch.executable.linux");
@@ -42,16 +38,10 @@ public String getBatchURL () {
     }
 
     public FilePath getBatchInstallable (FilePath expectedPath) {
-        if (this.osName == "win64") {
-            return new FilePath (expectedPath, "matlab-batch.exe");
-        }
         return new FilePath (expectedPath, "matlab-batch");
     }
 
     public FilePath getMpmInstallable (FilePath expectedPath) {
-        if (this.osName == "win64") {
-            return new FilePath (expectedPath, "mpm.exe");
-        }
         return new FilePath (expectedPath, "mpm");
     }
 }

src/main/java/com/mathworks/ci/tools/MatlabInstaller.java

@@ -259,9 +259,6 @@ public Installable getInstallable (Node node) throws IOException, InterruptedExc
         // Gather properties for the node to install on
         String[] properties = node.getChannel ()
             .call (new GetSystemProperties ("os.name", "os.arch", "os.version"));
-        if(properties[0].contains ("win")) {
-            throw new InstallationFailedException ("Unsupported OS");
-        }
         return getInstallCandidate (properties[0], properties[1]);
     }
 
@@ -282,8 +279,6 @@ public String getPlatform (String os, String architecture) throws InstallationFa
             } else {
                 return "maci64";
             }
-        } else if (value.contains ("windows")) {
-            return "win64";
         } else {
             throw new InstallationFailedException ("Unsupported OS");
         }

src/main/resources/config.properties

@@ -31,8 +31,6 @@ Axis.no.installed.matlab.error = Because no MATLAB versions exist under Jenkins
 Use.matlab.version.axis.warning = This project specifies MATLAB versions using the 'Use MATLAB version' option as well as the added 'MATLAB' axis. The value specified by 'Use MATLAB version' takes precedence over the values specified by the 'MATLAB' axis.
 matlab.tools.auto.install.display.name = Install Using MPM
 
-tools.matlab.mpm.installer.win = https://www.mathworks.com/mpm/win64/mpm
-tools.matlab.batch.executable.win = https://ssd.mathworks.com/supportfiles/ci/matlab-batch/v1/win64/matlab-batch.exe
 tools.matlab.mpm.installer.linux = https://www.mathworks.com/mpm/glnxa64/mpm
 tools.matlab.batch.executable.linux = https://ssd.mathworks.com/supportfiles/ci/matlab-batch/v1/glnxa64/matlab-batch
 tools.matlab.mpm.installer.maci64 = https://www.mathworks.com/mpm/maci64/mpm

src/test/java/unit/com/mathworks/ci/tools/MatlabInstallableUnitTest.java

@@ -8,26 +8,24 @@
  *
  */
 
-
+import org.junit.Rule;
 import org.junit.Test;
 
 import hudson.FilePath;
 import com.mathworks.ci.TestMessage;
+import org.junit.rules.ExpectedException;
 
 public class MatlabInstallableUnitTest {
 
+    @Rule
+    public ExpectedException exceptionRule = ExpectedException.none ();
+
     @Test
     public void testValidWin64OS () throws InstallationFailedException {
+        exceptionRule.expect(InstallationFailedException.class);
+        exceptionRule.expectMessage("Unsupported OS");
         MatlabInstallable installable = new MatlabInstallable ("win64");
-        assertEquals (TestMessage.getValue ("tools.matlab.mpm.installer.win"), installable.url);
-        assertEquals (TestMessage.getValue ("tools.matlab.batch.executable.win"),
-            installable.getBatchURL ());
 
-        FilePath expectedPath = new FilePath (new File ("C:/install"));
-        assertEquals (new FilePath (expectedPath, "matlab-batch.exe").getRemote (),
-            installable.getBatchInstallable (expectedPath).getRemote ());
-        assertEquals (new FilePath (expectedPath, "mpm.exe").getRemote (),
-            installable.getMpmInstallable (expectedPath).getRemote ());
     }
 
     @Test

src/test/java/unit/com/mathworks/ci/tools/MatlabInstallerUnitTest.java

@@ -8,6 +8,8 @@
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
+import org.junit.Rule;
+import org.junit.rules.ExpectedException;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
@@ -79,6 +81,5 @@ public void testGetPlatform () throws InstallationFailedException {
         assertEquals ("glnxa64", installer.getPlatform ("Linux", "i686"));
         assertEquals ("maci64", installer.getPlatform ("Mac OS X", "amd64"));
         assertEquals ("maca64", installer.getPlatform ("Mac OS X", "arm64"));
-        assertEquals ("win64", installer.getPlatform ("Windows 10", "x86"));
     }
 }