This is an automated email from the ASF dual-hosted git repository. jimjag pushed a commit to branch odf-devel in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 4548a44d3c3d3ddc54710f33d9c690056a2c2945 Author: Jim Jagielski <[email protected]> AuthorDate: Thu Oct 22 15:48:05 2026 -0400 test/odf-validate: add form-property fixtures; wait longer for office startup --- .../fixtures/form-empty-float/checks.json | 43 +++++++++++++++++++++ .../fixtures/form-empty-float/sickness.odt | Bin 0 -> 9233 bytes .../fixtures/form-objid-nondefault/checks.json | 20 ++++++++++ .../fixtures/form-objid-nondefault/objid12.odt | Bin 0 -> 18108 bytes test/odf-validate/start.sh | 2 +- 5 files changed, 64 insertions(+), 1 deletion(-) diff --git a/test/odf-validate/fixtures/form-empty-float/checks.json b/test/odf-validate/fixtures/form-empty-float/checks.json new file mode 100644 index 0000000000..018a8c59fb --- /dev/null +++ b/test/odf-validate/fixtures/form-empty-float/checks.json @@ -0,0 +1,43 @@ +[ + { + "name": "objid_type", + "expr": "doc.DrawPage.Forms.getByIndex(0).getByIndex(0).getPropertySetInfo().getPropertyByName('ObjIDinMSO').Type.typeName", + "expect": "unsigned short" + }, + { + "name": "objid_values", + "expr": "[c.ObjIDinMSO for c in [doc.DrawPage.Forms.getByIndex(0).getByIndex(i) for i in range(doc.DrawPage.Forms.getByIndex(0).Count)] if c.getPropertySetInfo().hasPropertyByName('ObjIDinMSO')]", + "expect": [ + 65535, + 65535, + 65535, + 65535, + 65535, + 65535, + 65535, + 65535, + 65535, + 65535, + 65535, + 65535 + ] + }, + { + "name": "ctltype_values", + "expr": "[c.ControlTypeinMSO for c in [doc.DrawPage.Forms.getByIndex(0).getByIndex(i) for i in range(doc.DrawPage.Forms.getByIndex(0).Count)] if c.getPropertySetInfo().hasPropertyByName('ControlTypeinMSO')]", + "expect": [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ] + } +] diff --git a/test/odf-validate/fixtures/form-empty-float/sickness.odt b/test/odf-validate/fixtures/form-empty-float/sickness.odt new file mode 100644 index 0000000000..b48082212a Binary files /dev/null and b/test/odf-validate/fixtures/form-empty-float/sickness.odt differ diff --git a/test/odf-validate/fixtures/form-objid-nondefault/checks.json b/test/odf-validate/fixtures/form-objid-nondefault/checks.json new file mode 100644 index 0000000000..ade13f5339 --- /dev/null +++ b/test/odf-validate/fixtures/form-objid-nondefault/checks.json @@ -0,0 +1,20 @@ +[ + { + "name": "objid_values", + "expr": "[c.ObjIDinMSO for c in [doc.DrawPage.Forms.getByIndex(0).getByIndex(i) for i in range(doc.DrawPage.Forms.getByIndex(0).Count)] if c.getPropertySetInfo().hasPropertyByName('ObjIDinMSO')]", + "expect": [ + 12, + 12, + 12, + 12, + 12, + 12, + 12, + 12, + 12, + 12, + 65535, + 12 + ] + } +] \ No newline at end of file diff --git a/test/odf-validate/fixtures/form-objid-nondefault/objid12.odt b/test/odf-validate/fixtures/form-objid-nondefault/objid12.odt new file mode 100644 index 0000000000..1ed61d08b8 Binary files /dev/null and b/test/odf-validate/fixtures/form-objid-nondefault/objid12.odt differ diff --git a/test/odf-validate/start.sh b/test/odf-validate/start.sh index 1ebae14c0f..b714e034f7 100755 --- a/test/odf-validate/start.sh +++ b/test/odf-validate/start.sh @@ -25,5 +25,5 @@ mkdir -p $D/runs nohup $APP/MacOS/soffice -headless -nofirststartwizard -norestore -nologo -nodefault \ -env:UserInstallation=file://$D/runs/profile_$1 "-accept=socket,host=localhost,port=$2;urp;" \ >>$D/runs/soffice_$1.log 2>&1 & -for i in {1..60}; do lsof -nP -iTCP:$2 -sTCP:LISTEN >/dev/null 2>&1 && exit 0; sleep 1; done +for i in {1..180}; do lsof -nP -iTCP:$2 -sTCP:LISTEN >/dev/null 2>&1 && exit 0; sleep 1; done echo "start.sh: office on port $2 did not come up" >&2; exit 1
