Skip to content

Commit

Permalink
refactoring #423
Browse files Browse the repository at this point in the history
  • Loading branch information
brunobuzzi committed Sep 5, 2021
1 parent 873f8e0 commit 55a0c44
Show file tree
Hide file tree
Showing 66 changed files with 109 additions and 114 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ testComparision_1
id: id;
setApplication: 'agesic';
formName: 'comparision';
xmlString: self newDefinitionTemplate formDefinition_agesic_comparison_v1;
xmlString: testRoot newDefinitionTemplate formDefinition_agesic_comparison_v1;
buildForm;
yourself.

Expand All @@ -17,7 +17,7 @@ testComparision_1
id: id;
setApplication: 'agesic';
formName: 'comparision';
xmlString: self newDefinitionTemplate formDefinition_agesic_comparison_v2;
xmlString: testRoot newDefinitionTemplate formDefinition_agesic_comparison_v2;
buildForm;
yourself.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ testComparision_2
id: id;
setApplication: 'agesic';
formName: 'comparision';
xmlString: self newDefinitionTemplate formDefinition_agesic_test_comparison_1;
xmlString: testRoot newDefinitionTemplate formDefinition_agesic_test_comparison_1;
buildForm;
yourself.

Expand All @@ -17,7 +17,7 @@ testComparision_2
id: id;
setApplication: 'agesic';
formName: 'comparision';
xmlString: self newDefinitionTemplate formDefinition_agesic_test_comparison_2;
xmlString: testRoot newDefinitionTemplate formDefinition_agesic_test_comparison_2;
buildForm;
yourself.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ testComparision_3
id: id;
setApplication: 'agesic';
formName: 'comparision';
xmlString: self newDefinitionTemplate formDefinition_agesic_test_comparison_3;
xmlString: testRoot newDefinitionTemplate formDefinition_agesic_test_comparison_3;
buildForm;
yourself.

Expand All @@ -17,7 +17,7 @@ testComparision_3
id: id;
setApplication: 'agesic';
formName: 'comparision';
xmlString: self newDefinitionTemplate formDefinition_agesic_test_comparison_4;
xmlString: testRoot newDefinitionTemplate formDefinition_agesic_test_comparison_4;
buildForm;
yourself.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
"class" : {
},
"instance" : {
"newDefinitionTemplate" : "brunobb 04/15/2021 13:58",
"setUp" : "brunobb 07/24/2021 13:33",
"tearDown" : "brunobb 04/15/2021 13:58",
"testComparision_1" : "brunobb 07/24/2021 13:34",
"testComparision_2" : "brunobb 07/24/2021 13:45",
"testComparision_3" : "brunobb 07/24/2021 13:45" } }
"testComparision_1" : "brunobb 09/03/2021 12:58",
"testComparision_2" : "brunobb 09/03/2021 12:58",
"testComparision_3" : "brunobb 09/03/2021 12:58" } }
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ tests
testXmlFormDefinition_agesic_test_all_types_3
| fieldTypes labels section1 section11 section2 section21 allFields grids grid fields searchFields summaryFields permissions |

builder := testRoot newFormBuilderFor: self newDefinitionTemplate formDefinition_agesic_test_all_types_3.
builder := testRoot newFormBuilderFor: testRoot newDefinitionTemplate formDefinition_agesic_test_all_types_3.

"ApplicationName"
self assert: (builder getApplicationName = 'agesic').
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ tests
testXmlFormDefinition_agesic_test_all_types_4
| fieldsNodes document image annotation fieldTypes labels section1 section11 section2 section21 allFields grids grid fields searchFields summaryFields permissions |

builder := testRoot newFormBuilderFor: self newDefinitionTemplate formDefinition_agesic_test_all_types_4.
builder := testRoot newFormBuilderFor: testRoot newDefinitionTemplate formDefinition_agesic_test_all_types_4.

"ApplicationName"
self assert: (builder getApplicationName = 'agesic').
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
tests
testXmlFormDefinition_agesic_test_section_interation_name

builder := testRoot newFormBuilderFor: self newDefinitionTemplate formDefinition_agesic_test_section_interaction_name.
builder := testRoot newFormBuilderFor: testRoot newDefinitionTemplate formDefinition_agesic_test_section_interaction_name.

