M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
02090095
2023-11-24 12:28:12 +03:00
parent 7c8299e10c
commit 8410203495
3 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/workspace.xml generated
View File

@@ -8,11 +8,7 @@
<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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Test/Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/Test.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/PerformSapforTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromFolder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromFolder.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromFolder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromFolder.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
</list> </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" />

7
src/TestingSystem/Common/Test/Test.java
View File

@@ -82,14 +82,13 @@ public class Test extends riDBObject {
File tempProject = getTempProject(); File tempProject = getTempProject();
File tempArchive = getTempArchive(); File tempArchive = getTempArchive();
//- создать бд. //- создать бд.
FileUtils.forceMkdir(tempProject);
FileUtils.copyDirectory(dir, tempProject);
//---
db_project_info project = new db_project_info(tempProject); db_project_info project = new db_project_info(tempProject);
project.Open(); project.Open();
project.Close(); project.Close();
//-
project.clearData(); project.clearData();
//-
FileUtils.forceMkdir(tempProject);
FileUtils.copyDirectory(dir, tempProject);
//-- //--
ZipFolderPass zip = new ZipFolderPass(); ZipFolderPass zip = new ZipFolderPass();
if (zip.Do(tempProject.getAbsolutePath(), tempArchive.getAbsolutePath())) { if (zip.Do(tempProject.getAbsolutePath(), tempArchive.getAbsolutePath())) {

21
src/Visual_DVM_2021/Passes/All/CreateTestFromFolder.java
View File

@@ -135,13 +135,26 @@ public class CreateTestFromFolder extends Pass_2021<Test> {
//-- //--
db_project_info project = target.packCode(dir); //создание копии папки, и архивация. db_project_info project = target.packCode(dir); //создание копии папки, и архивация.
//-- получить размерность консольным сапфором. папка уже отправлена и чистить ее не нужно!! //-- получить размерность консольным сапфором. папка уже отправлена и чистить ее не нужно!!
if (Sapfor.parse(Current.getSapfor().getFile(), project.Home, Current.getSapfor().getConsoleFlags())){ ShowMessage2("Синтаксический анализ");
Sapfor.analysis(Current.getSapfor().getFile(),project.Home, if (Sapfor.parse(Current.getSapfor().getFile(), project.Home, Current.getSapfor().getConsoleFlags())
){
ShowMessage2("Определение размерности");
if (Sapfor.analysis(Current.getSapfor().getFile(),project.Home,
PassCode_2021.SPF_GetMaxMinBlockDistribution, PassCode_2021.SPF_GetMaxMinBlockDistribution,
Current.getSapfor().getConsoleFlags()); Current.getSapfor().getConsoleFlags())){
} else Log.Writeln_("Не удалось определить размерность.проекта "+Utils.Brackets(dir.getName()));
}else {
Log.Writeln_("Не удалось выполнить синтаксический анализ проекта "+Utils.Brackets(dir.getName()));
} }
//todo получить значение из файла вывода анализа. //todo получить значение из файла вывода анализа.
}
@Override
protected boolean validate() {
return Log.isEmpty();
} }
@Override @Override
protected void performDone() throws Exception { protected void performDone() throws Exception {