Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Поддержка атрибутов регламентных заданий #364

Merged
merged 1 commit into from
Jul 28, 2022
Merged

Поддержка атрибутов регламентных заданий #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/main/java/com/github/_1c_syntax/mdclasses/mdo/MDScheduledJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,19 @@ public class MDScheduledJob extends AbstractMDObjectBase {
@XStreamAlias("methodName")
private Handler handler;

@XStreamAlias("Description")
private String description;
@XStreamAlias("Key")
private String key;
@XStreamAlias("Use")
private boolean use;
@XStreamAlias("Predefined")
private boolean predefined;
@XStreamAlias("RestartCountOnFailure")
private int restartCountOnFailure;
@XStreamAlias("RestartIntervalOnFailure")
private int restartIntervalOnFailure;

public MDScheduledJob(DesignerMDO designerMDO) {
super(designerMDO);
this.handler = new Handler(designerMDO.getProperties().getMethodName());
Expand Down
14 changes: 14 additions & 0 deletions src/test/java/com/github/_1c_syntax/mdclasses/mdo/MDScheduledJobAttributesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ void testEDT() {
assertThat(handler.getMethodPath()).isEqualTo("CommonModule.ПростойОбщийМодуль.РегламентноеЗадание1");
assertThat(handler.getMethodName()).isEqualTo("РегламентноеЗадание1");
assertThat(handler.getModuleName()).isEqualTo("ПростойОбщийМодуль");

assertThat(mdo.getDescription()).isEqualTo("Описание Регламентное задание 1");
assertThat(mdo.getKey()).isEqualTo("ПроверкаАктивностиСеансаУдаленияОбъектов");
assertThat(mdo.isUse()).isTrue();
assertThat(mdo.isPredefined()).isTrue();
assertThat(mdo.getRestartCountOnFailure()).isEqualTo(3);
assertThat(mdo.getRestartIntervalOnFailure()).isEqualTo(10);
}

@Override
Expand All @@ -58,5 +65,12 @@ void testDesigner() {
assertThat(handler.getMethodPath()).isEqualTo("CommonModule.ПростойОбщийМодуль.РегламентноеЗадание1");
assertThat(handler.getMethodName()).isEqualTo("РегламентноеЗадание1");
assertThat(handler.getModuleName()).isEqualTo("ПростойОбщийМодуль");

assertThat(mdo.getDescription()).isEqualTo("Описание Регламентное задание 1");
assertThat(mdo.getKey()).isEqualTo("ПроверкаАктивностиСеансаУдаленияОбъектов");
assertThat(mdo.isUse()).isTrue();
assertThat(mdo.isPredefined()).isTrue();
assertThat(mdo.getRestartCountOnFailure()).isEqualTo(3);
assertThat(mdo.getRestartIntervalOnFailure()).isEqualTo(10);
}
}
3 changes: 3 additions & 0 deletions ...st/resources/metadata/edt/src/ScheduledJobs/РегламентноеЗадание1/РегламентноеЗадание1.mdo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
<mdclass:ScheduledJob xmlns:mdclass="http://g5.1c.ru/v8/dt/metadata/mdclass" uuid="0de0c839-4427-46d9-be68-302f88ac162c">
<name>РегламентноеЗадание1</name>
<methodName>CommonModule.ПростойОбщийМодуль.РегламентноеЗадание1</methodName>
<description>Описание Регламентное задание 1</description>
<key>ПроверкаАктивностиСеансаУдаленияОбъектов</key>
<use>true</use>
<predefined>true</predefined>
<restartCountOnFailure>3</restartCountOnFailure>
<restartIntervalOnFailure>10</restartIntervalOnFailure>
</mdclass:ScheduledJob>
6 changes: 3 additions & 3 deletions src/test/resources/metadata/original/ScheduledJobs/РегламентноеЗадание1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
<Synonym/>
<Comment/>
<MethodName>CommonModule.ПростойОбщийМодуль.РегламентноеЗадание1</MethodName>
<Description/>
<Key/>
<Description>Описание Регламентное задание 1</Description>
<Key>ПроверкаАктивностиСеансаУдаленияОбъектов</Key>
<Use>true</Use>
<Predefined>false</Predefined>
<Predefined>true</Predefined>
<RestartCountOnFailure>3</RestartCountOnFailure>
<RestartIntervalOnFailure>10</RestartIntervalOnFailure>
</Properties>
Expand Down