"Availability"
self assert: builder isAvailable.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ tests
testXmlFormDefinition_test_test
| fields types grids summaryFields subSection |

builder := testRoot newFormBuilderFor: self newDefinitionTemplate formDefinition_test_test.
builder := testRoot newFormBuilderFor: testRoot newDefinitionTemplate formDefinition_test_test.

"Availability"
self assert: builder isAvailable.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"instance" : {
"setUp" : "brunobb 07/24/2021 13:02",
"tearDown" : "brunobb 04/09/2021 11:04",
"testXmlFormDefinition_agesic_test_all_types_3" : "brunobb 07/24/2021 13:03",
"testXmlFormDefinition_agesic_test_all_types_4" : "brunobb 07/24/2021 13:03",
"testXmlFormDefinition_agesic_test_section_interation_name" : "brunobb 07/24/2021 13:03",
"testXmlFormDefinition_test_test" : "brunobb 07/24/2021 13:03" } }
"testXmlFormDefinition_agesic_test_all_types_3" : "brunobb 09/03/2021 13:15",
"testXmlFormDefinition_agesic_test_all_types_4" : "brunobb 09/03/2021 13:15",
"testXmlFormDefinition_agesic_test_section_interation_name" : "brunobb 09/03/2021 13:15",
"testXmlFormDefinition_test_test" : "brunobb 09/03/2021 13:15" } }
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ setUp
ifNone: [testRoot
buildPublishedFormNamed: 'all-fields-types'
title: 'Test'
withXml: self newDefinitionTemplate formDefinition_migration_all_fields_types
withXml: testRoot newDefinitionTemplate formDefinition_migration_all_fields_types
in: application].
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"class" : {
},
"instance" : {
"setUp" : "brunobb 07/26/2021 14:23",
"setUp" : "brunobb 09/03/2021 13:40",
"tearDown" : "brunobb 04/15/2021 13:37",
"testAttachments" : "brunobb 04/26/2021 06:53" } }
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ setUp
form := testRoot
buildPublishedFormNamed: 'test'
title: 'Test'
withXml: self newDefinitionTemplate formDefinition_agesic_test_all_types_4
withXml: testRoot newDefinitionTemplate formDefinition_agesic_test_all_types_4
in: application.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"class" : {
},
"instance" : {
"setUp" : "brunobb 07/26/2021 14:22",
"setUp" : "brunobb 09/03/2021 13:40",
"tearDown" : "brunobb 04/15/2021 13:52",
"testAttachments" : "brunobb 04/26/2021 06:28",
"testCustomPDFAttachment" : "brunobb 04/26/2021 06:31",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ setUp
form := application definitionNamed: 'charts-forms'
ifNone: [testRoot buildPublishedFormNamed: 'charts-forms'
title: 'Charts Form'
withXml: self newDefinitionTemplate formDefinition_charts_charts_forms
withXml: testRoot newDefinitionTemplate formDefinition_charts_charts_forms
in: application].
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"class" : {
},
"instance" : {
"setUp" : "brunobb 07/26/2021 14:22",
"setUp" : "brunobb 09/03/2021 13:40",
"tearDown" : "brunobb 04/15/2021 13:52",
"testFields" : "brunobb 04/15/2021 13:52" } }
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ setUp
form := testRoot
buildPublishedFormNamed: 'energy-recursive'
title: 'Energy Recursive Form'
withXml: self newDefinitionTemplate formDefinition_agesic_energy_recursive
withXml: testRoot newDefinitionTemplate formDefinition_agesic_energy_recursive
in: application.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"class" : {
},
"instance" : {
"setUp" : "brunobb 07/26/2021 14:21",
"setUp" : "brunobb 09/03/2021 13:40",
"tearDown" : "brunobb 04/15/2021 13:53",
"testFormFieldsInSection1" : "brunobb 04/15/2021 13:53",
"testFormFieldsInSection2" : "brunobb 04/15/2021 13:53",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ setUp
form := testRoot
buildPublishedFormNamed: 'test'
title: 'Test'
withXml: self newDefinitionTemplate formDefinition_agesic_test
withXml: testRoot newDefinitionTemplate formDefinition_agesic_test
in: application.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"class" : {
},
"instance" : {
"setUp" : "brunobb 07/26/2021 14:23",
"setUp" : "brunobb 09/03/2021 13:40",
"tearDown" : "brunobb 04/15/2021 13:53",
"testFormFieldsInSection1" : "brunobb 04/15/2021 13:53",
"testFormFieldsInSection2" : "brunobb 04/15/2021 13:53",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ setUp
library := testRoot buildPublishedFormNamed: 'library'
version: 1
title: 'Library'
withXml: self newDefinitionTemplate formDefinition_ue_library
withXml: testRoot newDefinitionTemplate formDefinition_ue_library
in: application.

form := testRoot
buildPublishedFormNamed: 'issue122'
id: UUID new asString
version: 1
title: 'Test'
publishedXml: self newDefinitionTemplate formDefinition_ue_issue_122
savedXml: self newDefinitionTemplate formSavedDefinition_ue_issue_122
publishedXml: testRoot newDefinitionTemplate formDefinition_ue_issue_122
savedXml: testRoot newDefinitionTemplate formSavedDefinition_ue_issue_122
in: application.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ testNonRepeatableToRepeatableStructure

formInstance := (OrbeonFormInstance newFor: form withId: UUID new asString)
definition: form;
xmlString: self newInstanceTemplate formInstance_ue_issue_122;
xmlString: testRoot newInstanceTemplate formInstance_ue_issue_122;
buildForm;
yourself.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"class" : {
},
"instance" : {
"setUp" : "brunobb 07/26/2021 14:26",
"setUp" : "brunobb 09/03/2021 13:40",
"tearDown" : "brunobb 04/15/2021 13:53",
"testNonRepeatableToRepeatableStructure" : "brunobb 04/15/2021 13:53" } }
"testNonRepeatableToRepeatableStructure" : "brunobb 09/03/2021 13:42" } }
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ setUp
library := testRoot buildPublishedFormNamed: 'library'
version: 1
title: 'Library'
withXml: self newDefinitionTemplate formDefinition_gs_library
withXml: testRoot newDefinitionTemplate formDefinition_gs_library
in: application.

