[JENKINS-18416] Fixing Unit Tests

jenkinsci · Feb 12, 2014 · 1e9d3a6 · 1e9d3a6
1 parent 7fc9b92
commit 1e9d3a6
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/src/main/java/hudson/plugins/clearcase/AbstractClearCaseScm.java b/src/main/java/hudson/plugins/clearcase/AbstractClearCaseScm.java
@@ -47,6 +47,7 @@
 import hudson.plugins.clearcase.history.FilterChain;
 import hudson.plugins.clearcase.history.HistoryAction;
 import hudson.plugins.clearcase.ucm.UcmWorkflow;
+import hudson.plugins.clearcase.util.BuildUtils;
 import hudson.plugins.clearcase.util.BuildVariableResolver;
 import hudson.plugins.clearcase.util.PathUtil;
 import hudson.plugins.clearcase.viewstorage.ServerViewStorage;
@@ -291,7 +292,7 @@ public void buildEnvVars(AbstractBuild<?, ?> build, Map<String, String> env) {
         if (normalizedViewName != null) {
             env.put(CLEARCASE_VIEWTAG_ENVSTR, normalizedViewName);
         }
-        boolean isUnix = isRunningOnUnix(build);
+        boolean isUnix = BuildUtils.isRunningOnUnix(build);
         if (normalizedViewPath != null) {
             env.put(CLEARCASE_VIEWNAME_ENVSTR, normalizedViewPath);
             if (isUseDynamicView()) {
@@ -305,14 +306,6 @@ public void buildEnvVars(AbstractBuild<?, ?> build, Map<String, String> env) {
         }
     }
 
-    private boolean isRunningOnUnix(AbstractBuild<?, ?> build) {
-      Node builtOn = build.getBuiltOn();
-      if (builtOn == null) {
-        return false;
-      }
-      return builtOn.createLauncher(StreamTaskListener.NULL).isUnix();
-    }
-
     @Override
     public SCMRevisionState calcRevisionsFromBuild(AbstractBuild<?, ?> build, Launcher launcher, TaskListener taskListener) throws IOException,
     InterruptedException {

diff --git a/src/main/java/hudson/plugins/clearcase/ClearCaseSCM.java b/src/main/java/hudson/plugins/clearcase/ClearCaseSCM.java
@@ -43,6 +43,7 @@
 import hudson.plugins.clearcase.history.FilterChain;
 import hudson.plugins.clearcase.history.HistoryAction;
 import hudson.plugins.clearcase.history.LabelFilter;
+import hudson.plugins.clearcase.util.BuildUtils;
 import hudson.plugins.clearcase.util.BuildVariableResolver;
 import hudson.plugins.clearcase.util.PathUtil;
 import hudson.plugins.clearcase.viewstorage.ViewStorage;
@@ -317,7 +318,7 @@ public void buildEnvVars(AbstractBuild<?, ?> build, Map<String, String> env) {
         super.buildEnvVars(build, env);
         if (isUseDynamicView()) {
             if (getViewDrive() != null) {
-                env.put(CLEARCASE_VIEWPATH_ENVSTR, getViewDrive() + File.separator + getNormalizedViewName());
+                env.put(CLEARCASE_VIEWPATH_ENVSTR, getViewDrive() + PathUtil.fileSepForOS(BuildUtils.isRunningOnUnix(build)) + getNormalizedViewName());
             } else {
                 env.remove(CLEARCASE_VIEWPATH_ENVSTR);
             }

diff --git a/src/main/java/hudson/plugins/clearcase/util/BuildUtils.java b/src/main/java/hudson/plugins/clearcase/util/BuildUtils.java
@@ -0,0 +1,17 @@
+package hudson.plugins.clearcase.util;
+
+import hudson.model.AbstractBuild;
+import hudson.model.Node;
+import hudson.util.StreamTaskListener;
+
+public final class BuildUtils {
+    private BuildUtils() {}
+
+    public static boolean isRunningOnUnix(AbstractBuild<?, ?> build) {
+        Node builtOn = build.getBuiltOn();
+        if (builtOn == null) {
+          return false;
+        }
+        return builtOn.createLauncher(StreamTaskListener.NULL).isUnix();
+      }
+}