From afae5df5572bcaf81fef7f288d652f56aa29e5fb Mon Sep 17 00:00:00 2001 From: Artur Ayukhanov Date: Mon, 25 Jul 2022 21:02:42 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=B0=D1=82=D1=80=D0=B8=D0=B1=D1=83=D1=82=D0=BE?= =?UTF-8?q?=D0=B2=20=D1=80=D0=B5=D0=B3=D0=BB.=D0=B7=D0=B0=D0=B4=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #363 --- .../_1c_syntax/mdclasses/mdo/MDScheduledJob.java | 13 +++++++++++++ .../mdo/MDScheduledJobAttributesTest.java | 14 ++++++++++++++ ...0\320\264\320\260\320\275\320\270\320\2651.mdo" | 3 +++ ...0\320\264\320\260\320\275\320\270\320\2651.xml" | 6 +++--- 4 files changed, 33 insertions(+), 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 index c0a697431..bb5fdd399 100644 --- 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 index c3562855b..191c41fdd 100644 --- 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/src/test/resources/metadata/edt/src/ScheduledJobs/\320\240\320\265\320\263\320\273\320\260\320\274\320\265\320\275\321\202\320\275\320\276\320\265\320\227\320\260\320\264\320\260\320\275\320\270\320\2651/\320\240\320\265\320\263\320\273\320\260\320\274\320\265\320\275\321\202\320\275\320\276\320\265\320\227\320\260\320\264\320\260\320\275\320\270\320\2651.mdo" "b/src/test/resources/metadata/edt/src/ScheduledJobs/\320\240\320\265\320\263\320\273\320\260\320\274\320\265\320\275\321\202\320\275\320\276\320\265\320\227\320\260\320\264\320\260\320\275\320\270\320\2651/\320\240\320\265\320\263\320\273\320\260\320\274\320\265\320\275\321\202\320\275\320\276\320\265\320\227\320\260\320\264\320\260\320\275\320\270\320\2651.mdo" index 752f7ff06..2695cc8aa 100644 --- "a/src/test/resources/metadata/edt/src/ScheduledJobs/\320\240\320\265\320\263\320\273\320\260\320\274\320\265\320\275\321\202\320\275\320\276\320\265\320\227\320\260\320\264\320\260\320\275\320\270\320\2651/\320\240\320\265\320\263\320\273\320\260\320\274\320\265\320\275\321\202\320\275\320\276\320\265\320\227\320\260\320\264\320\260\320\275\320\270\320\2651.mdo" +++ "b/src/test/resources/metadata/edt/src/ScheduledJobs/\320\240\320\265\320\263\320\273\320\260\320\274\320\265\320\275\321\202\320\275\320\276\320\265\320\227\320\260\320\264\320\260\320\275\320\270\320\2651/\320\240\320\265\320\263\320\273\320\260\320\274\320\265\320\275\321\202\320\275\320\276\320\265\320\227\320\260\320\264\320\260\320\275\320\270\320\2651.mdo" @@ -2,7 +2,10 @@ РегламентноеЗадание1 CommonModule.ПростойОбщийМодуль.РегламентноеЗадание1 + Описание Регламентное задание 1 + ПроверкаАктивностиСеансаУдаленияОбъектов true + true 3 10 diff --git "a/src/test/resources/metadata/original/ScheduledJobs/\320\240\320\265\320\263\320\273\320\260\320\274\320\265\320\275\321\202\320\275\320\276\320\265\320\227\320\260\320\264\320\260\320\275\320\270\320\2651.xml" "b/src/test/resources/metadata/original/ScheduledJobs/\320\240\320\265\320\263\320\273\320\260\320\274\320\265\320\275\321\202\320\275\320\276\320\265\320\227\320\260\320\264\320\260\320\275\320\270\320\2651.xml" index 904704957..0d61d2df7 100644 --- "a/src/test/resources/metadata/original/ScheduledJobs/\320\240\320\265\320\263\320\273\320\260\320\274\320\265\320\275\321\202\320\275\320\276\320\265\320\227\320\260\320\264\320\260\320\275\320\270\320\2651.xml" +++ "b/src/test/resources/metadata/original/ScheduledJobs/\320\240\320\265\320\263\320\273\320\260\320\274\320\265\320\275\321\202\320\275\320\276\320\265\320\227\320\260\320\264\320\260\320\275\320\270\320\2651.xml" @@ -6,10 +6,10 @@ CommonModule.ПростойОбщийМодуль.РегламентноеЗадание1 - - + Описание Регламентное задание 1 + ПроверкаАктивностиСеансаУдаленияОбъектов true - false + true 3 10