form := testRoot buildPublishedFormNamed: 'issue-385'
id: UUID new asString
version: 1
title: 'Issue 385'
publishedXml: self newDefinitionTemplate formDefinition_gs_issue_385
savedXml: self newDefinitionTemplate formSavedDefinition_gs_issue_385
publishedXml: testRoot newDefinitionTemplate formDefinition_gs_issue_385
savedXml: testRoot newDefinitionTemplate formSavedDefinition_gs_issue_385
in: application.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"class" : {
},
"instance" : {
"setUp" : "brunobb 07/26/2021 14:28",
"setUp" : "brunobb 09/03/2021 13:40",
"tearDown" : "brunobb 04/15/2021 13:53",
"testCheckLibraryVersionNodeOnSavedAndPublishDefinition" : "brunobb 04/28/2021 09:15",
"testCheckXblNodeOnSavedAndPublishDefinition" : "brunobb 04/28/2021 09:16" } }
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ setUp
library := testRoot buildPublishedFormNamed: 'library'
version: 1
title: 'Library'
withXml: self newDefinitionTemplate formDefinition_gs_library
withXml: testRoot newDefinitionTemplate formDefinition_gs_library
in: application.

form := testRoot buildPublishedFormNamed: 'test-library'
version: 1
title: 'Test Library'
withXml: self newDefinitionTemplate formDefinition_gs_test_library
withXml: testRoot newDefinitionTemplate formDefinition_gs_test_library
in: application.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ testNonRepeatableToRepeatableStructure

formInstance := (OrbeonFormInstance newFor: form withId: UUID new asString)
definition: form;
xmlString: self newInstanceTemplate formInstance_gs_test_library_issue_389;
xmlString: testRoot newInstanceTemplate formInstance_gs_test_library_issue_389;
buildForm;
yourself.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"class" : {
},
"instance" : {
"setUp" : "brunobb 07/26/2021 14:32",
"setUp" : "brunobb 09/03/2021 13:40",
"tearDown" : "brunobb 04/15/2021 13:54",
"testNonRepeatableToRepeatableStructure" : "brunobb 04/15/2021 13:54" } }
"testNonRepeatableToRepeatableStructure" : "brunobb 09/03/2021 13:43" } }
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ testComponentVersions
id: libId
version: 1
title: 'Library'
withXml: self newDefinitionTemplate formDefinition_gs_library
withXml: testRoot newDefinitionTemplate formDefinition_gs_library
in: application.

