определение размерности после замены кода теста на текущий проект.
This commit is contained in:
5
.idea/workspace.xml
generated
5
.idea/workspace.xml
generated
@@ -9,12 +9,7 @@
|
|||||||
<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$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/CreateTestFromFile.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/UI/TestsForm.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Utils.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" />
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
"ServerUserPassword": "mprit_2011",
|
"ServerUserPassword": "mprit_2011",
|
||||||
"OfferRegistrationOnStart": true,
|
"OfferRegistrationOnStart": true,
|
||||||
"Workspace": "E:\\Tests",
|
"Workspace": "E:\\Tests",
|
||||||
"ProjectsSearchDirectory": "E:\\Tests\\test_c",
|
"ProjectsSearchDirectory": "E:\\BUG\\JAC\\p1",
|
||||||
"DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
|
"DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
|
||||||
"VisualiserPath": "C:\\Users\\misha\\Downloads",
|
"VisualiserPath": "C:\\Users\\misha\\Downloads",
|
||||||
"Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
|
"Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
|
||||||
|
|||||||
@@ -472,9 +472,13 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
"Не удалось прикрепить проект к тесту с id " + test.id
|
"Не удалось прикрепить проект к тесту с id " + test.id
|
||||||
+ "\nТест будет удален"
|
+ "\nТест будет удален"
|
||||||
);
|
);
|
||||||
} else db.Update(test); //обновить список файлов и размерность.
|
} else {
|
||||||
|
db.Update(test);
|
||||||
|
db.DetectTestMinMaxDim(db.serverSapfors.getLastDoneVersion(), db.groups.get(test.group_id), test);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
void ReplaceTestsCodes() throws Exception {
|
void ReplaceTestsCodes() throws Exception {
|
||||||
|
ServerSapfor serverSapfor = db.serverSapfors.getLastDoneVersion();
|
||||||
Vector<Test> tests = (Vector<Test>) request.object;
|
Vector<Test> tests = (Vector<Test>) request.object;
|
||||||
for (Test test : tests) {
|
for (Test test : tests) {
|
||||||
if (!test.unpackProjectOnServer()) {
|
if (!test.unpackProjectOnServer()) {
|
||||||
@@ -483,7 +487,10 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
|
|||||||
"Не удалось прикрепить проект к тесту с id " + test.id
|
"Не удалось прикрепить проект к тесту с id " + test.id
|
||||||
+ "\nТест будет удален"
|
+ "\nТест будет удален"
|
||||||
);
|
);
|
||||||
} else db.Update(test); //обновить список файлов и размерность.
|
} else {
|
||||||
|
db.Update(test);
|
||||||
|
db.DetectTestMinMaxDim(serverSapfor, db.groups.get(test.group_id), test);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
void GetServerName() throws Exception {
|
void GetServerName() throws Exception {
|
||||||
|
|||||||
Reference in New Issue
Block a user