Fixed: Test cases for linux OS

jenkinsci · Sep 13, 2022 · f246333 · f246333
1 parent 857204f
commit f246333
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/test/java/com/compuware/jenkins/scm/CpwrScmConfigurationTest.java b/src/test/java/com/compuware/jenkins/scm/CpwrScmConfigurationTest.java
@@ -2,7 +2,7 @@
  * The MIT License (MIT)
  * 
  * Copyright (c) 2015 - 2018 Compuware Corporation
- * (c) Copyright 2015 - 2018, 2021 BMC Software, Inc.
+ * (c) Copyright 2015 - 2018, 2021, 2022 BMC Software, Inc.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy,
@@ -23,6 +23,7 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
 
 import org.apache.commons.lang.StringUtils;
 import org.junit.Before;
@@ -35,6 +36,7 @@
 import com.compuware.jenkins.scm.util.ScmTestUtils;
 import com.compuware.jenkins.scm.util.TestConstants;
 
+import hudson.Functions;
 import hudson.model.FreeStyleProject;
 
 /**
@@ -113,6 +115,7 @@ public void testGetLoginInformation() {
 	public void validateTargetFolderTest()
 	{
 		// valid folder
+		assumeTrue(Functions.isWindows());
 		try
 		{
 			PdsConfiguration scmConfig = new PdsConfiguration(TestConstants.EXPECTED_CONNECTION_ID,

diff --git a/src/test/java/com/compuware/jenkins/scm/util/ScmTestUtils.java b/src/test/java/com/compuware/jenkins/scm/util/ScmTestUtils.java
@@ -2,6 +2,7 @@
  * The MIT License (MIT)
  * 
  * Copyright (c) 2015 - 2019 Compuware Corporation
+ * (c) Copyright 2022 BMC Software, Inc.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy,
@@ -65,10 +66,10 @@ public static void setupGlobalConfiguration() throws IOException
 		hostConnections.add(hostConnection);
 
 		JSONObject json = new JSONObject();
-		json.put("hostConn", hostConnections);
-		json.put(TestConstants.TOPAZ_CLI_LOCATION_LINUX, "/opt/Compuware/TopazCLI");
+		json.put("hostConn", hostConnections);		
 
 		URL cliUrl = ScmTestUtils.class.getResource("fake_cli");
+		json.put(TestConstants.TOPAZ_CLI_LOCATION_LINUX, cliUrl.getPath());
 		json.put(TestConstants.TOPAZ_CLI_LOCATION_WINDOWS, cliUrl.getPath());
 
 		CpwrGlobalConfiguration globalConfig = CpwrGlobalConfiguration.get();