Merge pull request #364 from artbear/ScheduledJob-attribs

Поддержка атрибутов регламентных заданий
1c-syntax · Jul 28, 2022 · 2b24240 · 2b24240
2 parents 947f4e0 + afae5df
commit 2b24240
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 3 deletions.
diff --git a/src/main/java/com/github/_1c_syntax/mdclasses/mdo/MDScheduledJob.java b/src/main/java/com/github/_1c_syntax/mdclasses/mdo/MDScheduledJob.java
@@ -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());

diff --git a/src/test/java/com/github/_1c_syntax/mdclasses/mdo/MDScheduledJobAttributesTest.java b/src/test/java/com/github/_1c_syntax/mdclasses/mdo/MDScheduledJobAttributesTest.java
@@ -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
@@ -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);
  }
 }
diff --git a/...st/resources/metadata/edt/src/ScheduledJobs/РегламентноеЗадание1/РегламентноеЗадание1.mdo b/...st/resources/metadata/edt/src/ScheduledJobs/РегламентноеЗадание1/РегламентноеЗадание1.mdo
@@ -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>
diff --git a/src/test/resources/metadata/original/ScheduledJobs/РегламентноеЗадание1.xml b/src/test/resources/metadata/original/ScheduledJobs/РегламентноеЗадание1.xml
@@ -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>