From 08cacd6f37e41f35373474881ef28283f7a3bc99 Mon Sep 17 00:00:00 2001 From: mchmx Date: Tue, 15 Nov 2016 16:23:52 -0500 Subject: [PATCH] Added new functionality - Define margin and limit in modeler - Define direction and orientation in modeler - Toggle tooltips in modeler - Set default behaviour to drag-tap --- dist/Handles.mpk | Bin 26396 -> 27513 bytes .../.cache/copy/deployment/timestamp | 2 +- .../grunt-newer/.cache/copy/mpks/timestamp | 2 +- src/Handles/Handles.xml | 54 ++++- src/Handles/widget/Handles.js | 79 ++++++- src/Handles/widget/ui/Handles.css | 1 + test/Test.mpr | Bin 765952 -> 765952 bytes test/deployment/build_core.xml | 2 +- .../20161114_150729_database_commands.sql | 207 ++++++++++++++++ .../data/database/hsqldb/default/default.lck | Bin 16 -> 0 bytes .../data/database/hsqldb/default/default.log | 57 ----- .../hsqldb/default/default.properties | 4 +- .../database/hsqldb/default/default.script | 39 +++- test/deployment/data/security.policy | 6 +- .../deployment/log/build_core_compile_log.txt | 10 +- test/deployment/log/build_core_deploy_log.txt | 4 +- test/deployment/log/m2ee_log.txt | 3 - test/deployment/model/bundles/i18n.jar | Bin 36520 -> 36520 bytes test/deployment/model/bundles/project.jar | Bin 68118 -> 76988 bytes test/deployment/model/model.mdp | Bin 549981 -> 559486 bytes .../testsuite/proxies/Color$MemberNames.class | Bin 1449 -> 1635 bytes .../run/bin/testsuite/proxies/Color.class | Bin 6552 -> 9343 bytes .../run/bin/testsuite/proxies/Entity.class | Bin 0 -> 4319 bytes .../proxies/Entity_2$MemberNames.class | Bin 0 -> 1230 bytes .../run/bin/testsuite/proxies/Entity_2.class | Bin 0 -> 5523 bytes .../proxies/Entity_3$MemberNames.class | Bin 0 -> 1230 bytes .../run/bin/testsuite/proxies/Entity_3.class | Bin 0 -> 6020 bytes .../run/felixcache/bundle0/security/cpa.txt | 4 +- .../run/felixcache/bundle1/bundle.info | 2 +- .../run/felixcache/bundle10/bundle.info | 2 +- .../run/felixcache/bundle100/bundle.info | 2 +- .../run/felixcache/bundle101/bundle.info | 2 +- .../run/felixcache/bundle102/bundle.info | 2 +- .../run/felixcache/bundle103/bundle.info | 2 +- .../run/felixcache/bundle104/bundle.info | 2 +- .../run/felixcache/bundle105/bundle.info | 2 +- .../bundle105/version0.0/bundle.jar | Bin 68118 -> 76988 bytes .../run/felixcache/bundle106/bundle.info | 2 +- .../bundle106/version0.0/bundle.jar | Bin 36520 -> 36520 bytes .../run/felixcache/bundle11/bundle.info | 2 +- .../run/felixcache/bundle12/bundle.info | 2 +- .../run/felixcache/bundle13/bundle.info | 2 +- .../run/felixcache/bundle14/bundle.info | 2 +- .../run/felixcache/bundle15/bundle.info | 2 +- .../run/felixcache/bundle16/bundle.info | 2 +- .../run/felixcache/bundle17/bundle.info | 2 +- .../run/felixcache/bundle18/bundle.info | 2 +- .../run/felixcache/bundle19/bundle.info | 2 +- .../run/felixcache/bundle2/bundle.info | 2 +- .../run/felixcache/bundle20/bundle.info | 2 +- .../run/felixcache/bundle21/bundle.info | 2 +- .../run/felixcache/bundle22/bundle.info | 2 +- .../run/felixcache/bundle23/bundle.info | 2 +- .../run/felixcache/bundle24/bundle.info | 2 +- .../run/felixcache/bundle25/bundle.info | 2 +- .../run/felixcache/bundle26/bundle.info | 2 +- .../run/felixcache/bundle27/bundle.info | 2 +- .../run/felixcache/bundle28/bundle.info | 2 +- .../run/felixcache/bundle29/bundle.info | 2 +- .../run/felixcache/bundle3/bundle.info | 2 +- .../run/felixcache/bundle30/bundle.info | 2 +- .../run/felixcache/bundle31/bundle.info | 2 +- .../run/felixcache/bundle32/bundle.info | 2 +- .../run/felixcache/bundle33/bundle.info | 2 +- .../run/felixcache/bundle34/bundle.info | 2 +- .../run/felixcache/bundle35/bundle.info | 2 +- .../run/felixcache/bundle36/bundle.info | 2 +- .../run/felixcache/bundle37/bundle.info | 2 +- .../run/felixcache/bundle38/bundle.info | 2 +- .../run/felixcache/bundle39/bundle.info | 2 +- .../run/felixcache/bundle4/bundle.info | 2 +- .../run/felixcache/bundle40/bundle.info | 2 +- .../run/felixcache/bundle41/bundle.info | 2 +- .../run/felixcache/bundle42/bundle.info | 2 +- .../run/felixcache/bundle43/bundle.info | 2 +- .../run/felixcache/bundle44/bundle.info | 2 +- .../run/felixcache/bundle45/bundle.info | 2 +- .../run/felixcache/bundle46/bundle.info | 2 +- .../run/felixcache/bundle47/bundle.info | 2 +- .../run/felixcache/bundle48/bundle.info | 2 +- .../run/felixcache/bundle49/bundle.info | 2 +- .../run/felixcache/bundle5/bundle.info | 2 +- .../run/felixcache/bundle50/bundle.info | 2 +- .../run/felixcache/bundle51/bundle.info | 2 +- .../run/felixcache/bundle52/bundle.info | 2 +- .../run/felixcache/bundle53/bundle.info | 2 +- .../run/felixcache/bundle54/bundle.info | 2 +- .../run/felixcache/bundle55/bundle.info | 2 +- .../run/felixcache/bundle56/bundle.info | 2 +- .../run/felixcache/bundle57/bundle.info | 2 +- .../run/felixcache/bundle58/bundle.info | 2 +- .../run/felixcache/bundle59/bundle.info | 2 +- .../run/felixcache/bundle6/bundle.info | 2 +- .../run/felixcache/bundle60/bundle.info | 2 +- .../run/felixcache/bundle61/bundle.info | 2 +- .../run/felixcache/bundle62/bundle.info | 2 +- .../run/felixcache/bundle63/bundle.info | 2 +- .../run/felixcache/bundle64/bundle.info | 2 +- .../run/felixcache/bundle65/bundle.info | 2 +- .../run/felixcache/bundle66/bundle.info | 2 +- .../run/felixcache/bundle67/bundle.info | 2 +- .../run/felixcache/bundle68/bundle.info | 2 +- .../run/felixcache/bundle69/bundle.info | 2 +- .../run/felixcache/bundle7/bundle.info | 2 +- .../run/felixcache/bundle70/bundle.info | 2 +- .../run/felixcache/bundle71/bundle.info | 2 +- .../run/felixcache/bundle72/bundle.info | 2 +- .../run/felixcache/bundle73/bundle.info | 2 +- .../run/felixcache/bundle74/bundle.info | 2 +- .../run/felixcache/bundle75/bundle.info | 2 +- .../run/felixcache/bundle76/bundle.info | 2 +- .../run/felixcache/bundle77/bundle.info | 2 +- .../run/felixcache/bundle78/bundle.info | 2 +- .../run/felixcache/bundle79/bundle.info | 2 +- .../run/felixcache/bundle8/bundle.info | 2 +- .../run/felixcache/bundle80/bundle.info | 2 +- .../run/felixcache/bundle81/bundle.info | 2 +- .../run/felixcache/bundle82/bundle.info | 2 +- .../run/felixcache/bundle83/bundle.info | 2 +- .../run/felixcache/bundle84/bundle.info | 2 +- .../run/felixcache/bundle85/bundle.info | 2 +- .../run/felixcache/bundle86/bundle.info | 2 +- .../run/felixcache/bundle87/bundle.info | 2 +- .../run/felixcache/bundle88/bundle.info | 2 +- .../run/felixcache/bundle89/bundle.info | 2 +- .../run/felixcache/bundle9/bundle.info | 2 +- .../run/felixcache/bundle90/bundle.info | 2 +- .../run/felixcache/bundle91/bundle.info | 2 +- .../run/felixcache/bundle92/bundle.info | 2 +- .../run/felixcache/bundle93/bundle.info | 2 +- .../run/felixcache/bundle94/bundle.info | 2 +- .../run/felixcache/bundle95/bundle.info | 2 +- .../run/felixcache/bundle96/bundle.info | 2 +- .../run/felixcache/bundle97/bundle.info | 2 +- .../run/felixcache/bundle98/bundle.info | 2 +- .../run/felixcache/bundle99/bundle.info | 2 +- test/deployment/web/components.json | 2 +- test/deployment/web/index-console-rtl.html | 14 +- test/deployment/web/index-console.html | 12 +- test/deployment/web/index-phone-preview.html | 2 +- test/deployment/web/index-rtl.html | 12 +- test/deployment/web/index-tablet-preview.html | 2 +- test/deployment/web/index.html | 10 +- test/deployment/web/login.html | 8 +- .../Administration/Account_Edit.page.xml | 2 +- .../en_US/Administration/Account_New.page.xml | 2 +- .../Administration/Account_Overview.page.xml | 2 +- .../Administration/ActiveSessions.page.xml | 2 +- .../ChangeMyPasswordForm.page.xml | 2 +- .../ChangePasswordForm.page.xml | 2 +- .../en_US/Administration/MyAccount.page.xml | 2 +- .../Administration/RuntimeStatistics.page.xml | 2 +- .../Administration/ScheduledEvents.page.xml | 2 +- .../Administration/UserRole_Select.page.xml | 2 +- .../en_US/Layouts/DesktopLayout.layout.xml | 2 +- .../en_US/Layouts/SidebarLayout.layout.xml | 2 +- .../Layouts/SidebarPhoneLayout.layout.xml | 2 +- .../TestSuite/DataView_Editable.page.xml | 2 +- .../en_US/TestSuite/DataView_NewEdit.page.xml | 2 +- .../TestSuite/DataView_ReadOnly.page.xml | 2 +- .../TestSuite/DataView_Validation.page.xml | 2 +- .../TestSuite/Event_RefreshInClient.page.xml | 2 +- .../en_US/TestSuite/Event_Update.page.xml | 2 +- .../TestSuite/ListView_Editable.page.xml | 2 +- .../TestSuite/ListView_ReadOnly.page.xml | 2 +- .../TestSuite/ListeningDataView.page.xml | 2 +- .../ListeningDataView_DeselectGrid.page.xml | 2 +- .../ListeningDataView_ReadOnly.page.xml | 2 +- .../Phone_DataView_Editable.page.xml | 2 +- .../Phone_DataView_ReadOnly.page.xml | 2 +- .../Phone_DataView_Validation.page.xml | 2 +- .../TestSuite/Phone_Event_OnClick.page.xml | 2 +- .../Phone_Event_RefreshInClient.page.xml | 2 +- .../TestSuite/Phone_Event_Update.page.xml | 2 +- .../Phone_ListView_Editable.page.xml | 2 +- .../Phone_ListView_ReadOnly.page.xml | 2 +- .../en_US/TestSuite/TabContainer.page.xml | 2 +- .../en_US/TestSuite/TemplateGrid.page.xml | 2 +- .../web/widgets/Handles/Handles.xml | 54 ++++- .../web/widgets/Handles/widget/Handles.js | 79 ++++++- .../web/widgets/Handles/widget/ui/Handles.css | 1 + test/deployment/web/widgets/widgets.css | 1 + test/javasource/testsuite/proxies/Color.java | 101 +++++++- test/javasource/testsuite/proxies/Entity.java | 153 ++++++++++++ .../testsuite/proxies/Entity_2.java | 217 +++++++++++++++++ .../testsuite/proxies/Entity_3.java | 220 ++++++++++++++++++ test/test.launch | 6 +- test/widgets/Handles.mpk | Bin 26396 -> 27513 bytes 188 files changed, 1369 insertions(+), 279 deletions(-) create mode 100644 test/deployment/data/database/20161114_150729_database_commands.sql delete mode 100644 test/deployment/data/database/hsqldb/default/default.lck delete mode 100644 test/deployment/data/database/hsqldb/default/default.log create mode 100644 test/deployment/run/bin/testsuite/proxies/Entity.class create mode 100644 test/deployment/run/bin/testsuite/proxies/Entity_2$MemberNames.class create mode 100644 test/deployment/run/bin/testsuite/proxies/Entity_2.class create mode 100644 test/deployment/run/bin/testsuite/proxies/Entity_3$MemberNames.class create mode 100644 test/deployment/run/bin/testsuite/proxies/Entity_3.class create mode 100644 test/javasource/testsuite/proxies/Entity.java create mode 100644 test/javasource/testsuite/proxies/Entity_2.java create mode 100644 test/javasource/testsuite/proxies/Entity_3.java diff --git a/dist/Handles.mpk b/dist/Handles.mpk index b6e0c617bd1727381de8d5d1c691dc53dabb7cd0..ee7c399886808c39c61cf8e68449bbb49d15a323 100644 GIT binary patch delta 6423 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 ZY{VMluZQJ-JY?FyZmlU%Vr>5y{ugKmA>{x7 delta 5308 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 Handles - The description of this widget. + Slider with two (or more handles) @@ -22,7 +22,7 @@ The size of the interval between slider steps. - Lower Handle + Lower Handle Attribute Slider Settings Entity Attribute (decimal) coupled with the lower handle of the slider. @@ -30,12 +30,60 @@ - Upper Handle + Upper Handle Attribute Slider Settings Entity Attribute (decimal) coupled with the upper handle of the slider. + + Display Value Labels + Slider Settings + Set true to display the handle's value in a label. + + + Direction + Slider Settings + Configure the slider to increase left-to-right/top-to-bottom or right-to-left/bottom-to-top. + + Left-to-right / Top-to-bottom + Right-to-left / Bottom-to-top + + + + Orientation + Slider Settings + Configure the orientation of the slider. +If Vertical, be sure to select the correct Direction value for your purposes. +Also if Vertical, height must be manually set in the widget css (class .noUi-vertical) + + Horizontal + Vertical + + + + + Enforce Minimum Range + Advanced Settings + Set true to enforce a minimum size for the range between handles + + + Minimum Range + Advanced Settings + Size of the minimum range; takes effect only if Enforce Minimum Range is true. + + + Enforce Maximum Range + Advanced Settings + Set true to enforce a maximum size for the range between handles + + + Maximum Range + Advanced Settings + Size of the maximum range; takes effect only if Enforce Maximum Range is true. + + + diff --git a/src/Handles/widget/Handles.js b/src/Handles/widget/Handles.js index b5bc0be..4d42147 100644 --- a/src/Handles/widget/Handles.js +++ b/src/Handles/widget/Handles.js @@ -33,10 +33,14 @@ define([ "dojo/text", "dojo/html", "dojo/_base/event", + "dojo/query", "Handles/lib/nouislider", "dojo/text!Handles/widget/template/Handles.html" ], function (declare, _WidgetBase, _TemplatedMixin, dom, dojoDom, dojoProp, dojoGeometry, dojoClass, dojoStyle, dojoConstruct, dojoArray, dojoLang, dojoText, dojoHtml, dojoEvent, + + dojoQuery, + noUiSlider, widgetTemplate) { "use strict"; @@ -54,12 +58,21 @@ define([ sliderStep : "", handleAttr0 : "", handleAttr1 : "", + testProperty : "", + enforceMargin : false, + marginSize : null, + enforceLimit : false, + limitSize : null, + direction : "", + orientation : "", + toolTips : false, // Internal variables. Non-primitives created in the prototype are shared between all widget instances. _handles: null, _contextObj: null, _alertDiv: null, _readOnly: false, + _sliderSettings: null, // dojo.declare.constructor is called to construct the widget instance. Implement to initialize non-primitive properties. constructor: function () { @@ -71,13 +84,22 @@ define([ postCreate: function () { logger.debug(this.id + ".postCreate"); + this._sliderSettings = { + start: [this.sliderMax * 0.25, this.sliderMax * 0.75], + step: this.sliderStep, + connect: true, + range: { 'min': this.sliderMin, 'max': this.sliderMax }, + behaviour: 'drag-tap' + }; + this._updateRendering(); - noUiSlider.create(this.domTarget, { - start: [this.sliderMax * 0.25, this.sliderMax * 0.75], - step: this.sliderStep, - connect: true, - range: { 'min': this.sliderMin, 'max': this.sliderMax } - }); + + this._setDirectionAndOrientation(); + this._setMarginAndLimit(); + this._toggleTooltips(); + this._buildPips(); + + noUiSlider.create(this.domTarget, this._sliderSettings); this._setupEvents(); }, @@ -92,7 +114,7 @@ define([ if(this._contextObj.get(this.handleAttr0) == 0 && this._contextObj.get(this.handleAttr1) == 0) { this._contextObj.set(this.handleAttr0, this.domTarget.noUiSlider.get()[0]); - this._contextObj.set(this.handleAttr1, this.domTarget.noUiSlider.get()[1]); + this._contextObj.set(this.handleAttr1, this.domTarget.noUiSlider.get()[1]); } else { this.domTarget.noUiSlider.set( [this._contextObj.get(this.handleAttr0), this._contextObj.get(this.handleAttr1)] ); } @@ -132,7 +154,6 @@ define([ logger.debug(this.id + "._setupEvents"); var self = this; self.domTarget.noUiSlider.on('slide', function() { - console.log("listener is firing"); self._contextObj.set(self.handleAttr0, self.domTarget.noUiSlider.get()[0]); self._contextObj.set(self.handleAttr1, self.domTarget.noUiSlider.get()[1]); }); @@ -225,7 +246,49 @@ define([ this._handles = [ objectHandle, attrHandle, validationHandle ]; } + }, + + // Set the direction and orientation of the sliderMin + _setDirectionAndOrientation: function() { + console.log('set direction and orientation'); + if (this.direction == 'rtl') { + this._sliderSettings.direction = this.direction + }; + if (this.orientation == 'vertical') { + this._sliderSettings.orientation = this.orientation + }; + }, + + // Set the margin and limit (minimum and maximum separation between handles) + _setMarginAndLimit: function() { + console.log('set margin...') + if ( (this.enforceMargin && this.marginSize != null) ) { + this._sliderSettings.margin = this.marginSize + }; + if ( (this.enforceLimit && this.limitSize != null) ) { + this._sliderSettings.limit = this.limitSize + }; + }, + + // Toogle display of values on the handles + _toggleTooltips: function() { + console.log('set tool tips...') + if ( (this.toolTips) ) { + this._sliderSettings.tooltips = [true, true]; + } + }, + + // If steps are >= 25% of the range, render pips + _buildPips: function() { + console.log('build pips...') + if ( (this.sliderMax-this.sliderMin) / this.sliderStep <= 4 ) { + this._sliderSettings.pips = { + mode: 'steps', density: this.sliderStep + } + } } + + }); }); diff --git a/src/Handles/widget/ui/Handles.css b/src/Handles/widget/ui/Handles.css index 5b22adb..b49b7f3 100644 --- a/src/Handles/widget/ui/Handles.css +++ b/src/Handles/widget/ui/Handles.css @@ -92,6 +92,7 @@ } .noUi-vertical { width: 18px; + height: 400px; } .noUi-vertical .noUi-handle { width: 28px; diff --git a/test/Test.mpr b/test/Test.mpr index fffa8ca9c9620a037b677373a468178bea4cbc4b..f460f6a97242b797ff89bad57bafdf21ac696b5a 100644 GIT binary patch delta 19886 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 delta 8674 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 - + Ant buildfile for deployment. Generated by the Mendix Business Modeler. diff --git a/test/deployment/data/database/20161114_150729_database_commands.sql b/test/deployment/data/database/20161114_150729_database_commands.sql new file mode 100644 index 0000000..a88f190 --- /dev/null +++ b/test/deployment/data/database/20161114_150729_database_commands.sql @@ -0,0 +1,207 @@ +CREATE TABLE "testsuite$entity_2" ( + "id" BIGINT NOT NULL, + PRIMARY KEY("id")); +INSERT INTO "mendixsystem$entity" ("id", +"entity_name", +"table_name") + VALUES ('774c68d7-d12c-49c6-a095-f6d4848d2bca', +'TestSuite.Entity_2', +'testsuite$entity_2'); +CREATE TABLE "testsuite$entity_2_color" ( + "testsuite$entity_2id" BIGINT NOT NULL, + "testsuite$colorid" BIGINT NOT NULL, + PRIMARY KEY("testsuite$entity_2id","testsuite$colorid")); +CREATE INDEX "idx_testsuite$entity_2_color_testsuite$color_testsuite$entity_2" ON "testsuite$entity_2_color" + ("testsuite$colorid","testsuite$entity_2id"); +INSERT INTO "mendixsystem$association" ("id", +"association_name", +"table_name", +"parent_entity_id", +"child_entity_id", +"parent_column_name", +"child_column_name", +"index_name") + VALUES ('9c90205c-5e6b-4be3-a7ee-b5ffcd7f5789', +'TestSuite.Entity_2_Color', +'testsuite$entity_2_color', +'774c68d7-d12c-49c6-a095-f6d4848d2bca', +'0ab9d4f4-ef25-43c5-9291-8ef27e0062f9', +'testsuite$entity_2id', +'testsuite$colorid', +'idx_testsuite$entity_2_color_testsuite$color_testsuite$entity_2'); +CREATE TABLE "testsuite$entity" ( + "id" BIGINT NOT NULL, + PRIMARY KEY("id")); +INSERT INTO "mendixsystem$entity" ("id", +"entity_name", +"table_name") + VALUES ('dcb65bb6-718e-4bca-bb34-ff9ee119136b', +'TestSuite.Entity', +'testsuite$entity'); +CREATE TABLE "testsuite$entity_3" ( + "id" BIGINT NOT NULL, + PRIMARY KEY("id")); +INSERT INTO "mendixsystem$entity" ("id", +"entity_name", +"table_name") + VALUES ('4923ae57-6e7f-45e2-9b01-6d6b6eea265a', +'TestSuite.Entity_3', +'testsuite$entity_3'); +CREATE TABLE "testsuite$entity_3_color" ( + "testsuite$entity_3id" BIGINT NOT NULL, + "testsuite$colorid" BIGINT NOT NULL, + PRIMARY KEY("testsuite$entity_3id","testsuite$colorid")); +CREATE INDEX "idx_testsuite$entity_3_color_testsuite$color_testsuite$entity_3" ON "testsuite$entity_3_color" + ("testsuite$colorid","testsuite$entity_3id"); +INSERT INTO "mendixsystem$association" ("id", +"association_name", +"table_name", +"parent_entity_id", +"child_entity_id", +"parent_column_name", +"child_column_name", +"index_name") + VALUES ('c964bfa6-d806-4a78-9dc6-0b7722912ea5', +'TestSuite.Entity_3_Color', +'testsuite$entity_3_color', +'4923ae57-6e7f-45e2-9b01-6d6b6eea265a', +'0ab9d4f4-ef25-43c5-9291-8ef27e0062f9', +'testsuite$entity_3id', +'testsuite$colorid', +'idx_testsuite$entity_3_color_testsuite$color_testsuite$entity_3'); +CREATE TABLE "testsuite$color" ( + "id" BIGINT NOT NULL, + "isprimary" BOOLEAN NULL, + "rangemin" DECIMAL(28, 8) NULL, + "rangemax" DECIMAL(28, 8) NULL, + "ral" INT NULL, + "colorcode" VARCHAR_IGNORECASE(200) NULL, + "name" VARCHAR_IGNORECASE(200) NULL, + PRIMARY KEY("id")); +INSERT INTO "mendixsystem$entity" ("id", +"entity_name", +"table_name") + VALUES ('0ab9d4f4-ef25-43c5-9291-8ef27e0062f9', +'TestSuite.Color', +'testsuite$color'); +INSERT INTO "mendixsystem$attribute" ("id", +"entity_id", +"attribute_name", +"column_name", +"type", +"length", +"default_value", +"is_auto_number") + VALUES ('6daf0494-c79c-4964-95a1-bed51236ee4f', +'0ab9d4f4-ef25-43c5-9291-8ef27e0062f9', +'IsPrimary', +'isprimary', +10, +200, +'false', +false); +INSERT INTO "mendixsystem$attribute" ("id", +"entity_id", +"attribute_name", +"column_name", +"type", +"length", +"default_value", +"is_auto_number") + VALUES ('5fffc892-a0c1-4712-a812-eb1256660861', +'0ab9d4f4-ef25-43c5-9291-8ef27e0062f9', +'RangeMin', +'rangemin', +5, +200, +'0', +false); +INSERT INTO "mendixsystem$attribute" ("id", +"entity_id", +"attribute_name", +"column_name", +"type", +"length", +"default_value", +"is_auto_number") + VALUES ('4dd195b6-c5a5-4167-9c6b-668fcb99e530', +'0ab9d4f4-ef25-43c5-9291-8ef27e0062f9', +'RangeMax', +'rangemax', +5, +200, +'0', +false); +INSERT INTO "mendixsystem$attribute" ("id", +"entity_id", +"attribute_name", +"column_name", +"type", +"length", +"default_value", +"is_auto_number") + VALUES ('a40a0209-9195-4c1c-a3d5-6d39c50d30c8', +'0ab9d4f4-ef25-43c5-9291-8ef27e0062f9', +'RAL', +'ral', +3, +200, +'2003', +false); +INSERT INTO "mendixsystem$attribute" ("id", +"entity_id", +"attribute_name", +"column_name", +"type", +"length", +"default_value", +"is_auto_number") + VALUES ('54557d58-e2ca-4fb1-9cd4-16683e1e8a1b', +'0ab9d4f4-ef25-43c5-9291-8ef27e0062f9', +'ColorCode', +'colorcode', +30, +200, +'#FF7514', +false); +INSERT INTO "mendixsystem$attribute" ("id", +"entity_id", +"attribute_name", +"column_name", +"type", +"length", +"default_value", +"is_auto_number") + VALUES ('6ed9bbed-84c3-4189-bedf-0e82f1b99c11', +'0ab9d4f4-ef25-43c5-9291-8ef27e0062f9', +'Name', +'name', +30, +200, +'Pastel orange', +false); +CREATE TABLE "testsuite$color_entity" ( + "testsuite$colorid" BIGINT NOT NULL, + "testsuite$entityid" BIGINT NOT NULL, + PRIMARY KEY("testsuite$colorid","testsuite$entityid")); +CREATE INDEX "idx_testsuite$color_entity_testsuite$entity_testsuite$color" ON "testsuite$color_entity" + ("testsuite$entityid","testsuite$colorid"); +INSERT INTO "mendixsystem$association" ("id", +"association_name", +"table_name", +"parent_entity_id", +"child_entity_id", +"parent_column_name", +"child_column_name", +"index_name") + VALUES ('47cca560-cd85-40ba-8f9f-87e7c93ba180', +'TestSuite.Color_Entity', +'testsuite$color_entity', +'0ab9d4f4-ef25-43c5-9291-8ef27e0062f9', +'dcb65bb6-718e-4bca-bb34-ff9ee119136b', +'testsuite$colorid', +'testsuite$entityid', +'idx_testsuite$color_entity_testsuite$entity_testsuite$color'); +UPDATE "mendixsystem$version" + SET "versionnumber" = '4.0.7', +"lastsyncdate" = '20161114 15:07:28'; diff --git a/test/deployment/data/database/hsqldb/default/default.lck b/test/deployment/data/database/hsqldb/default/default.lck deleted file mode 100644 index 6fb784d06cd6fa8cf6609feba6322803643fb2f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16 XcmeYW4)pQyclKsrV2n_;*i!=lBHIK| diff --git a/test/deployment/data/database/hsqldb/default/default.log b/test/deployment/data/database/hsqldb/default/default.log deleted file mode 100644 index 037bd73..0000000 --- a/test/deployment/data/database/hsqldb/default/default.log +++ /dev/null @@ -1,57 +0,0 @@ -/*C2*/SET SCHEMA PUBLIC -DELETE FROM "mendixsystem$version" WHERE "versionnumber"='4.0.7' -INSERT INTO "mendixsystem$version" VALUES('4.0.7','2016-10-28 13:47:48.564000','2.0.1','unversioned','Test') -COMMIT -/*C3*/SET SCHEMA PUBLIC -DELETE FROM "system$userrole" WHERE "id"=3096224743817217 -INSERT INTO "system$userrole" VALUES(3096224743817217,'8dd52bfa-6d7e-453b-b506-303c0a3d9567','','Administrator') -DELETE FROM "system$userrole" WHERE "id"=3096224743817218 -INSERT INTO "system$userrole" VALUES(3096224743817218,'53f5d6fa-6da9-4a71-b011-454ec052cce8','','User') -COMMIT -DELETE FROM "mendixsystem$entityidentifier" WHERE "id"='d4154981-8dac-4150-aec5-efa3ef62a7a2' -INSERT INTO "mendixsystem$entityidentifier" VALUES('d4154981-8dac-4150-aec5-efa3ef62a7a2',3,1301) -COMMIT -INSERT INTO "system$xasinstance" VALUES(844424930133169,'1377e5f9-b647-4106-84b6-079f5852bb99','2016-11-01 21:37:10.994000','2016-11-01 21:37:10.904000',NULL,NULL,NULL) -COMMIT -INSERT INTO "system$clustermanager" VALUES(2814749767106561,844424930133169) -COMMIT -DELETE FROM "system$statistics" WHERE "id"=2814749767106561 -INSERT INTO "system$statistics" VALUES(2814749767106561,'2016-10-28 17:47:49.753000','2016-11-01 21:37:11.042000',2,0,0) -COMMIT -DELETE FROM "mendixsystem$entityidentifier" WHERE "id"='282e2e60-88a5-469d-84a5-ba8d9151644f' -INSERT INTO "mendixsystem$entityidentifier" VALUES('282e2e60-88a5-469d-84a5-ba8d9151644f',2,1301) -COMMIT -INSERT INTO "system$user" VALUES(562949953422513,'2016-11-01 21:37:18.207000',TRUE,'2016-11-01 21:37:18.207000','2016-11-01 21:37:18.343000',FALSE,TRUE,0,FALSE,'Anonymous_52132cda-6aca-4137-9af9-604a0631d8ea','{BCrypt}$2a$10$Egysa3Cs2VWgtrUuZA8tou5i.hktq0Cjnlak0V1vY2LJpfZ.Bs4M.','System.User',562949953422513,NULL) -INSERT INTO "system$user_language" VALUES(562949953422513,4503599627370497) -INSERT INTO "system$userroles" VALUES(562949953422513,3096224743817217) -COMMIT -DELETE FROM "system$user" WHERE "id"=562949953422513 -INSERT INTO "system$user" VALUES(562949953422513,'2016-11-01 21:37:18.207000',TRUE,'2016-11-01 21:37:18.207000','2016-11-01 21:37:18.365000',FALSE,TRUE,0,FALSE,'Anonymous_52132cda-6aca-4137-9af9-604a0631d8ea','{BCrypt}$2a$10$Egysa3Cs2VWgtrUuZA8tou5i.hktq0Cjnlak0V1vY2LJpfZ.Bs4M.','System.User',562949953422513,NULL) -COMMIT -/*C4*/SET SCHEMA PUBLIC -DELETE FROM "mendixsystem$entityidentifier" WHERE "id"='0ab9d4f4-ef25-43c5-9291-8ef27e0062f9' -INSERT INTO "mendixsystem$entityidentifier" VALUES('0ab9d4f4-ef25-43c5-9291-8ef27e0062f9',13,1101) -COMMIT -DELETE FROM "system$xasinstance" WHERE "id"=844424930133169 -INSERT INTO "system$xasinstance" VALUES(844424930133169,'1377e5f9-b647-4106-84b6-079f5852bb99','2016-11-01 21:37:10.994000','2016-11-01 21:42:11.090000',NULL,NULL,NULL) -COMMIT -DELETE FROM "system$statistics" WHERE "id"=2814749767106561 -INSERT INTO "system$statistics" VALUES(2814749767106561,'2016-10-28 17:47:49.753000','2016-11-01 21:42:11.128000',2,0,0) -COMMIT -/*C2*/DISCONNECT -/*C4*/DELETE FROM "system$xasinstance" WHERE "id"=844424930133169 -INSERT INTO "system$xasinstance" VALUES(844424930133169,'1377e5f9-b647-4106-84b6-079f5852bb99','2016-11-01 21:37:10.994000','2016-11-01 21:47:11.156000',NULL,NULL,NULL) -COMMIT -DELETE FROM "system$statistics" WHERE "id"=2814749767106561 -INSERT INTO "system$statistics" VALUES(2814749767106561,'2016-10-28 17:47:49.753000','2016-11-01 21:47:11.191000',2,0,0) -COMMIT -DELETE FROM "system$xasinstance" WHERE "id"=844424930133169 -INSERT INTO "system$xasinstance" VALUES(844424930133169,'1377e5f9-b647-4106-84b6-079f5852bb99','2016-11-01 21:37:10.994000','2016-11-01 21:52:11.212000',NULL,NULL,NULL) -COMMIT -DELETE FROM "system$statistics" WHERE "id"=2814749767106561 -INSERT INTO "system$statistics" VALUES(2814749767106561,'2016-10-28 17:47:49.753000','2016-11-01 21:52:11.249000',2,0,0) -COMMIT -DELETE FROM "system$user" WHERE "id"=562949953422513 -DELETE FROM "system$user_language" WHERE "system$userid"=562949953422513 AND "system$languageid"=4503599627370497 -DELETE FROM "system$userroles" WHERE "system$userid"=562949953422513 AND "system$userroleid"=3096224743817217 -COMMIT diff --git a/test/deployment/data/database/hsqldb/default/default.properties b/test/deployment/data/database/hsqldb/default/default.properties index 4b2c8db..5959802 100644 --- a/test/deployment/data/database/hsqldb/default/default.properties +++ b/test/deployment/data/database/hsqldb/default/default.properties @@ -1,4 +1,4 @@ #HSQL Database Engine 2.3.2 -#Tue Nov 01 17:37:10 EDT 2016 +#Tue Nov 15 16:22:02 EST 2016 version=2.3.2 -modified=yes +modified=no diff --git a/test/deployment/data/database/hsqldb/default/default.script b/test/deployment/data/database/hsqldb/default/default.script index 0559517..39a14c8 100644 --- a/test/deployment/data/database/hsqldb/default/default.script +++ b/test/deployment/data/database/hsqldb/default/default.script @@ -83,6 +83,16 @@ CREATE INDEX "idx_system$session_user_system$user_system$session" ON PUBLIC."sys CREATE MEMORY TABLE PUBLIC."system$image"("id" BIGINT NOT NULL PRIMARY KEY,"publicthumbnailpath" VARCHAR(500) COLLATE SQL_TEXT_UCC) CREATE MEMORY TABLE PUBLIC."administration$account"("id" BIGINT NOT NULL PRIMARY KEY,"fullname" VARCHAR(200) COLLATE SQL_TEXT_UCC) CREATE MEMORY TABLE PUBLIC."system$language"("id" BIGINT NOT NULL PRIMARY KEY,"description" VARCHAR(200) COLLATE SQL_TEXT_UCC,"code" VARCHAR(20) COLLATE SQL_TEXT_UCC) +CREATE MEMORY TABLE PUBLIC."testsuite$entity_2"("id" BIGINT NOT NULL PRIMARY KEY) +CREATE MEMORY TABLE PUBLIC."testsuite$entity_2_color"("testsuite$entity_2id" BIGINT NOT NULL,"testsuite$colorid" BIGINT NOT NULL,PRIMARY KEY("testsuite$entity_2id","testsuite$colorid")) +CREATE INDEX "idx_testsuite$entity_2_color_testsuite$color_testsuite$entity_2" ON PUBLIC."testsuite$entity_2_color"("testsuite$colorid","testsuite$entity_2id") +CREATE MEMORY TABLE PUBLIC."testsuite$entity"("id" BIGINT NOT NULL PRIMARY KEY) +CREATE MEMORY TABLE PUBLIC."testsuite$entity_3"("id" BIGINT NOT NULL PRIMARY KEY) +CREATE MEMORY TABLE PUBLIC."testsuite$entity_3_color"("testsuite$entity_3id" BIGINT NOT NULL,"testsuite$colorid" BIGINT NOT NULL,PRIMARY KEY("testsuite$entity_3id","testsuite$colorid")) +CREATE INDEX "idx_testsuite$entity_3_color_testsuite$color_testsuite$entity_3" ON PUBLIC."testsuite$entity_3_color"("testsuite$colorid","testsuite$entity_3id") +CREATE MEMORY TABLE PUBLIC."testsuite$color"("id" BIGINT NOT NULL PRIMARY KEY,"isprimary" BOOLEAN,"rangemin" DECIMAL(28,8),"rangemax" DECIMAL(28,8),"ral" INTEGER,"colorcode" VARCHAR(200) COLLATE SQL_TEXT_UCC,"name" VARCHAR(200) COLLATE SQL_TEXT_UCC) +CREATE MEMORY TABLE PUBLIC."testsuite$color_entity"("testsuite$colorid" BIGINT NOT NULL,"testsuite$entityid" BIGINT NOT NULL,PRIMARY KEY("testsuite$colorid","testsuite$entityid")) +CREATE INDEX "idx_testsuite$color_entity_testsuite$entity_testsuite$color" ON PUBLIC."testsuite$color_entity"("testsuite$entityid","testsuite$colorid") ALTER SEQUENCE SYSTEM_LOBS.LOB_ID RESTART WITH 1 ALTER SEQUENCE PUBLIC."system$filedocument_fileid_mxseq" RESTART WITH 1 ALTER SEQUENCE PUBLIC."system$filedocument___filename___mxseq" RESTART WITH 1 @@ -96,18 +106,22 @@ GRANT DBA TO SA SET SCHEMA SYSTEM_LOBS INSERT INTO BLOCKS VALUES(0,2147483647,0) SET SCHEMA PUBLIC +INSERT INTO "mendixsystem$entity" VALUES('0ab9d4f4-ef25-43c5-9291-8ef27e0062f9','TestSuite.Color','testsuite$color',NULL) INSERT INTO "mendixsystem$entity" VALUES('170ce49d-f29c-4fac-99a6-b55e8a3aeb39','System.FileDocument','system$filedocument',NULL) INSERT INTO "mendixsystem$entity" VALUES('282e2e60-88a5-469d-84a5-ba8d9151644f','System.User','system$user',NULL) INSERT INTO "mendixsystem$entity" VALUES('3078a23e-13b2-4a9b-84e4-2881fdee53c6','Administration.Account','administration$account','282e2e60-88a5-469d-84a5-ba8d9151644f') INSERT INTO "mendixsystem$entity" VALUES('37827192-315d-4ab6-85b8-f626f866ea76','System.Image','system$image','170ce49d-f29c-4fac-99a6-b55e8a3aeb39') INSERT INTO "mendixsystem$entity" VALUES('37f9fd49-5318-4c63-9a51-f761779b202f','System.Session','system$session',NULL) INSERT INTO "mendixsystem$entity" VALUES('3b6f5ca3-28d6-4581-b26e-7ce5bd0e6eeb','System.PrivateFileDocument','system$privatefiledocument','170ce49d-f29c-4fac-99a6-b55e8a3aeb39') +INSERT INTO "mendixsystem$entity" VALUES('4923ae57-6e7f-45e2-9b01-6d6b6eea265a','TestSuite.Entity_3','testsuite$entity_3',NULL) INSERT INTO "mendixsystem$entity" VALUES('4babd4c0-b903-4cb4-b1af-e59c4a5fcf3d','System.Thumbnail','system$thumbnail','170ce49d-f29c-4fac-99a6-b55e8a3aeb39') INSERT INTO "mendixsystem$entity" VALUES('685df5a6-1e02-49bb-a0b5-5a55c5e8313d','System.ScheduledEventInformation','system$scheduledeventinformation',NULL) INSERT INTO "mendixsystem$entity" VALUES('76805df3-dede-435f-92a6-d6525c68a693','System.Language','system$language',NULL) +INSERT INTO "mendixsystem$entity" VALUES('774c68d7-d12c-49c6-a095-f6d4848d2bca','TestSuite.Entity_2','testsuite$entity_2',NULL) INSERT INTO "mendixsystem$entity" VALUES('7f7c72af-1ab7-4bf9-bed6-16db5c8fcf6f','System.TimeZone','system$timezone',NULL) INSERT INTO "mendixsystem$entity" VALUES('92ef30a6-de04-423c-84fd-a21e9b9eeae2','System.UserRole','system$userrole',NULL) INSERT INTO "mendixsystem$entity" VALUES('d4154981-8dac-4150-aec5-efa3ef62a7a2','System.XASInstance','system$xasinstance',NULL) +INSERT INTO "mendixsystem$entity" VALUES('dcb65bb6-718e-4bca-bb34-ff9ee119136b','TestSuite.Entity','testsuite$entity',NULL) INSERT INTO "mendixsystem$entity" VALUES('efabe590-d3e2-4b24-9c39-836a367d217f','System.Statistics','system$statistics',NULL) INSERT INTO "mendixsystem$attribute" VALUES('040db5be-7810-48b3-a569-516191e8803d','282e2e60-88a5-469d-84a5-ba8d9151644f','LastLogin','lastlogin',20,200,'',FALSE) INSERT INTO "mendixsystem$attribute" VALUES('0c2b42ef-02bd-3783-bf55-02a92f4275c7','37f9fd49-5318-4c63-9a51-f761779b202f','createdDate','createddate',20,0,'',FALSE) @@ -131,12 +145,17 @@ INSERT INTO "mendixsystem$attribute" VALUES('42eb180e-36df-4325-8b97-dec1e16f0e9 INSERT INTO "mendixsystem$attribute" VALUES('4359850e-675d-49db-a25c-d78ee530dc33','d4154981-8dac-4150-aec5-efa3ef62a7a2','PartnerName','partnername',30,200,'',FALSE) INSERT INTO "mendixsystem$attribute" VALUES('444cda15-e7f4-43e7-a8d3-69c06081d868','efabe590-d3e2-4b24-9c39-836a367d217f','LastUpdate','lastupdate',20,200,'',FALSE) INSERT INTO "mendixsystem$attribute" VALUES('4c9627fb-3b64-4239-95eb-f51fb8d3f2b3','170ce49d-f29c-4fac-99a6-b55e8a3aeb39','HasContents','hascontents',10,200,'false',FALSE) +INSERT INTO "mendixsystem$attribute" VALUES('4dd195b6-c5a5-4167-9c6b-668fcb99e530','0ab9d4f4-ef25-43c5-9291-8ef27e0062f9','RangeMax','rangemax',5,200,'0',FALSE) +INSERT INTO "mendixsystem$attribute" VALUES('54557d58-e2ca-4fb1-9cd4-16683e1e8a1b','0ab9d4f4-ef25-43c5-9291-8ef27e0062f9','ColorCode','colorcode',30,200,'#FF7514',FALSE) INSERT INTO "mendixsystem$attribute" VALUES('5fecca4d-0f28-484d-9fe7-1afde250b07d','170ce49d-f29c-4fac-99a6-b55e8a3aeb39','DeleteAfterDownload','deleteafterdownload',10,200,'false',FALSE) +INSERT INTO "mendixsystem$attribute" VALUES('5fffc892-a0c1-4712-a812-eb1256660861','0ab9d4f4-ef25-43c5-9291-8ef27e0062f9','RangeMin','rangemin',5,200,'0',FALSE) INSERT INTO "mendixsystem$attribute" VALUES('651e7007-7fcd-43b3-a918-a0de81de34bf','685df5a6-1e02-49bb-a0b5-5a55c5e8313d','StartTime','starttime',20,200,'',FALSE) INSERT INTO "mendixsystem$attribute" VALUES('65b02632-d981-3a1c-8ec5-2a36fe6fd7d8','d4154981-8dac-4150-aec5-efa3ef62a7a2','createdDate','createddate',20,0,'',FALSE) INSERT INTO "mendixsystem$attribute" VALUES('69acb4a2-be26-4cc5-902a-a8591d357510','282e2e60-88a5-469d-84a5-ba8d9151644f','Name','name',30,100,'',FALSE) INSERT INTO "mendixsystem$attribute" VALUES('6abafab4-6a96-46c0-9475-b72cc4d3ffd6','7f7c72af-1ab7-4bf9-bed6-16db5c8fcf6f','Code','code',30,50,'',FALSE) INSERT INTO "mendixsystem$attribute" VALUES('6d2a7545-4e52-4c5d-ac02-0b8211d0585f','685df5a6-1e02-49bb-a0b5-5a55c5e8313d','Status','status',40,200,'',FALSE) +INSERT INTO "mendixsystem$attribute" VALUES('6daf0494-c79c-4964-95a1-bed51236ee4f','0ab9d4f4-ef25-43c5-9291-8ef27e0062f9','IsPrimary','isprimary',10,200,'false',FALSE) +INSERT INTO "mendixsystem$attribute" VALUES('6ed9bbed-84c3-4189-bedf-0e82f1b99c11','0ab9d4f4-ef25-43c5-9291-8ef27e0062f9','Name','name',30,200,'Pastel orange',FALSE) INSERT INTO "mendixsystem$attribute" VALUES('7ca1bcd3-9355-472f-9e3f-4440366297d6','d4154981-8dac-4150-aec5-efa3ef62a7a2','CustomerName','customername',30,200,'',FALSE) INSERT INTO "mendixsystem$attribute" VALUES('84845531-dbd9-4e00-8afb-c2adc08699bb','282e2e60-88a5-469d-84a5-ba8d9151644f','FailedLogins','failedlogins',3,200,'0',FALSE) INSERT INTO "mendixsystem$attribute" VALUES('8655b482-0ac3-31db-8289-b05f505b77cb','170ce49d-f29c-4fac-99a6-b55e8a3aeb39','createdDate','createddate',20,0,'',FALSE) @@ -148,6 +167,7 @@ INSERT INTO "mendixsystem$attribute" VALUES('96445370-6fed-11e4-9803-0800200c9a6 INSERT INTO "mendixsystem$attribute" VALUES('9c09d4eb-9c9c-303e-951e-8c3ea32db37a','282e2e60-88a5-469d-84a5-ba8d9151644f','createdDate','createddate',20,0,'',FALSE) INSERT INTO "mendixsystem$attribute" VALUES('a02027b1-e24d-49fc-9b3f-ade644070879','170ce49d-f29c-4fac-99a6-b55e8a3aeb39','__FileName__','__filename__',0,200,'1',TRUE) INSERT INTO "mendixsystem$attribute" VALUES('a33fbc53-ecf5-46c5-bad2-a364686e19dc','92ef30a6-de04-423c-84fd-a21e9b9eeae2','Description','description',30,1000,'',FALSE) +INSERT INTO "mendixsystem$attribute" VALUES('a40a0209-9195-4c1c-a3d5-6d39c50d30c8','0ab9d4f4-ef25-43c5-9291-8ef27e0062f9','RAL','ral',3,200,'2003',FALSE) INSERT INTO "mendixsystem$attribute" VALUES('b22d0982-fbee-43a7-8d20-c200d319a3e5','282e2e60-88a5-469d-84a5-ba8d9151644f','Active','active',10,200,'true',FALSE) INSERT INTO "mendixsystem$attribute" VALUES('b51ea62a-1838-3f74-9c5f-07b5b5a92a45','170ce49d-f29c-4fac-99a6-b55e8a3aeb39','submetaobjectname','submetaobjectname',30,255,'System.FileDocument',FALSE) INSERT INTO "mendixsystem$attribute" VALUES('c2dd7e10-28b4-304c-9ddf-104be6be9cde','282e2e60-88a5-469d-84a5-ba8d9151644f','submetaobjectname','submetaobjectname',30,255,'System.User',FALSE) @@ -182,41 +202,50 @@ INSERT INTO "mendixsystem$association" VALUES('07738295-23fe-3fc1-832b-ed18b2272 INSERT INTO "mendixsystem$association" VALUES('1442c9da-d4ae-3cf5-b3c0-6c878743e4e5','System.owner','system$owner','170ce49d-f29c-4fac-99a6-b55e8a3aeb39','282e2e60-88a5-469d-84a5-ba8d9151644f','id','system$owner',NULL,NULL) INSERT INTO "mendixsystem$association" VALUES('1adca745-c7a9-44ff-92bb-5d41cb2a1743','System.grantableRoles','system$grantableroles','92ef30a6-de04-423c-84fd-a21e9b9eeae2','92ef30a6-de04-423c-84fd-a21e9b9eeae2','system$userroleid1','system$userroleid2',NULL,'idx_system$grantableroles_system$userrole_system$userrole') INSERT INTO "mendixsystem$association" VALUES('3dbea779-c8af-467e-a957-140c313ac1b7','System.Thumbnail_Image','system$thumbnail_image','4babd4c0-b903-4cb4-b1af-e59c4a5fcf3d','37827192-315d-4ab6-85b8-f626f866ea76','system$thumbnailid','system$imageid',NULL,'idx_system$thumbnail_image_system$image_system$thumbnail') +INSERT INTO "mendixsystem$association" VALUES('47cca560-cd85-40ba-8f9f-87e7c93ba180','TestSuite.Color_Entity','testsuite$color_entity','0ab9d4f4-ef25-43c5-9291-8ef27e0062f9','dcb65bb6-718e-4bca-bb34-ff9ee119136b','testsuite$colorid','testsuite$entityid',NULL,'idx_testsuite$color_entity_testsuite$entity_testsuite$color') INSERT INTO "mendixsystem$association" VALUES('546aaff5-62e1-40ce-ab45-d40d0a0478f1','System.Session_User','system$session_user','37f9fd49-5318-4c63-9a51-f761779b202f','282e2e60-88a5-469d-84a5-ba8d9151644f','system$sessionid','system$userid',NULL,'idx_system$session_user_system$user_system$session') INSERT INTO "mendixsystem$association" VALUES('6013226d-aeae-3cd2-acec-d95d8bd5c3ad','System.changedBy','system$changedby','282e2e60-88a5-469d-84a5-ba8d9151644f','282e2e60-88a5-469d-84a5-ba8d9151644f','id','system$changedby',NULL,NULL) INSERT INTO "mendixsystem$association" VALUES('6adaf137-4299-435e-9475-a871a4f21471','System.UserRoles','system$userroles','282e2e60-88a5-469d-84a5-ba8d9151644f','92ef30a6-de04-423c-84fd-a21e9b9eeae2','system$userid','system$userroleid',NULL,'idx_system$userroles_system$userrole_system$user') INSERT INTO "mendixsystem$association" VALUES('956c1382-b9fc-3367-b0b2-cb67ee9ef13f','System.changedBy','system$changedby','170ce49d-f29c-4fac-99a6-b55e8a3aeb39','282e2e60-88a5-469d-84a5-ba8d9151644f','id','system$changedby',NULL,NULL) +INSERT INTO "mendixsystem$association" VALUES('9c90205c-5e6b-4be3-a7ee-b5ffcd7f5789','TestSuite.Entity_2_Color','testsuite$entity_2_color','774c68d7-d12c-49c6-a095-f6d4848d2bca','0ab9d4f4-ef25-43c5-9291-8ef27e0062f9','testsuite$entity_2id','testsuite$colorid',NULL,'idx_testsuite$entity_2_color_testsuite$color_testsuite$entity_2') INSERT INTO "mendixsystem$association" VALUES('bab4a1ab-7d40-47d5-8f21-fc99d089211d','System.User_TimeZone','system$user_timezone','282e2e60-88a5-469d-84a5-ba8d9151644f','7f7c72af-1ab7-4bf9-bed6-16db5c8fcf6f','system$userid','system$timezoneid',NULL,'idx_system$user_timezone_system$timezone_system$user') +INSERT INTO "mendixsystem$association" VALUES('c964bfa6-d806-4a78-9dc6-0b7722912ea5','TestSuite.Entity_3_Color','testsuite$entity_3_color','4923ae57-6e7f-45e2-9b01-6d6b6eea265a','0ab9d4f4-ef25-43c5-9291-8ef27e0062f9','testsuite$entity_3id','testsuite$colorid',NULL,'idx_testsuite$entity_3_color_testsuite$color_testsuite$entity_3') INSERT INTO "mendixsystem$association" VALUES('d9eb2a5f-b448-4a73-b179-4141ab51e622','System.ClusterManager','system$clustermanager','efabe590-d3e2-4b24-9c39-836a367d217f','d4154981-8dac-4150-aec5-efa3ef62a7a2','system$statisticsid','system$xasinstanceid',NULL,'idx_system$clustermanager_system$xasinstance_system$statistics') -INSERT INTO "mendixsystem$version" VALUES('4.0.7','2016-10-28 13:47:48.564000','2.0.1','unversioned','Test') +INSERT INTO "mendixsystem$version" VALUES('4.0.7','2016-11-14 15:07:28.098000','2.0.1','unversioned','Test') INSERT INTO "mendixsystem$sequence" VALUES('system$filedocument_fileid_mxseq','0f81688b-e719-4204-8f86-8fcd664a0992',1,0) INSERT INTO "mendixsystem$sequence" VALUES('system$filedocument___filename___mxseq','a02027b1-e24d-49fc-9b3f-ade644070879',1,0) -INSERT INTO "mendixsystem$entityidentifier" VALUES('0ab9d4f4-ef25-43c5-9291-8ef27e0062f9',13,1001) +INSERT INTO "mendixsystem$entityidentifier" VALUES('0ab9d4f4-ef25-43c5-9291-8ef27e0062f9',13,3101) INSERT INTO "mendixsystem$entityidentifier" VALUES('170ce49d-f29c-4fac-99a6-b55e8a3aeb39',1,1) -INSERT INTO "mendixsystem$entityidentifier" VALUES('282e2e60-88a5-469d-84a5-ba8d9151644f',2,1201) +INSERT INTO "mendixsystem$entityidentifier" VALUES('282e2e60-88a5-469d-84a5-ba8d9151644f',2,3301) INSERT INTO "mendixsystem$entityidentifier" VALUES('3078a23e-13b2-4a9b-84e4-2881fdee53c6',15,1) INSERT INTO "mendixsystem$entityidentifier" VALUES('37827192-315d-4ab6-85b8-f626f866ea76',14,1) INSERT INTO "mendixsystem$entityidentifier" VALUES('37f9fd49-5318-4c63-9a51-f761779b202f',12,1) INSERT INTO "mendixsystem$entityidentifier" VALUES('3b6f5ca3-28d6-4581-b26e-7ce5bd0e6eeb',8,1) +INSERT INTO "mendixsystem$entityidentifier" VALUES('4923ae57-6e7f-45e2-9b01-6d6b6eea265a',20,1) INSERT INTO "mendixsystem$entityidentifier" VALUES('4babd4c0-b903-4cb4-b1af-e59c4a5fcf3d',4,1) INSERT INTO "mendixsystem$entityidentifier" VALUES('4beaee07-595a-4371-bbe4-7d86875f0ebb',6,1) INSERT INTO "mendixsystem$entityidentifier" VALUES('685df5a6-1e02-49bb-a0b5-5a55c5e8313d',5,1) INSERT INTO "mendixsystem$entityidentifier" VALUES('761a7054-7794-4799-8986-2e6cd68a53fd',17,1) INSERT INTO "mendixsystem$entityidentifier" VALUES('76805df3-dede-435f-92a6-d6525c68a693',16,101) +INSERT INTO "mendixsystem$entityidentifier" VALUES('774c68d7-d12c-49c6-a095-f6d4848d2bca',18,1) INSERT INTO "mendixsystem$entityidentifier" VALUES('7f7c72af-1ab7-4bf9-bed6-16db5c8fcf6f',9,601) INSERT INTO "mendixsystem$entityidentifier" VALUES('92ef30a6-de04-423c-84fd-a21e9b9eeae2',11,101) INSERT INTO "mendixsystem$entityidentifier" VALUES('ce3860ff-2093-42cd-b462-8da7485fc01e',7,1) -INSERT INTO "mendixsystem$entityidentifier" VALUES('d4154981-8dac-4150-aec5-efa3ef62a7a2',3,1201) +INSERT INTO "mendixsystem$entityidentifier" VALUES('d4154981-8dac-4150-aec5-efa3ef62a7a2',3,3401) +INSERT INTO "mendixsystem$entityidentifier" VALUES('dcb65bb6-718e-4bca-bb34-ff9ee119136b',19,1) INSERT INTO "mendixsystem$entityidentifier" VALUES('efabe590-d3e2-4b24-9c39-836a367d217f',10,101) INSERT INTO "system$user" VALUES(562949953421613,'2016-10-28 19:27:52.225000',TRUE,'2016-10-28 19:27:52.225000','2016-10-28 19:27:52.379000',FALSE,TRUE,0,FALSE,'Anonymous_0303fd94-3540-4d85-b0cc-1397d8f716ed','{BCrypt}$2a$10$YUKLgLGIg7XJwVRyUV9JkOWZG7oWJFdrPU3fHyNZ6pWzOK49aVNJe','System.User',562949953421613,NULL) INSERT INTO "system$user" VALUES(562949953421614,'2016-10-28 19:29:22.871000',TRUE,'2016-10-28 19:29:22.871000','2016-10-28 19:29:22.992000',FALSE,TRUE,0,FALSE,'Anonymous_e2ddb133-2f64-4812-a4a3-f7a73fc9edd6','{BCrypt}$2a$10$6WH.lhs226rAST4u.d57f..i5eKa8isYoD6/KbaZ6xIvbUEeQEgL.','System.User',562949953421614,NULL) INSERT INTO "system$user" VALUES(562949953422013,'2016-10-31 15:49:17.100000',TRUE,'2016-10-31 15:49:17.100000','2016-10-31 15:49:17.267000',FALSE,TRUE,0,FALSE,'Anonymous_acb18273-2fbb-4d87-b46c-e3a77db7dd44','{BCrypt}$2a$10$iUa97/xn7xQCmuecjiuZc.twJhs91vO3UUqu0bWd9eyjZGnvuzk3u','System.User',562949953422013,NULL) +INSERT INTO "system$user" VALUES(562949953423113,'2016-11-14 22:45:25.525000',TRUE,'2016-11-14 22:45:25.525000','2016-11-14 22:45:25.706000',FALSE,TRUE,0,FALSE,'Anonymous_9d26a5c9-9800-4a5f-9fd8-8ba29fc8320b','{BCrypt}$2a$10$Hf015ZQAHxQED.a4UWTIe.njrw9wuj5xoFnTgxy128vpa0eAmd/ny','System.User',562949953423113,NULL) INSERT INTO "system$user_language" VALUES(562949953421613,4503599627370497) INSERT INTO "system$user_language" VALUES(562949953421614,4503599627370497) INSERT INTO "system$user_language" VALUES(562949953422013,4503599627370497) +INSERT INTO "system$user_language" VALUES(562949953423113,4503599627370497) INSERT INTO "system$userroles" VALUES(562949953421613,3096224743817217) INSERT INTO "system$userroles" VALUES(562949953421614,3096224743817217) INSERT INTO "system$userroles" VALUES(562949953422013,3096224743817217) +INSERT INTO "system$userroles" VALUES(562949953423113,3096224743817217) INSERT INTO "system$timezone" VALUES(2533274790395905,'(GMT+00:00) Abidjan',0,'Africa/Abidjan') INSERT INTO "system$timezone" VALUES(2533274790395906,'(GMT+00:00) Accra',0,'Africa/Accra') INSERT INTO "system$timezone" VALUES(2533274790395907,'(GMT+03:00) Addis Ababa',10800000,'Africa/Addis_Ababa') @@ -721,7 +750,7 @@ INSERT INTO "system$timezone" VALUES(2533274790396405,'(GMT-07:00) Mountain',-25 INSERT INTO "system$timezone" VALUES(2533274790396406,'(GMT-08:00) Pacific',-28800000,'US/Pacific') INSERT INTO "system$timezone" VALUES(2533274790396407,'(GMT-08:00) Pacific-New',-28800000,'US/Pacific-New') INSERT INTO "system$timezone" VALUES(2533274790396408,'(GMT-11:00) Samoa',-39600000,'US/Samoa') -INSERT INTO "system$statistics" VALUES(2814749767106561,'2016-10-28 17:47:49.753000','2016-11-01 15:27:24.950000',2,0,0) +INSERT INTO "system$statistics" VALUES(2814749767106561,'2016-10-28 17:47:49.753000','2016-11-15 21:18:01.315000',2,0,0) INSERT INTO "system$userrole" VALUES(3096224743817217,'8dd52bfa-6d7e-453b-b506-303c0a3d9567','','Administrator') INSERT INTO "system$userrole" VALUES(3096224743817218,'53f5d6fa-6da9-4a71-b011-454ec052cce8','','User') INSERT INTO "system$grantableroles" VALUES(3096224743817217,3096224743817217) diff --git a/test/deployment/data/security.policy b/test/deployment/data/security.policy index 003d441..4f074cc 100644 --- a/test/deployment/data/security.policy +++ b/test/deployment/data/security.policy @@ -14,9 +14,9 @@ ALLOW { (java.lang.RuntimePermission "modifyThread" "") (java.lang.RuntimePermission "setContextClassLoader") (java.lang.RuntimePermission "setFactory") - (java.io.FilePermission "C:/Users/mch/Desktop/Widgeting/Handles/test/deployment/data/tmp/-" "read,write,delete,execute") - (java.io.FilePermission "C:/Users/mch/Desktop/Widgeting/Handles/test/deployment/model/resources/-" "read") - (java.io.FilePermission "C:/Users/mch/Desktop/Widgeting/Handles/test/deployment/model/lib/-" "read") + (java.io.FilePermission "C:/Users/mch/Documents/GitHub/Handles/test/deployment/data/tmp/-" "read,write,delete,execute") + (java.io.FilePermission "C:/Users/mch/Documents/GitHub/Handles/test/deployment/model/resources/-" "read") + (java.io.FilePermission "C:/Users/mch/Documents/GitHub/Handles/test/deployment/model/lib/-" "read") (java.net.NetPermission "getProxySelector" "") (java.net.NetPermission "specifyStreamHandler" "") (java.security.SecurityPermission "insertProvider.BC" "") diff --git a/test/deployment/log/build_core_compile_log.txt b/test/deployment/log/build_core_compile_log.txt index 692df8b..847ee99 100644 --- a/test/deployment/log/build_core_compile_log.txt +++ b/test/deployment/log/build_core_compile_log.txt @@ -1,8 +1,8 @@ -Buildfile: C:\Users\mch\Desktop\Widgeting\Handles\test\deployment\build_core.xml +Buildfile: C:\Users\mch\Documents\GitHub\Handles\test\deployment\build_core.xml compile: - [javac] Compiling 2 source files to C:\Users\mch\Desktop\Widgeting\Handles\test\deployment\run\bin - [javac] Note: C:\Users\mch\Desktop\Widgeting\Handles\test\javasource\com\mendix\core\Core.java uses unchecked or unsafe operations. + [javac] Compiling 2 source files to C:\Users\mch\Documents\GitHub\Handles\test\deployment\run\bin + [javac] Note: C:\Users\mch\Documents\GitHub\Handles\test\javasource\com\mendix\core\Core.java uses unchecked or unsafe operations. [javac] Note: Recompile with -Xlint:unchecked for details. build: @@ -12,10 +12,10 @@ build: [bnd] Use Import/Export Package directive -split-package:=(merge-first|merge-last|error|first) to get rid of this warning [bnd] Package found in [Jar:mxruntime, Jar:run] [bnd] Class path [Jar:biz.aQute.bnd.annotation, Jar:org.scala-lang.scala-library, Jar:datastorage-api, Jar:json, Jar:logging, Jar:m2ee-api, Jar:mxruntime, Jar:integration, Jar:osgi.cmpn, Jar:webui, Jar:javax.servlet, Jar:run] - [bnd] # project (project.jar) 42 + [bnd] # project (project.jar) 47 BUILD SUCCESSFUL -Total time: 1 second +Total time: 2 seconds diff --git a/test/deployment/log/build_core_deploy_log.txt b/test/deployment/log/build_core_deploy_log.txt index 6a242c7..364f50b 100644 --- a/test/deployment/log/build_core_deploy_log.txt +++ b/test/deployment/log/build_core_deploy_log.txt @@ -1,7 +1,7 @@ -Buildfile: C:\Users\mch\Desktop\Widgeting\Handles\test\deployment\build_core.xml +Buildfile: C:\Users\mch\Documents\GitHub\Handles\test\deployment\build_core.xml deploy: - [unzip] Expanding: C:\Program Files\Mendix\5.19.0\modeler\deployment.mxz into C:\Users\mch\Desktop\Widgeting\Handles\test\deployment + [unzip] Expanding: C:\Program Files\Mendix\5.19.0\modeler\deployment.mxz into C:\Users\mch\Documents\GitHub\Handles\test\deployment BUILD SUCCESSFUL Total time: 0 seconds diff --git a/test/deployment/log/m2ee_log.txt b/test/deployment/log/m2ee_log.txt index 6971a9f..e7db904 100644 --- a/test/deployment/log/m2ee_log.txt +++ b/test/deployment/log/m2ee_log.txt @@ -1,4 +1 @@ ShellTUI: Unable to read from stdin...exiting. - --> - diff --git a/test/deployment/model/bundles/i18n.jar b/test/deployment/model/bundles/i18n.jar index 4ca2668681c70f852239ed7ee135e06abf487729..b64efa4f720a193492f54fd6b9191f14ce2d7dd3 100644 GIT binary patch delta 331 zcmZ26mubaZCf)#VW)=|!1_llW$(sC$ye4ALn=13`?JqIv2eEDGvxCta!)slcfhs0n zceN7xw-Tacmnb_}354DlUhT@t05WFs@@_TN9Hk1dIWXEqodc{G#lp#-x(&r(DqwW$ z9FWS%mOW>{HgfbjsbhE4CB^`6MkZYbxces;_IjvecO9}?h$A2LnyAC9gwY5`qMB>n LXOGL76Z#|ot!Qr2 delta 331 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 delta 3956 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 ULlE=PX4SvbnTLTPb%7 diff --git a/test/deployment/model/model.mdp b/test/deployment/model/model.mdp index cf986a14123ca392ccaad9da580e461195812778..0695b787ef81d38654e3b765a7a75d34afc5ba1e 100644 GIT binary patch delta 5663 zcma);c_38l8^_1s80#EK$i76;Wvqi1X3PvT#&)HJvV~IO7NV{!F-3?vblRmTTPVYX zgedKsO8a(Og(S2ozhh3hq$gp}Puf1fRTTzbJ0+(BqH_(&o zR8aoq{0`Xu6umiLBglT1lpm~nP>c&c=1Lw@OV@VUdQUYm(ICyaMz@g1221wMdf;(h zf|F?(n6b#saV->dLKXVskSTaL&iTfylxCOx^6$6po0(VvnP;m)EB?}e9N*ppH@;SC z>#MhC@Tt(v;Bwt`B+C+7(xVK%Q#r7(+i5c`=UIW(0$nly1yxa?hCErQsmB}q{Aq(4 zL=*z16p63;=5=Ro8+i1QpI zcn*@a4nX%hB7ZV$vL4_NsS0r1dY}r@xfUhJ{}U*a(iJx+oEIYyBn{XM0!Tpqj%QF0 z6+KAd9;2?0r_@pA{MdyK6tGbN?E1Dl#s2$LN8S~QWfAu#J%SW(7ej6D1Hd}Jx(8cV zUvO=-8r}a?O=%@W8&>j|7aASo9UC4KYRZg^36EJvAo@hEjtz2_*$sK!FdZnEd=fAc$LHz>B`bHI((7b1E`A=QwH4 zL)HXvsP2$J)>PA#uUBrh!L8I`9K4`XpPdx>jJZc_)yl|jLti}Datu882iOwXx&$pc zI%;WnP)vAKWHdnrKzgANMkX9WbhFjUFKy3U8&z|+B`KP`9iI%p+LZW9w;wQg);Fk6 z)7uC?C&L7Lfs)QXKkqiM_>wd4a)V<|!RA-zXB8$xJs)R*g6qxOm*0(WZ`SVW=kD9^ zP&h>}B~MDm%PA@%YE8h83&LHVJhFoc5d>tI2t?6g`VI7IG%V@x$nDtisHD|@aJ>7^ zjK;?|YxqDao|K)n5uXglu(t?b!?rpF`LiCz2U}{K@ z*f9*S2!J(H0TpZV`1B!5!kr)&V1e0!Ro8hlleq^WgLS~Rf1$wfo?(S2@)=L5paTc4fA0_~bnt4Q6e$HZa>F^8{VDeW=)r7NeeQTz+QuZ z8SMWaumUgm`dh7DRKTp&o~%#yzE_GSP>$b`)c8Dy&fhR3+m|a|Kb~L!a|QqqtlZQ( z;7NM!lv>uyTfAb#7|qg^X;BfJl4NCnWF66XV!sZ}>Ki~XWy^P(a11uMmv>6Ol;wjA zxMecZ*UY5p(#6!XZW&cKCcEhPz8OoH2jBkyD1!1@rnId&XSk`d{l_}P{+x;?%-4%2 z6lZF&_vV-{-)Ly@K$xH_ZjCvGZiT@JMac);v@i2p?9S{nL)&BZbDt~5xiK3Qoh&(g zoAtu>WJ$>R(W9awLW3e<^8r9j$A)lz!jUfj%b#*xaE5l+tiX{YGq-H47*#8JLQE@g z(m&mMKj+9thuH;8nM`46vK$h_jEr3sx<>ebq2;NV@(Q=BO18zBi-CV)9P2826bkPLyffyBad(jn zi;Zmkg8$(t>@dZGdSAa3FHEQJYYZ{&?g+C(i`@m+?Qd|+XKz%noHBBJXqB+o*mO

(|}rnww+V@z{Gwn%y?& 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 HSi0@Mq%d6a diff --git a/test/deployment/run/bin/testsuite/proxies/Color$MemberNames.class b/test/deployment/run/bin/testsuite/proxies/Color$MemberNames.class index 403c612a90499e9120fd6cff051f3729d3be7de9..e756be0feacef389de5682860f808d1cd09ce165 100644 GIT binary patch delta 680 zcmY+BOHUI~6vzK}X4<(OZkn+PeL|nK6|juT!?zZ(%0m$-F3P5vMMH{E5-ldO;UgF` zpTMO{AcRB{wZ3lO7 z*T$HQx`Pa6IoxMuPGZO*KH#Duk!L=XC@>#M6q)l9CFX*}2y;=QEV0DtV~L8y6Hb?H zJQc8({hf|@+uhHqx!vvE7wtx`-|fE^i2hC5lWo0z`2DlEFv^a`6jrcmV@;qG%$kYd zs}Vi$&{VjBb%iP}a&}c=2swp3hXRKphZ2Vom$l+q=M{sWfO^$}wl!SlGf|inD|EJs0h%yL zl|esTU>Y;J$2%)tIO|@6#5G)Jg?9cVAN-vJ->i+|M_8@cpc{_GPZ2prLf1*xj-_;+ zc4aUXs%Bem_y~z+%e9Y?ZXQD%QU?K^Q9&el9?Fd8u|cusm$xif=7ohT-0L8 zBd1*U$SYSo3d)8@QMu|-Qm(nIpB^4JL*v(N`w0UK<(Y{lvsy7scI^>WYUE}^utKl)i=y&g(JWtn2 syl?NBX(xWQE9oZ2Z(<2IE;{+%tR#P>jWI3`lL@jyUv9FPp|cTw0$O}C9smFU diff --git a/test/deployment/run/bin/testsuite/proxies/Color.class b/test/deployment/run/bin/testsuite/proxies/Color.class index 5a87741332a671e66e46f3189483736135a6baa7..322530a10685c45cb5e4bc951f1b177dc63c9da5 100644 GIT binary patch literal 9343 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 diff --git a/test/deployment/run/bin/testsuite/proxies/Entity.class b/test/deployment/run/bin/testsuite/proxies/Entity.class new file mode 100644 index 0000000000000000000000000000000000000000..9e797baf676b7bc959dc63ad64999d414caad066 GIT binary patch literal 4319 zcmcInX?GK46n>^nJ0YDG2s;!=D{7mxjUb>bqNSjuwna%P6x^oC+jJmJN-}{KQ53`- zcSYQnbMy-z^c?A8kIE-K$3Nl!@En)t&ZH!5K^qQy$oszY&fV{G@16Yq_m4jV*od#a zIOsz!4*5`n!#*_PF&&S4@q`Z*c(Mw$cuHQIUi8f)MNF2s&?+7M@+Kh<13D}p77FhX z9~R*;FOJHdlx0xJQdLM}s0zoBktM6cmYbY#9~XiXvJ8s>BeI+n)hFfjv=^u3;h8Et zi_;?TIUUby@T-(<*(04Q6}N`>_8n0%Tf@eVSb8u#=-h>~BUxJwp0MJ|O4%yYZ^l$M z97|_ZI8w~DO@kgwlVX?x!gCbR<}#4i=i1R_4k{Yeal|}shLdJ05sum!E0rKcHHovf znX-G#WR66Y+pUyk@6fQJp+s$sJsLc1={SYV@32y;D>vAuGTmlhk~jUON}HqdX|WOu zs-w0UJKAXuIf{t`9cP$NhC=+Z%%pXa=A6By=0xHW_I^ucwl#LxDr;wRmaW1=ne?#5 zEbn%(A=%kI98*KK#SG{;%jaEcD5GMgt>PM1?8}jEQ1w_@iy>@HrP8+P&}vv(l*s}Q zC7!;eez`#YZ=XELv`OouB^xpen~koMIonExJFKj|O~(s5&S{tzwGt`Q&SjX$^v&0^ z{rV}}!4OxnhzBhKs=Pt)RvA}GWz&-R31t_fQN!kj#v4H~aX?Y|8rHCW&Qc0xU#X7e z%w$%>l7=FrOr`IT2Je8G9dK)vZbaB*sIq%xh<+@lzFE0&2_D)X*+uK3>0BnJ9<-#c zt6VU*2#1CR-2{77z~18C>v++?OL*D9dTf$~s_F~UBgv#nn90^mBFDC9Uo8g>f$jkn zNLa^JDv);CXCP)u1qAw3AeBodTSV9^2BPRT@G4%@5S+zfWdp)t24-4iAc&BGCNvw^ z3FdV9^@`NM>o{*?2?! zyPh=gDL&Kjxq&b6rGYo_6|+`w!G(y1=DC@06{M?+=$#?f#z|I`&YD8(+_3oz7ZHv> z(@ryDi?1bx7_;07Ww9}8IB_#7zDUvB2l2FG$`4R!0fv>0=K9)_W;VOGU&EcnHJ2xw zT~Up!LSII446EZR!jAcA$$pjM#I%uA3S+)$u+f=AL;Q3hHm>2{?3R%)0~VLpPP@DbARnBYe+xkq5xisovvM*%UA+LubG0a=wAst{6E_%6XXHtFD?_ZpLZn z#akNCys{hY@QG4wJA5OPL?Y#tSt8J61DlGj^9AT!GPD&W5d3YO^PF*~ToIx;>PmrB zfs?4R(;ewl!kMP+8fqKbuMZ{E@q4_H{|w6Emk!R8Uz#}g6=*>i8t&q`jQaxq)?)+L zyLr<94{re@7z+8dag>dr{Cht0lboy1dAAHzSWY_5sXW&i>M7^@O~EmEntns|Br1CS zm1EF<@oP;J@M;*xypQttKDiGzT}D+fbQy+-FLT7#!^`t3imv5pHBDZF0M^ohI+|Qh zn%l6M6pK*y4_}t+xJSpmI<^4IFpr~W8(GDRH54dbR0c!isQ!*8*ZxZGU^KRK_3(Tj zcJKt;&!4<|fV;?P`qwA+L;;NT!ZlQ}2Dwb&0pzJT)u49*u z-G4H|h2T8s@IJ&pgnLNsy4c8Ff><5=fgl;hnsKZ>FcTr|kO5l|Bmy?%1>C{iiD~G1 z-1`{Q=rrzjs&_MT7vm%97mIq&PpIuJ7ctRs1ZG)rh(I|^HO zF|zV2A+LBfcTrqH#Z`rzx`?t!+KH}fkQy^dkCBMq8F|t;&5^=s2?f7Fh38V}SFEEy zbxd{LDC#dV=~qzGDK0kgH-X#AaH;$fIozDCB$$8`bZZzoPO`X95&X}v)K5FPC4BXD z)WwgQyv6``@xv=JN3l+16&J@jC-~iY>QxRc+lXJA>BxD$+K=u$a<_07v2{~`y`5kc d6%)8a!vyZsFp37Eccz#N*C;^^JrqR%{|nKuf9U`K literal 0 HcmV?d00001 diff --git a/test/deployment/run/bin/testsuite/proxies/Entity_2$MemberNames.class b/test/deployment/run/bin/testsuite/proxies/Entity_2$MemberNames.class new file mode 100644 index 0000000000000000000000000000000000000000..9533fc30d9c0a124701a77ef69b88c55cab5a6e2 GIT binary patch literal 1230 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 delta 3956 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 ULlE=PX4SvbnTLTPb%7 diff --git a/test/deployment/run/felixcache/bundle106/bundle.info b/test/deployment/run/felixcache/bundle106/bundle.info index e83512f..3e8887e 100644 --- a/test/deployment/run/felixcache/bundle106/bundle.info +++ b/test/deployment/run/felixcache/bundle106/bundle.info @@ -2,5 +2,5 @@ file:model/bundles/i18n.jar 2 2 -1478036225420 +1479241975466 0 diff --git a/test/deployment/run/felixcache/bundle106/version0.0/bundle.jar b/test/deployment/run/felixcache/bundle106/version0.0/bundle.jar index 4ca2668681c70f852239ed7ee135e06abf487729..b64efa4f720a193492f54fd6b9191f14ce2d7dd3 100644 GIT binary patch delta 331 zcmZ26mubaZCf)#VW)=|!1_llW$(sC$ye4ALn=13`?JqIv2eEDGvxCta!)slcfhs0n zceN7xw-Tacmnb_}354DlUhT@t05WFs@@_TN9Hk1dIWXEqodc{G#lp#-x(&r(DqwW$ z9FWS%mOW>{HgfbjsbhE4CB^`6MkZYbxces;_IjvecO9}?h$A2LnyAC9gwY5`qMB>n LXOGL76Z#|ot!Qr2 delta 331 zcmZ26mubaZCf)#VW)=|!1_lm>xjl&!c}>L3SL_n%FuBC|@7dwhEygf6k z>#kN}Zs#FNOiYh}l|bl?;nl9J3?O4BFYi`UO%~n;HU~!MUp)j?jAG&BPu+%MRaV$k zPPXhh1GbT)*GV0_qb@N9cr!BTGQizGxv Mendix 5 - - - - + + + +

@@ -17,11 +17,11 @@ isDebug: true, useCustomLogger: true, baseUrl: "mxclientsystem/dojo/", - cacheBust: "636136186170567001", + cacheBust: "636148207702740555", ltrRedirect: "index-console.html" }; - - + + diff --git a/test/deployment/web/index-console.html b/test/deployment/web/index-console.html index edfba44..aea3ca9 100644 --- a/test/deployment/web/index-console.html +++ b/test/deployment/web/index-console.html @@ -5,9 +5,9 @@ Mendix 5 - - - + + +
@@ -16,11 +16,11 @@ isDebug: true, useCustomLogger: true, baseUrl: "mxclientsystem/dojo/", - cacheBust: "636136186170567001", + cacheBust: "636148207702740555", rtlRedirect: "index-console-rtl.html" }; - - + + diff --git a/test/deployment/web/index-phone-preview.html b/test/deployment/web/index-phone-preview.html index 169d28f..567956b 100644 --- a/test/deployment/web/index-phone-preview.html +++ b/test/deployment/web/index-phone-preview.html @@ -3,7 +3,7 @@ Mendix 5 - Phone preview - +
diff --git a/test/deployment/web/index-rtl.html b/test/deployment/web/index-rtl.html index 31c890b..42d7565 100644 --- a/test/deployment/web/index-rtl.html +++ b/test/deployment/web/index-rtl.html @@ -5,20 +5,20 @@ Mendix 5 - - - - + + + +
- + diff --git a/test/deployment/web/index-tablet-preview.html b/test/deployment/web/index-tablet-preview.html index 82430a6..7e155df 100644 --- a/test/deployment/web/index-tablet-preview.html +++ b/test/deployment/web/index-tablet-preview.html @@ -3,7 +3,7 @@ Mendix 5 - Tablet preview - +
diff --git a/test/deployment/web/index.html b/test/deployment/web/index.html index 7c90f75..7d02159 100644 --- a/test/deployment/web/index.html +++ b/test/deployment/web/index.html @@ -5,19 +5,19 @@ Mendix 5 - - - + + +
- + diff --git a/test/deployment/web/login.html b/test/deployment/web/login.html index ac8299f..d7df5ef 100644 --- a/test/deployment/web/login.html +++ b/test/deployment/web/login.html @@ -5,8 +5,8 @@ Mendix 5 - Login - - + + - - + + diff --git a/test/deployment/web/pages/en_US/Administration/Account_Edit.page.xml b/test/deployment/web/pages/en_US/Administration/Account_Edit.page.xml index 4dc6cfe..302b25a 100644 --- a/test/deployment/web/pages/en_US/Administration/Account_Edit.page.xml +++ b/test/deployment/web/pages/en_US/Administration/Account_Edit.page.xml @@ -1 +1 @@ -
 \ No newline at end of file +
 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/Administration/Account_New.page.xml b/test/deployment/web/pages/en_US/Administration/Account_New.page.xml index 1b6cd2a..e190e2e 100644 --- a/test/deployment/web/pages/en_US/Administration/Account_New.page.xml +++ b/test/deployment/web/pages/en_US/Administration/Account_New.page.xml @@ -1 +1 @@ -
 \ No newline at end of file +
 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/Administration/Account_Overview.page.xml b/test/deployment/web/pages/en_US/Administration/Account_Overview.page.xml index 3b4732c..ec81736 100644 --- a/test/deployment/web/pages/en_US/Administration/Account_Overview.page.xml +++ b/test/deployment/web/pages/en_US/Administration/Account_Overview.page.xml @@ -1 +1 @@ -
 \ No newline at end of file +
 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/Administration/ActiveSessions.page.xml b/test/deployment/web/pages/en_US/Administration/ActiveSessions.page.xml index 00e3e7f..fc81197 100644 --- a/test/deployment/web/pages/en_US/Administration/ActiveSessions.page.xml +++ b/test/deployment/web/pages/en_US/Administration/ActiveSessions.page.xml @@ -1 +1 @@ -
 \ No newline at end of file +
 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/Administration/ChangeMyPasswordForm.page.xml b/test/deployment/web/pages/en_US/Administration/ChangeMyPasswordForm.page.xml index 0e8dad9..376bb1d 100644 --- a/test/deployment/web/pages/en_US/Administration/ChangeMyPasswordForm.page.xml +++ b/test/deployment/web/pages/en_US/Administration/ChangeMyPasswordForm.page.xml @@ -1 +1 @@ -
 \ No newline at end of file +
 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/Administration/ChangePasswordForm.page.xml b/test/deployment/web/pages/en_US/Administration/ChangePasswordForm.page.xml index 4a3edef..ec9f0f1 100644 --- a/test/deployment/web/pages/en_US/Administration/ChangePasswordForm.page.xml +++ b/test/deployment/web/pages/en_US/Administration/ChangePasswordForm.page.xml @@ -1 +1 @@ -
 \ No newline at end of file +
 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/Administration/MyAccount.page.xml b/test/deployment/web/pages/en_US/Administration/MyAccount.page.xml index 03eec4d..1d6d787 100644 --- a/test/deployment/web/pages/en_US/Administration/MyAccount.page.xml +++ b/test/deployment/web/pages/en_US/Administration/MyAccount.page.xml @@ -1 +1 @@ -
 \ No newline at end of file +
 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/Administration/RuntimeStatistics.page.xml b/test/deployment/web/pages/en_US/Administration/RuntimeStatistics.page.xml index 4a76ab0..d507386 100644 --- a/test/deployment/web/pages/en_US/Administration/RuntimeStatistics.page.xml +++ b/test/deployment/web/pages/en_US/Administration/RuntimeStatistics.page.xml @@ -1 +1 @@ -
 \ No newline at end of file +
 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/Administration/ScheduledEvents.page.xml b/test/deployment/web/pages/en_US/Administration/ScheduledEvents.page.xml index 6ef0d9b..627da45 100644 --- a/test/deployment/web/pages/en_US/Administration/ScheduledEvents.page.xml +++ b/test/deployment/web/pages/en_US/Administration/ScheduledEvents.page.xml @@ -1 +1 @@ -
 \ No newline at end of file +
 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/Administration/UserRole_Select.page.xml b/test/deployment/web/pages/en_US/Administration/UserRole_Select.page.xml index c560a7f..2edb0bf 100644 --- a/test/deployment/web/pages/en_US/Administration/UserRole_Select.page.xml +++ b/test/deployment/web/pages/en_US/Administration/UserRole_Select.page.xml @@ -1 +1 @@ -
 \ No newline at end of file +
 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/Layouts/DesktopLayout.layout.xml b/test/deployment/web/pages/en_US/Layouts/DesktopLayout.layout.xml index a901d0f..6348c7a 100644 --- a/test/deployment/web/pages/en_US/Layouts/DesktopLayout.layout.xml +++ b/test/deployment/web/pages/en_US/Layouts/DesktopLayout.layout.xml @@ -1 +1 @@ -
 \ No newline at end of file +
 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/Layouts/SidebarLayout.layout.xml b/test/deployment/web/pages/en_US/Layouts/SidebarLayout.layout.xml index df6197f..9f7aa64 100644 --- a/test/deployment/web/pages/en_US/Layouts/SidebarLayout.layout.xml +++ b/test/deployment/web/pages/en_US/Layouts/SidebarLayout.layout.xml @@ -1 +1 @@ -
 \ No newline at end of file +
 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/Layouts/SidebarPhoneLayout.layout.xml b/test/deployment/web/pages/en_US/Layouts/SidebarPhoneLayout.layout.xml index 44318a0..7ba96dc 100644 --- a/test/deployment/web/pages/en_US/Layouts/SidebarPhoneLayout.layout.xml +++ b/test/deployment/web/pages/en_US/Layouts/SidebarPhoneLayout.layout.xml @@ -1 +1 @@ -
 \ No newline at end of file +
 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/TestSuite/DataView_Editable.page.xml b/test/deployment/web/pages/en_US/TestSuite/DataView_Editable.page.xml index 4ded05f..845b35f 100644 --- a/test/deployment/web/pages/en_US/TestSuite/DataView_Editable.page.xml +++ b/test/deployment/web/pages/en_US/TestSuite/DataView_Editable.page.xml @@ -1 +1 @@ -

DataView_Editable

Widget behaviour

Attributes used

 \ No newline at end of file +

DataView_Editable

Widget behaviour

Attributes used

 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/TestSuite/DataView_NewEdit.page.xml b/test/deployment/web/pages/en_US/TestSuite/DataView_NewEdit.page.xml index d2e8efd..e4e63a1 100644 --- a/test/deployment/web/pages/en_US/TestSuite/DataView_NewEdit.page.xml +++ b/test/deployment/web/pages/en_US/TestSuite/DataView_NewEdit.page.xml @@ -1 +1 @@ -

DataView_NewEdit

 \ No newline at end of file +

DataView_NewEdit

 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/TestSuite/DataView_ReadOnly.page.xml b/test/deployment/web/pages/en_US/TestSuite/DataView_ReadOnly.page.xml index 33f2dec..773ce72 100644 --- a/test/deployment/web/pages/en_US/TestSuite/DataView_ReadOnly.page.xml +++ b/test/deployment/web/pages/en_US/TestSuite/DataView_ReadOnly.page.xml @@ -1 +1 @@ -

DataView_ReadOnly

Widget behaviour

Attributes used

 \ No newline at end of file +

DataView_ReadOnly

Widget behaviour

Attributes used

 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/TestSuite/DataView_Validation.page.xml b/test/deployment/web/pages/en_US/TestSuite/DataView_Validation.page.xml index dadc812..33ed033 100644 --- a/test/deployment/web/pages/en_US/TestSuite/DataView_Validation.page.xml +++ b/test/deployment/web/pages/en_US/TestSuite/DataView_Validation.page.xml @@ -1 +1 @@ -

DataView_Validation

Widget behaviour

Attributes used

 \ No newline at end of file +

DataView_Validation

Widget behaviour

Attributes used

 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/TestSuite/Event_RefreshInClient.page.xml b/test/deployment/web/pages/en_US/TestSuite/Event_RefreshInClient.page.xml index a90ce93..93e80a7 100644 --- a/test/deployment/web/pages/en_US/TestSuite/Event_RefreshInClient.page.xml +++ b/test/deployment/web/pages/en_US/TestSuite/Event_RefreshInClient.page.xml @@ -1 +1 @@ -

DataView_RefreshInClient

Widget behaviour

Attributes used

 \ No newline at end of file +

DataView_RefreshInClient

Widget behaviour

Attributes used

 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/TestSuite/Event_Update.page.xml b/test/deployment/web/pages/en_US/TestSuite/Event_Update.page.xml index be3cb47..dec3707 100644 --- a/test/deployment/web/pages/en_US/TestSuite/Event_Update.page.xml +++ b/test/deployment/web/pages/en_US/TestSuite/Event_Update.page.xml @@ -1 +1 @@ -

Event_Update

Widget behaviour

Attributes used

 \ No newline at end of file +

Event_Update

Widget behaviour

Attributes used

 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/TestSuite/ListView_Editable.page.xml b/test/deployment/web/pages/en_US/TestSuite/ListView_Editable.page.xml index 593060d..2531fe2 100644 --- a/test/deployment/web/pages/en_US/TestSuite/ListView_Editable.page.xml +++ b/test/deployment/web/pages/en_US/TestSuite/ListView_Editable.page.xml @@ -1 +1 @@ -

ListView_Editable

 \ No newline at end of file +

ListView_Editable

 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/TestSuite/ListView_ReadOnly.page.xml b/test/deployment/web/pages/en_US/TestSuite/ListView_ReadOnly.page.xml index c0fa619..00ac75a 100644 --- a/test/deployment/web/pages/en_US/TestSuite/ListView_ReadOnly.page.xml +++ b/test/deployment/web/pages/en_US/TestSuite/ListView_ReadOnly.page.xml @@ -1 +1 @@ -

ListView_ReadOnly

 \ No newline at end of file +

ListView_ReadOnly

 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/TestSuite/ListeningDataView.page.xml b/test/deployment/web/pages/en_US/TestSuite/ListeningDataView.page.xml index 732c0e5..7775390 100644 --- a/test/deployment/web/pages/en_US/TestSuite/ListeningDataView.page.xml +++ b/test/deployment/web/pages/en_US/TestSuite/ListeningDataView.page.xml @@ -1 +1 @@ -

ListeningDataView_Editable

 \ No newline at end of file +

ListeningDataView_Editable

 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/TestSuite/ListeningDataView_DeselectGrid.page.xml b/test/deployment/web/pages/en_US/TestSuite/ListeningDataView_DeselectGrid.page.xml index 8d675ca..87fce43 100644 --- a/test/deployment/web/pages/en_US/TestSuite/ListeningDataView_DeselectGrid.page.xml +++ b/test/deployment/web/pages/en_US/TestSuite/ListeningDataView_DeselectGrid.page.xml @@ -1 +1 @@ -

ListeningDataView_Destroy

 \ No newline at end of file +

ListeningDataView_Destroy

 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/TestSuite/ListeningDataView_ReadOnly.page.xml b/test/deployment/web/pages/en_US/TestSuite/ListeningDataView_ReadOnly.page.xml index d35092c..d304c7a 100644 --- a/test/deployment/web/pages/en_US/TestSuite/ListeningDataView_ReadOnly.page.xml +++ b/test/deployment/web/pages/en_US/TestSuite/ListeningDataView_ReadOnly.page.xml @@ -1 +1 @@ -

ListeningDataView_ReadOnly

 \ No newline at end of file +

ListeningDataView_ReadOnly

 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/TestSuite/Phone_DataView_Editable.page.xml b/test/deployment/web/pages/en_US/TestSuite/Phone_DataView_Editable.page.xml index 42d187c..507b9fc 100644 --- a/test/deployment/web/pages/en_US/TestSuite/Phone_DataView_Editable.page.xml +++ b/test/deployment/web/pages/en_US/TestSuite/Phone_DataView_Editable.page.xml @@ -1 +1 @@ -

Widget behaviour

Attributes used

 \ No newline at end of file +

Widget behaviour

Attributes used

 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/TestSuite/Phone_DataView_ReadOnly.page.xml b/test/deployment/web/pages/en_US/TestSuite/Phone_DataView_ReadOnly.page.xml index 2195180..fa32834 100644 --- a/test/deployment/web/pages/en_US/TestSuite/Phone_DataView_ReadOnly.page.xml +++ b/test/deployment/web/pages/en_US/TestSuite/Phone_DataView_ReadOnly.page.xml @@ -1 +1 @@ -

Widget behaviour

Attributes used

 \ No newline at end of file +

Widget behaviour

Attributes used

 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/TestSuite/Phone_DataView_Validation.page.xml b/test/deployment/web/pages/en_US/TestSuite/Phone_DataView_Validation.page.xml index a8882d5..450262a 100644 --- a/test/deployment/web/pages/en_US/TestSuite/Phone_DataView_Validation.page.xml +++ b/test/deployment/web/pages/en_US/TestSuite/Phone_DataView_Validation.page.xml @@ -1 +1 @@ -

Widget behaviour

Attributes used

 \ No newline at end of file +

Widget behaviour

Attributes used

 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/TestSuite/Phone_Event_OnClick.page.xml b/test/deployment/web/pages/en_US/TestSuite/Phone_Event_OnClick.page.xml index 368defe..8cbe2a7 100644 --- a/test/deployment/web/pages/en_US/TestSuite/Phone_Event_OnClick.page.xml +++ b/test/deployment/web/pages/en_US/TestSuite/Phone_Event_OnClick.page.xml @@ -1 +1 @@ -

Widget behaviour

 \ No newline at end of file +

Widget behaviour

 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/TestSuite/Phone_Event_RefreshInClient.page.xml b/test/deployment/web/pages/en_US/TestSuite/Phone_Event_RefreshInClient.page.xml index 910658f..6dc8297 100644 --- a/test/deployment/web/pages/en_US/TestSuite/Phone_Event_RefreshInClient.page.xml +++ b/test/deployment/web/pages/en_US/TestSuite/Phone_Event_RefreshInClient.page.xml @@ -1 +1 @@ -

Widget behaviour

Attributes used

 \ No newline at end of file +

Widget behaviour

Attributes used

 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/TestSuite/Phone_Event_Update.page.xml b/test/deployment/web/pages/en_US/TestSuite/Phone_Event_Update.page.xml index 369b64e..7cf396b 100644 --- a/test/deployment/web/pages/en_US/TestSuite/Phone_Event_Update.page.xml +++ b/test/deployment/web/pages/en_US/TestSuite/Phone_Event_Update.page.xml @@ -1 +1 @@ -

Widget behaviour

Attributes used

 \ No newline at end of file +

Widget behaviour

Attributes used

 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/TestSuite/Phone_ListView_Editable.page.xml b/test/deployment/web/pages/en_US/TestSuite/Phone_ListView_Editable.page.xml index 82bf5f1..a349731 100644 --- a/test/deployment/web/pages/en_US/TestSuite/Phone_ListView_Editable.page.xml +++ b/test/deployment/web/pages/en_US/TestSuite/Phone_ListView_Editable.page.xml @@ -1 +1 @@ -
 \ No newline at end of file +
 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/TestSuite/Phone_ListView_ReadOnly.page.xml b/test/deployment/web/pages/en_US/TestSuite/Phone_ListView_ReadOnly.page.xml index 9b990f8..0e022b4 100644 --- a/test/deployment/web/pages/en_US/TestSuite/Phone_ListView_ReadOnly.page.xml +++ b/test/deployment/web/pages/en_US/TestSuite/Phone_ListView_ReadOnly.page.xml @@ -1 +1 @@ -
 \ No newline at end of file +
 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/TestSuite/TabContainer.page.xml b/test/deployment/web/pages/en_US/TestSuite/TabContainer.page.xml index 62b934d..8d10b03 100644 --- a/test/deployment/web/pages/en_US/TestSuite/TabContainer.page.xml +++ b/test/deployment/web/pages/en_US/TestSuite/TabContainer.page.xml @@ -1 +1 @@ -

TabContainer

Widget behaviour

Attributes used

 \ No newline at end of file +

TabContainer

Widget behaviour

Attributes used

 \ No newline at end of file diff --git a/test/deployment/web/pages/en_US/TestSuite/TemplateGrid.page.xml b/test/deployment/web/pages/en_US/TestSuite/TemplateGrid.page.xml index 000f329..ae5276d 100644 --- a/test/deployment/web/pages/en_US/TestSuite/TemplateGrid.page.xml +++ b/test/deployment/web/pages/en_US/TestSuite/TemplateGrid.page.xml @@ -1 +1 @@ -

TemplateGrid

 \ No newline at end of file +

TemplateGrid

 \ No newline at end of file diff --git a/test/deployment/web/widgets/Handles/Handles.xml b/test/deployment/web/widgets/Handles/Handles.xml index c899ecf..5c3ca64 100644 --- a/test/deployment/web/widgets/Handles/Handles.xml +++ b/test/deployment/web/widgets/Handles/Handles.xml @@ -1,7 +1,7 @@ Handles - The description of this widget. + Slider with two (or more handles) @@ -22,7 +22,7 @@ The size of the interval between slider steps. - Lower Handle + Lower Handle Attribute Slider Settings Entity Attribute (decimal) coupled with the lower handle of the slider. @@ -30,12 +30,60 @@ - Upper Handle + Upper Handle Attribute Slider Settings Entity Attribute (decimal) coupled with the upper handle of the slider. + + Display Value Labels + Slider Settings + Set true to display the handle's value in a label. + + + Direction + Slider Settings + Configure the slider to increase left-to-right/top-to-bottom or right-to-left/bottom-to-top. + + Left-to-right / Top-to-bottom + Right-to-left / Bottom-to-top + + + + Orientation + Slider Settings + Configure the orientation of the slider. +If Vertical, be sure to select the correct Direction value for your purposes. +Also if Vertical, height must be manually set in the widget css (class .noUi-vertical) + + Horizontal + Vertical + + + + + Enforce Minimum Range + Advanced Settings + Set true to enforce a minimum size for the range between handles + + + Minimum Range + Advanced Settings + Size of the minimum range; takes effect only if Enforce Minimum Range is true. + + + Enforce Maximum Range + Advanced Settings + Set true to enforce a maximum size for the range between handles + + + Maximum Range + Advanced Settings + Size of the maximum range; takes effect only if Enforce Maximum Range is true. + + + diff --git a/test/deployment/web/widgets/Handles/widget/Handles.js b/test/deployment/web/widgets/Handles/widget/Handles.js index b5bc0be..4d42147 100644 --- a/test/deployment/web/widgets/Handles/widget/Handles.js +++ b/test/deployment/web/widgets/Handles/widget/Handles.js @@ -33,10 +33,14 @@ define([ "dojo/text", "dojo/html", "dojo/_base/event", + "dojo/query", "Handles/lib/nouislider", "dojo/text!Handles/widget/template/Handles.html" ], function (declare, _WidgetBase, _TemplatedMixin, dom, dojoDom, dojoProp, dojoGeometry, dojoClass, dojoStyle, dojoConstruct, dojoArray, dojoLang, dojoText, dojoHtml, dojoEvent, + + dojoQuery, + noUiSlider, widgetTemplate) { "use strict"; @@ -54,12 +58,21 @@ define([ sliderStep : "", handleAttr0 : "", handleAttr1 : "", + testProperty : "", + enforceMargin : false, + marginSize : null, + enforceLimit : false, + limitSize : null, + direction : "", + orientation : "", + toolTips : false, // Internal variables. Non-primitives created in the prototype are shared between all widget instances. _handles: null, _contextObj: null, _alertDiv: null, _readOnly: false, + _sliderSettings: null, // dojo.declare.constructor is called to construct the widget instance. Implement to initialize non-primitive properties. constructor: function () { @@ -71,13 +84,22 @@ define([ postCreate: function () { logger.debug(this.id + ".postCreate"); + this._sliderSettings = { + start: [this.sliderMax * 0.25, this.sliderMax * 0.75], + step: this.sliderStep, + connect: true, + range: { 'min': this.sliderMin, 'max': this.sliderMax }, + behaviour: 'drag-tap' + }; + this._updateRendering(); - noUiSlider.create(this.domTarget, { - start: [this.sliderMax * 0.25, this.sliderMax * 0.75], - step: this.sliderStep, - connect: true, - range: { 'min': this.sliderMin, 'max': this.sliderMax } - }); + + this._setDirectionAndOrientation(); + this._setMarginAndLimit(); + this._toggleTooltips(); + this._buildPips(); + + noUiSlider.create(this.domTarget, this._sliderSettings); this._setupEvents(); }, @@ -92,7 +114,7 @@ define([ if(this._contextObj.get(this.handleAttr0) == 0 && this._contextObj.get(this.handleAttr1) == 0) { this._contextObj.set(this.handleAttr0, this.domTarget.noUiSlider.get()[0]); - this._contextObj.set(this.handleAttr1, this.domTarget.noUiSlider.get()[1]); + this._contextObj.set(this.handleAttr1, this.domTarget.noUiSlider.get()[1]); } else { this.domTarget.noUiSlider.set( [this._contextObj.get(this.handleAttr0), this._contextObj.get(this.handleAttr1)] ); } @@ -132,7 +154,6 @@ define([ logger.debug(this.id + "._setupEvents"); var self = this; self.domTarget.noUiSlider.on('slide', function() { - console.log("listener is firing"); self._contextObj.set(self.handleAttr0, self.domTarget.noUiSlider.get()[0]); self._contextObj.set(self.handleAttr1, self.domTarget.noUiSlider.get()[1]); }); @@ -225,7 +246,49 @@ define([ this._handles = [ objectHandle, attrHandle, validationHandle ]; } + }, + + // Set the direction and orientation of the sliderMin + _setDirectionAndOrientation: function() { + console.log('set direction and orientation'); + if (this.direction == 'rtl') { + this._sliderSettings.direction = this.direction + }; + if (this.orientation == 'vertical') { + this._sliderSettings.orientation = this.orientation + }; + }, + + // Set the margin and limit (minimum and maximum separation between handles) + _setMarginAndLimit: function() { + console.log('set margin...') + if ( (this.enforceMargin && this.marginSize != null) ) { + this._sliderSettings.margin = this.marginSize + }; + if ( (this.enforceLimit && this.limitSize != null) ) { + this._sliderSettings.limit = this.limitSize + }; + }, + + // Toogle display of values on the handles + _toggleTooltips: function() { + console.log('set tool tips...') + if ( (this.toolTips) ) { + this._sliderSettings.tooltips = [true, true]; + } + }, + + // If steps are >= 25% of the range, render pips + _buildPips: function() { + console.log('build pips...') + if ( (this.sliderMax-this.sliderMin) / this.sliderStep <= 4 ) { + this._sliderSettings.pips = { + mode: 'steps', density: this.sliderStep + } + } } + + }); }); diff --git a/test/deployment/web/widgets/Handles/widget/ui/Handles.css b/test/deployment/web/widgets/Handles/widget/ui/Handles.css index 5b22adb..b49b7f3 100644 --- a/test/deployment/web/widgets/Handles/widget/ui/Handles.css +++ b/test/deployment/web/widgets/Handles/widget/ui/Handles.css @@ -92,6 +92,7 @@ } .noUi-vertical { width: 18px; + height: 400px; } .noUi-vertical .noUi-handle { width: 28px; diff --git a/test/deployment/web/widgets/widgets.css b/test/deployment/web/widgets/widgets.css index 459033e..fe4ad02 100644 --- a/test/deployment/web/widgets/widgets.css +++ b/test/deployment/web/widgets/widgets.css @@ -92,6 +92,7 @@ } .noUi-vertical { width: 18px; + height: 400px; } .noUi-vertical .noUi-handle { width: 28px; diff --git a/test/javasource/testsuite/proxies/Color.java b/test/javasource/testsuite/proxies/Color.java index e379ace..fe77665 100644 --- a/test/javasource/testsuite/proxies/Color.java +++ b/test/javasource/testsuite/proxies/Color.java @@ -28,7 +28,9 @@ public enum MemberNames IsPrimary("IsPrimary"), ColorCode("ColorCode"), RangeMin("RangeMin"), - RangeMax("RangeMax"); + RangeMax("RangeMax"), + Color_Entity("TestSuite.Color_Entity"), + Entity_3_Color("TestSuite.Entity_3_Color"); private java.lang.String metaName; @@ -84,6 +86,14 @@ public static testsuite.proxies.Color load(com.mendix.systemwideinterfaces.core. return testsuite.proxies.Color.initialize(context, mendixObject); } + public static java.util.List load(com.mendix.systemwideinterfaces.core.IContext context, java.lang.String xpathConstraint) throws com.mendix.core.CoreException + { + java.util.List result = new java.util.ArrayList(); + for (com.mendix.systemwideinterfaces.core.IMendixObject obj : com.mendix.core.Core.retrieveXPathQuery(context, "//TestSuite.Color" + xpathConstraint)) + result.add(testsuite.proxies.Color.initialize(context, obj)); + return result; + } + /** * Commit the changes made on this proxy object. */ @@ -331,6 +341,95 @@ public final void setRangeMax(com.mendix.systemwideinterfaces.core.IContext cont getMendixObject().setValue(context, MemberNames.RangeMax.toString(), rangemax); } + /** + * @return value of Color_Entity + */ + public final testsuite.proxies.Entity getColor_Entity() throws com.mendix.core.CoreException + { + return getColor_Entity(getContext()); + } + + /** + * @param context + * @return value of Color_Entity + */ + public final testsuite.proxies.Entity getColor_Entity(com.mendix.systemwideinterfaces.core.IContext context) throws com.mendix.core.CoreException + { + testsuite.proxies.Entity result = null; + com.mendix.systemwideinterfaces.core.IMendixIdentifier identifier = getMendixObject().getValue(context, MemberNames.Color_Entity.toString()); + if (identifier != null) + result = testsuite.proxies.Entity.load(context, identifier); + return result; + } + + /** + * Set value of Color_Entity + * @param color_entity + */ + public final void setColor_Entity(testsuite.proxies.Entity color_entity) + { + setColor_Entity(getContext(), color_entity); + } + + /** + * Set value of Color_Entity + * @param context + * @param color_entity + */ + public final void setColor_Entity(com.mendix.systemwideinterfaces.core.IContext context, testsuite.proxies.Entity color_entity) + { + if (color_entity == null) + getMendixObject().setValue(context, MemberNames.Color_Entity.toString(), null); + else + getMendixObject().setValue(context, MemberNames.Color_Entity.toString(), color_entity.getMendixObject().getId()); + } + + /** + * @return value of Entity_3_Color + */ + public final java.util.List getEntity_3_Color() throws com.mendix.core.CoreException + { + return getEntity_3_Color(getContext()); + } + + /** + * @param context + * @return value of Entity_3_Color + */ + @SuppressWarnings("unchecked") + public final java.util.List getEntity_3_Color(com.mendix.systemwideinterfaces.core.IContext context) throws com.mendix.core.CoreException + { + java.util.List result = new java.util.ArrayList(); + Object valueObject = getMendixObject().getValue(context, MemberNames.Entity_3_Color.toString()); + if (valueObject == null) + return result; + for (com.mendix.systemwideinterfaces.core.IMendixObject mendixObject : com.mendix.core.Core.retrieveIdList(context, (java.util.List) valueObject)) + result.add(testsuite.proxies.Entity_3.initialize(context, mendixObject)); + return result; + } + + /** + * Set value of Entity_3_Color + * @param entity_3_color + */ + public final void setEntity_3_Color(java.util.List entity_3_color) + { + setEntity_3_Color(getContext(), entity_3_color); + } + + /** + * Set value of Entity_3_Color + * @param context + * @param entity_3_color + */ + public final void setEntity_3_Color(com.mendix.systemwideinterfaces.core.IContext context, java.util.List entity_3_color) + { + java.util.List identifiers = new java.util.ArrayList(); + for (testsuite.proxies.Entity_3 proxyObject : entity_3_color) + identifiers.add(proxyObject.getMendixObject().getId()); + getMendixObject().setValue(context, MemberNames.Entity_3_Color.toString(), identifiers); + } + /** * @return the IMendixObject instance of this proxy for use in the Core interface. */ diff --git a/test/javasource/testsuite/proxies/Entity.java b/test/javasource/testsuite/proxies/Entity.java new file mode 100644 index 0000000..2c717ea --- /dev/null +++ b/test/javasource/testsuite/proxies/Entity.java @@ -0,0 +1,153 @@ +// This file was generated by Mendix Business Modeler. +// +// WARNING: Code you write here will be lost the next time you deploy the project. + +package testsuite.proxies; + +/** + * + */ +public class Entity +{ + private final com.mendix.systemwideinterfaces.core.IMendixObject entityMendixObject; + + private final com.mendix.systemwideinterfaces.core.IContext context; + + /** + * Internal name of this entity + */ + public static final java.lang.String entityName = "TestSuite.Entity"; + + public Entity(com.mendix.systemwideinterfaces.core.IContext context) + { + this(context, com.mendix.core.Core.instantiate(context, "TestSuite.Entity")); + } + + protected Entity(com.mendix.systemwideinterfaces.core.IContext context, com.mendix.systemwideinterfaces.core.IMendixObject entityMendixObject) + { + if (entityMendixObject == null) + throw new java.lang.IllegalArgumentException("The given object cannot be null."); + if (!com.mendix.core.Core.isSubClassOf("TestSuite.Entity", entityMendixObject.getType())) + throw new java.lang.IllegalArgumentException("The given object is not a TestSuite.Entity"); + + this.entityMendixObject = entityMendixObject; + this.context = context; + } + + /** + * @deprecated Use 'Entity.load(IContext, IMendixIdentifier)' instead. + */ + @Deprecated + public static testsuite.proxies.Entity initialize(com.mendix.systemwideinterfaces.core.IContext context, com.mendix.systemwideinterfaces.core.IMendixIdentifier mendixIdentifier) throws com.mendix.core.CoreException + { + return testsuite.proxies.Entity.load(context, mendixIdentifier); + } + + /** + * Initialize a proxy using context (recommended). This context will be used for security checking when the get- and set-methods without context parameters are called. + * The get- and set-methods with context parameter should be used when for instance sudo access is necessary (IContext.getSudoContext() can be used to obtain sudo access). + */ + public static testsuite.proxies.Entity initialize(com.mendix.systemwideinterfaces.core.IContext context, com.mendix.systemwideinterfaces.core.IMendixObject mendixObject) + { + return new testsuite.proxies.Entity(context, mendixObject); + } + + public static testsuite.proxies.Entity load(com.mendix.systemwideinterfaces.core.IContext context, com.mendix.systemwideinterfaces.core.IMendixIdentifier mendixIdentifier) throws com.mendix.core.CoreException + { + com.mendix.systemwideinterfaces.core.IMendixObject mendixObject = com.mendix.core.Core.retrieveId(context, mendixIdentifier); + return testsuite.proxies.Entity.initialize(context, mendixObject); + } + + public static java.util.List load(com.mendix.systemwideinterfaces.core.IContext context, java.lang.String xpathConstraint) throws com.mendix.core.CoreException + { + java.util.List result = new java.util.ArrayList(); + for (com.mendix.systemwideinterfaces.core.IMendixObject obj : com.mendix.core.Core.retrieveXPathQuery(context, "//TestSuite.Entity" + xpathConstraint)) + result.add(testsuite.proxies.Entity.initialize(context, obj)); + return result; + } + + /** + * Commit the changes made on this proxy object. + */ + public final void commit() throws com.mendix.core.CoreException + { + com.mendix.core.Core.commit(context, getMendixObject()); + } + + /** + * Commit the changes made on this proxy object using the specified context. + */ + public final void commit(com.mendix.systemwideinterfaces.core.IContext context) throws com.mendix.core.CoreException + { + com.mendix.core.Core.commit(context, getMendixObject()); + } + + /** + * Delete the object. + */ + public final void delete() + { + com.mendix.core.Core.delete(context, getMendixObject()); + } + + /** + * Delete the object using the specified context. + */ + public final void delete(com.mendix.systemwideinterfaces.core.IContext context) + { + com.mendix.core.Core.delete(context, getMendixObject()); + } + /** + * @return the IMendixObject instance of this proxy for use in the Core interface. + */ + public final com.mendix.systemwideinterfaces.core.IMendixObject getMendixObject() + { + return entityMendixObject; + } + + /** + * @return the IContext instance of this proxy, or null if no IContext instance was specified at initialization. + */ + public final com.mendix.systemwideinterfaces.core.IContext getContext() + { + return context; + } + + @Override + public boolean equals(Object obj) + { + if (obj == this) + return true; + + if (obj != null && getClass().equals(obj.getClass())) + { + final testsuite.proxies.Entity that = (testsuite.proxies.Entity) obj; + return getMendixObject().equals(that.getMendixObject()); + } + return false; + } + + @Override + public int hashCode() + { + return getMendixObject().hashCode(); + } + + /** + * @return String name of this class + */ + public static java.lang.String getType() + { + return "TestSuite.Entity"; + } + + /** + * @return String GUID from this object, format: ID_0000000000 + * @deprecated Use getMendixObject().getId().toLong() to get a unique identifier for this object. + */ + @Deprecated + public java.lang.String getGUID() + { + return "ID_" + getMendixObject().getId().toLong(); + } +} diff --git a/test/javasource/testsuite/proxies/Entity_2.java b/test/javasource/testsuite/proxies/Entity_2.java new file mode 100644 index 0000000..a05f932 --- /dev/null +++ b/test/javasource/testsuite/proxies/Entity_2.java @@ -0,0 +1,217 @@ +// This file was generated by Mendix Business Modeler. +// +// WARNING: Code you write here will be lost the next time you deploy the project. + +package testsuite.proxies; + +/** + * + */ +public class Entity_2 +{ + private final com.mendix.systemwideinterfaces.core.IMendixObject entity_2MendixObject; + + private final com.mendix.systemwideinterfaces.core.IContext context; + + /** + * Internal name of this entity + */ + public static final java.lang.String entityName = "TestSuite.Entity_2"; + + /** + * Enum describing members of this entity + */ + public enum MemberNames + { + Entity_2_Color("TestSuite.Entity_2_Color"); + + private java.lang.String metaName; + + MemberNames(java.lang.String s) + { + metaName = s; + } + + @Override + public java.lang.String toString() + { + return metaName; + } + } + + public Entity_2(com.mendix.systemwideinterfaces.core.IContext context) + { + this(context, com.mendix.core.Core.instantiate(context, "TestSuite.Entity_2")); + } + + protected Entity_2(com.mendix.systemwideinterfaces.core.IContext context, com.mendix.systemwideinterfaces.core.IMendixObject entity_2MendixObject) + { + if (entity_2MendixObject == null) + throw new java.lang.IllegalArgumentException("The given object cannot be null."); + if (!com.mendix.core.Core.isSubClassOf("TestSuite.Entity_2", entity_2MendixObject.getType())) + throw new java.lang.IllegalArgumentException("The given object is not a TestSuite.Entity_2"); + + this.entity_2MendixObject = entity_2MendixObject; + this.context = context; + } + + /** + * @deprecated Use 'Entity_2.load(IContext, IMendixIdentifier)' instead. + */ + @Deprecated + public static testsuite.proxies.Entity_2 initialize(com.mendix.systemwideinterfaces.core.IContext context, com.mendix.systemwideinterfaces.core.IMendixIdentifier mendixIdentifier) throws com.mendix.core.CoreException + { + return testsuite.proxies.Entity_2.load(context, mendixIdentifier); + } + + /** + * Initialize a proxy using context (recommended). This context will be used for security checking when the get- and set-methods without context parameters are called. + * The get- and set-methods with context parameter should be used when for instance sudo access is necessary (IContext.getSudoContext() can be used to obtain sudo access). + */ + public static testsuite.proxies.Entity_2 initialize(com.mendix.systemwideinterfaces.core.IContext context, com.mendix.systemwideinterfaces.core.IMendixObject mendixObject) + { + return new testsuite.proxies.Entity_2(context, mendixObject); + } + + public static testsuite.proxies.Entity_2 load(com.mendix.systemwideinterfaces.core.IContext context, com.mendix.systemwideinterfaces.core.IMendixIdentifier mendixIdentifier) throws com.mendix.core.CoreException + { + com.mendix.systemwideinterfaces.core.IMendixObject mendixObject = com.mendix.core.Core.retrieveId(context, mendixIdentifier); + return testsuite.proxies.Entity_2.initialize(context, mendixObject); + } + + public static java.util.List load(com.mendix.systemwideinterfaces.core.IContext context, java.lang.String xpathConstraint) throws com.mendix.core.CoreException + { + java.util.List result = new java.util.ArrayList(); + for (com.mendix.systemwideinterfaces.core.IMendixObject obj : com.mendix.core.Core.retrieveXPathQuery(context, "//TestSuite.Entity_2" + xpathConstraint)) + result.add(testsuite.proxies.Entity_2.initialize(context, obj)); + return result; + } + + /** + * Commit the changes made on this proxy object. + */ + public final void commit() throws com.mendix.core.CoreException + { + com.mendix.core.Core.commit(context, getMendixObject()); + } + + /** + * Commit the changes made on this proxy object using the specified context. + */ + public final void commit(com.mendix.systemwideinterfaces.core.IContext context) throws com.mendix.core.CoreException + { + com.mendix.core.Core.commit(context, getMendixObject()); + } + + /** + * Delete the object. + */ + public final void delete() + { + com.mendix.core.Core.delete(context, getMendixObject()); + } + + /** + * Delete the object using the specified context. + */ + public final void delete(com.mendix.systemwideinterfaces.core.IContext context) + { + com.mendix.core.Core.delete(context, getMendixObject()); + } + /** + * @return value of Entity_2_Color + */ + public final testsuite.proxies.Color getEntity_2_Color() throws com.mendix.core.CoreException + { + return getEntity_2_Color(getContext()); + } + + /** + * @param context + * @return value of Entity_2_Color + */ + public final testsuite.proxies.Color getEntity_2_Color(com.mendix.systemwideinterfaces.core.IContext context) throws com.mendix.core.CoreException + { + testsuite.proxies.Color result = null; + com.mendix.systemwideinterfaces.core.IMendixIdentifier identifier = getMendixObject().getValue(context, MemberNames.Entity_2_Color.toString()); + if (identifier != null) + result = testsuite.proxies.Color.load(context, identifier); + return result; + } + + /** + * Set value of Entity_2_Color + * @param entity_2_color + */ + public final void setEntity_2_Color(testsuite.proxies.Color entity_2_color) + { + setEntity_2_Color(getContext(), entity_2_color); + } + + /** + * Set value of Entity_2_Color + * @param context + * @param entity_2_color + */ + public final void setEntity_2_Color(com.mendix.systemwideinterfaces.core.IContext context, testsuite.proxies.Color entity_2_color) + { + if (entity_2_color == null) + getMendixObject().setValue(context, MemberNames.Entity_2_Color.toString(), null); + else + getMendixObject().setValue(context, MemberNames.Entity_2_Color.toString(), entity_2_color.getMendixObject().getId()); + } + + /** + * @return the IMendixObject instance of this proxy for use in the Core interface. + */ + public final com.mendix.systemwideinterfaces.core.IMendixObject getMendixObject() + { + return entity_2MendixObject; + } + + /** + * @return the IContext instance of this proxy, or null if no IContext instance was specified at initialization. + */ + public final com.mendix.systemwideinterfaces.core.IContext getContext() + { + return context; + } + + @Override + public boolean equals(Object obj) + { + if (obj == this) + return true; + + if (obj != null && getClass().equals(obj.getClass())) + { + final testsuite.proxies.Entity_2 that = (testsuite.proxies.Entity_2) obj; + return getMendixObject().equals(that.getMendixObject()); + } + return false; + } + + @Override + public int hashCode() + { + return getMendixObject().hashCode(); + } + + /** + * @return String name of this class + */ + public static java.lang.String getType() + { + return "TestSuite.Entity_2"; + } + + /** + * @return String GUID from this object, format: ID_0000000000 + * @deprecated Use getMendixObject().getId().toLong() to get a unique identifier for this object. + */ + @Deprecated + public java.lang.String getGUID() + { + return "ID_" + getMendixObject().getId().toLong(); + } +} diff --git a/test/javasource/testsuite/proxies/Entity_3.java b/test/javasource/testsuite/proxies/Entity_3.java new file mode 100644 index 0000000..5982952 --- /dev/null +++ b/test/javasource/testsuite/proxies/Entity_3.java @@ -0,0 +1,220 @@ +// This file was generated by Mendix Business Modeler. +// +// WARNING: Code you write here will be lost the next time you deploy the project. + +package testsuite.proxies; + +/** + * + */ +public class Entity_3 +{ + private final com.mendix.systemwideinterfaces.core.IMendixObject entity_3MendixObject; + + private final com.mendix.systemwideinterfaces.core.IContext context; + + /** + * Internal name of this entity + */ + public static final java.lang.String entityName = "TestSuite.Entity_3"; + + /** + * Enum describing members of this entity + */ + public enum MemberNames + { + Entity_3_Color("TestSuite.Entity_3_Color"); + + private java.lang.String metaName; + + MemberNames(java.lang.String s) + { + metaName = s; + } + + @Override + public java.lang.String toString() + { + return metaName; + } + } + + public Entity_3(com.mendix.systemwideinterfaces.core.IContext context) + { + this(context, com.mendix.core.Core.instantiate(context, "TestSuite.Entity_3")); + } + + protected Entity_3(com.mendix.systemwideinterfaces.core.IContext context, com.mendix.systemwideinterfaces.core.IMendixObject entity_3MendixObject) + { + if (entity_3MendixObject == null) + throw new java.lang.IllegalArgumentException("The given object cannot be null."); + if (!com.mendix.core.Core.isSubClassOf("TestSuite.Entity_3", entity_3MendixObject.getType())) + throw new java.lang.IllegalArgumentException("The given object is not a TestSuite.Entity_3"); + + this.entity_3MendixObject = entity_3MendixObject; + this.context = context; + } + + /** + * @deprecated Use 'Entity_3.load(IContext, IMendixIdentifier)' instead. + */ + @Deprecated + public static testsuite.proxies.Entity_3 initialize(com.mendix.systemwideinterfaces.core.IContext context, com.mendix.systemwideinterfaces.core.IMendixIdentifier mendixIdentifier) throws com.mendix.core.CoreException + { + return testsuite.proxies.Entity_3.load(context, mendixIdentifier); + } + + /** + * Initialize a proxy using context (recommended). This context will be used for security checking when the get- and set-methods without context parameters are called. + * The get- and set-methods with context parameter should be used when for instance sudo access is necessary (IContext.getSudoContext() can be used to obtain sudo access). + */ + public static testsuite.proxies.Entity_3 initialize(com.mendix.systemwideinterfaces.core.IContext context, com.mendix.systemwideinterfaces.core.IMendixObject mendixObject) + { + return new testsuite.proxies.Entity_3(context, mendixObject); + } + + public static testsuite.proxies.Entity_3 load(com.mendix.systemwideinterfaces.core.IContext context, com.mendix.systemwideinterfaces.core.IMendixIdentifier mendixIdentifier) throws com.mendix.core.CoreException + { + com.mendix.systemwideinterfaces.core.IMendixObject mendixObject = com.mendix.core.Core.retrieveId(context, mendixIdentifier); + return testsuite.proxies.Entity_3.initialize(context, mendixObject); + } + + public static java.util.List load(com.mendix.systemwideinterfaces.core.IContext context, java.lang.String xpathConstraint) throws com.mendix.core.CoreException + { + java.util.List result = new java.util.ArrayList(); + for (com.mendix.systemwideinterfaces.core.IMendixObject obj : com.mendix.core.Core.retrieveXPathQuery(context, "//TestSuite.Entity_3" + xpathConstraint)) + result.add(testsuite.proxies.Entity_3.initialize(context, obj)); + return result; + } + + /** + * Commit the changes made on this proxy object. + */ + public final void commit() throws com.mendix.core.CoreException + { + com.mendix.core.Core.commit(context, getMendixObject()); + } + + /** + * Commit the changes made on this proxy object using the specified context. + */ + public final void commit(com.mendix.systemwideinterfaces.core.IContext context) throws com.mendix.core.CoreException + { + com.mendix.core.Core.commit(context, getMendixObject()); + } + + /** + * Delete the object. + */ + public final void delete() + { + com.mendix.core.Core.delete(context, getMendixObject()); + } + + /** + * Delete the object using the specified context. + */ + public final void delete(com.mendix.systemwideinterfaces.core.IContext context) + { + com.mendix.core.Core.delete(context, getMendixObject()); + } + /** + * @return value of Entity_3_Color + */ + public final java.util.List getEntity_3_Color() throws com.mendix.core.CoreException + { + return getEntity_3_Color(getContext()); + } + + /** + * @param context + * @return value of Entity_3_Color + */ + @SuppressWarnings("unchecked") + public final java.util.List getEntity_3_Color(com.mendix.systemwideinterfaces.core.IContext context) throws com.mendix.core.CoreException + { + java.util.List result = new java.util.ArrayList(); + Object valueObject = getMendixObject().getValue(context, MemberNames.Entity_3_Color.toString()); + if (valueObject == null) + return result; + for (com.mendix.systemwideinterfaces.core.IMendixObject mendixObject : com.mendix.core.Core.retrieveIdList(context, (java.util.List) valueObject)) + result.add(testsuite.proxies.Color.initialize(context, mendixObject)); + return result; + } + + /** + * Set value of Entity_3_Color + * @param entity_3_color + */ + public final void setEntity_3_Color(java.util.List entity_3_color) + { + setEntity_3_Color(getContext(), entity_3_color); + } + + /** + * Set value of Entity_3_Color + * @param context + * @param entity_3_color + */ + public final void setEntity_3_Color(com.mendix.systemwideinterfaces.core.IContext context, java.util.List entity_3_color) + { + java.util.List identifiers = new java.util.ArrayList(); + for (testsuite.proxies.Color proxyObject : entity_3_color) + identifiers.add(proxyObject.getMendixObject().getId()); + getMendixObject().setValue(context, MemberNames.Entity_3_Color.toString(), identifiers); + } + + /** + * @return the IMendixObject instance of this proxy for use in the Core interface. + */ + public final com.mendix.systemwideinterfaces.core.IMendixObject getMendixObject() + { + return entity_3MendixObject; + } + + /** + * @return the IContext instance of this proxy, or null if no IContext instance was specified at initialization. + */ + public final com.mendix.systemwideinterfaces.core.IContext getContext() + { + return context; + } + + @Override + public boolean equals(Object obj) + { + if (obj == this) + return true; + + if (obj != null && getClass().equals(obj.getClass())) + { + final testsuite.proxies.Entity_3 that = (testsuite.proxies.Entity_3) obj; + return getMendixObject().equals(that.getMendixObject()); + } + return false; + } + + @Override + public int hashCode() + { + return getMendixObject().hashCode(); + } + + /** + * @return String name of this class + */ + public static java.lang.String getType() + { + return "TestSuite.Entity_3"; + } + + /** + * @return String GUID from this object, format: ID_0000000000 + * @deprecated Use getMendixObject().getId().toLong() to get a unique identifier for this object. + */ + @Deprecated + public java.lang.String getGUID() + { + return "ID_" + getMendixObject().getId().toLong(); + } +} diff --git a/test/test.launch b/test/test.launch index 0a48d48..17dd66b 100644 --- a/test/test.launch +++ b/test/test.launch @@ -11,7 +11,7 @@ - + @@ -27,6 +27,6 @@ - - + + \ No newline at end of file diff --git a/test/widgets/Handles.mpk b/test/widgets/Handles.mpk index b6e0c617bd1727381de8d5d1c691dc53dabb7cd0..ee7c399886808c39c61cf8e68449bbb49d15a323 100644 GIT binary patch delta 6423 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 ZY{VMluZQJ-JY?FyZmlU%Vr>5y{ugKmA>{x7 delta 5308 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