промежуточный. ликвидировал велосипед с копированием папок

This commit is contained in:
2023-10-02 19:11:24 +03:00
parent 1934863bff
commit 6372fce1ac
3 changed files with 5 additions and 22 deletions

5
.idea/workspace.xml generated
View File

@@ -6,7 +6,10 @@
</artifacts-to-build> </artifacts-to-build>
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="" /> <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />

View File

@@ -1036,25 +1036,5 @@ public class Utils {
} }
return false; return false;
} }
public static void copyDirectory(File src, File dst) throws Exception {
int code = Constants.Nan;
String command =
Global.isWindows ?
("xcopy " +
Utils.DQuotes(src.getAbsolutePath()) + " " +
Utils.DQuotes(dst.getAbsolutePath()) + " /e")
:
("cp -r " + Utils.DQuotes(src.getAbsolutePath()) + " " +
Utils.DQuotes(dst.getAbsolutePath())
);
try {
code = Runtime.getRuntime().exec(command).waitFor();
} catch (Exception ex) {
ex.printStackTrace();
throw new PassException("Команда " + command + " завершилась с исключением.");
}
if (code != 0)
throw new PassException("Команда " + command + " завершилась с кодом " + code);
}
} }

View File

@@ -266,7 +266,7 @@ public class StartSapforTests extends Pass_2021<SapforScenario> {
File taskWorkspace = new File(sapforTasksPackage.workspace, test.description); File taskWorkspace = new File(sapforTasksPackage.workspace, test.description);
Utils.CheckAndCleanDirectory(taskWorkspace); Utils.CheckAndCleanDirectory(taskWorkspace);
//-- //--
Utils.copyDirectory(new File(Global.TestsDirectory, test.id), taskWorkspace); FileUtils.copyDirectory(new File(Global.TestsDirectory, test.id), taskWorkspace);
} }
} }
Global.db.Update(sapforTasksPackage); Global.db.Update(sapforTasksPackage);