formV1 := testRoot buildPublishedFormNamed: 'library-library'
id: id
version: 1
title: 'Test Library'
withXml: self newDefinitionTemplate formDefinition_gs_issue_390_v1
withXml: testRoot newDefinitionTemplate formDefinition_gs_issue_390_v1
in: application.

self assert: (formV1 libraryVersion = 1).
Expand All @@ -28,13 +28,13 @@ testComponentVersions
id: libId
version: 2
title: 'Library'
withXml: self newDefinitionTemplate formDefinition_gs_library
withXml: testRoot newDefinitionTemplate formDefinition_gs_library
in: application.
formV2 := testRoot buildPublishedFormNamed: 'library-library'
id: id
version: 2
title: 'Test Library'
withXml: self newDefinitionTemplate formDefinition_gs_issue_390_v2
withXml: testRoot newDefinitionTemplate formDefinition_gs_issue_390_v2
in: application.
self assert: (formV2 libraryVersion = 2).
formV2 sectionDefinitionsDo: [:secDefinition |
Expand All @@ -45,7 +45,7 @@ testComponentVersions
id: id
version: 3
title: 'Test Library'
withXml: self newDefinitionTemplate formDefinition_gs_issue_390_v3
withXml: testRoot newDefinitionTemplate formDefinition_gs_issue_390_v3
in: application.
self assert: (formV3 libraryVersion = 1). "formV3 point to library version 1"
formV3 sectionDefinitionsDo: [:secDefinition |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
"instance" : {
"setUp" : "brunobb 07/22/2021 13:51",
"tearDown" : "brunobb 04/15/2021 13:54",
"testComponentVersions" : "brunobb 07/26/2021 14:38" } }
"testComponentVersions" : "brunobb 09/03/2021 13:19" } }
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ setUp
form := testRoot buildPublishedFormNamed: 'test-section-interation-name'
version: 1
title: 'Test Section Interation Name'
withXml: self newDefinitionTemplate formDefinition_agesic_test_section_interaction_name
withXml: testRoot newDefinitionTemplate formDefinition_agesic_test_section_interaction_name
in: application.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"class" : {
},
"instance" : {
"setUp" : "brunobb 07/26/2021 14:40",
"setUp" : "brunobb 09/03/2021 13:41",
"tearDown" : "brunobb 04/15/2021 13:54",
"testCustomIterationName" : "brunobb 04/15/2021 13:54",
"testIssue368" : "brunobb 04/15/2021 13:54",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ setUp
testRoot buildPublishedFormNamed: 'library'
version: 1
title: 'Library'
withXml: self newDefinitionTemplate formDefinition_orbeon_library
withXml: testRoot newDefinitionTemplate formDefinition_orbeon_library
in: orbeon.

testRoot buildPublishedFormNamed: 'library'
version: 1
title: 'Library'
withXml: self newDefinitionTemplate formDefinition_ue_library
withXml: testRoot newDefinitionTemplate formDefinition_ue_library
in: application.

form := testRoot buildPublishedFormNamed: 'library-composed-form'
id: UUID new asString
version: 1
title: 'Test Section Library Composed Forms'
publishedXml: self newDefinitionTemplate formDefinition_ue_library_composed_form
savedXml: self newDefinitionTemplate formSavedDefinition_ue_library_composed_form
publishedXml: testRoot newDefinitionTemplate formDefinition_ue_library_composed_form
savedXml: testRoot newDefinitionTemplate formSavedDefinition_ue_library_composed_form
in: application.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"class" : {
},
"instance" : {
"setUp" : "brunobb 07/26/2021 14:46",
"setUp" : "brunobb 09/03/2021 13:15",
"tearDown" : "brunobb 07/26/2021 14:50",
"testLibraryComponentIdentity" : "brunobb 04/15/2021 13:54",
"testSectionsStructure" : "brunobb 04/15/2021 13:54" } }
Loading

0 comments on commit 55a0c44

Please sign in to comment.