From 33605444be4de24bcdc24f7252167ad9e4e81594 Mon Sep 17 00:00:00 2001 From: James Welch Date: Fri, 17 May 2024 12:15:27 +0100 Subject: [PATCH 1/4] Update to use new code coverage plugin. Also re-enable zulip notifications --- Jenkinsfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9522a80..8db12cd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -133,11 +133,10 @@ pipeline { recordIssues enabledForFailure: true, tool: spotBugs(pattern: '**/reports/spotbugs/*.xml', useRankAsPriority: true) recordIssues enabledForFailure: true, tool: pmdParser(pattern: '**/reports/pmd/*.xml') - publishCoverage adapters: [jacocoAdapter('**/reports/jacoco/jacocoTestReport.xml')] + recordCoverage(tools: [[parser: 'JACOCO', pattern: '**/reports/jacoco/jacocoTestReport.xml']]) outputTestResults() - jacoco classPattern: '**/build/classes', execPattern: '**/build/jacoco/*.exec', sourceInclusionPattern: '**/*.java,**/*.groovy', sourcePattern: '**/src/main/groovy,**/grails-app/controllers,**/grails-app/domain,**/grails-app/DTOs,**/grails-app/services,**/grails-app/utils' - archiveArtifacts allowEmptyArchive: true, artifacts: '**/*.log' - //zulipNotification(topic: 'mdm-plugin-explorer') + jacoco classPattern: '**/build/classes', execPattern: '**/build/jacoco/*.exec', sourceInclusionPattern: '**/*.java,**/*.groovy', sourcePattern: '**/src/main/groovy,**/grails-app/controllers,**/grails-app/domain,**/grails-app/DTOs,**/grails-app/services,**/grails-app/utils' archiveArtifacts allowEmptyArchive: true, artifacts: '**/*.log' + zulipNotification(topic: 'mdm-plugin-explorer') } } } \ No newline at end of file From 20b6d47bbab29146fb02d98aff7b7c9e5ab3f215 Mon Sep 17 00:00:00 2001 From: James Welch Date: Fri, 17 May 2024 12:18:13 +0100 Subject: [PATCH 2/4] Fix mistake in modification --- Jenkinsfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8db12cd..8889fb8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -135,8 +135,9 @@ pipeline { recordCoverage(tools: [[parser: 'JACOCO', pattern: '**/reports/jacoco/jacocoTestReport.xml']]) outputTestResults() - jacoco classPattern: '**/build/classes', execPattern: '**/build/jacoco/*.exec', sourceInclusionPattern: '**/*.java,**/*.groovy', sourcePattern: '**/src/main/groovy,**/grails-app/controllers,**/grails-app/domain,**/grails-app/DTOs,**/grails-app/services,**/grails-app/utils' archiveArtifacts allowEmptyArchive: true, artifacts: '**/*.log' - zulipNotification(topic: 'mdm-plugin-explorer') + jacoco classPattern: '**/build/classes', execPattern: '**/build/jacoco/*.exec', sourceInclusionPattern: '**/*.java,**/*.groovy', sourcePattern: '**/src/main/groovy,**/grails-app/controllers,**/grails-app/domain,**/grails-app/DTOs,**/grails-app/services,**/grails-app/utils' + archiveArtifacts allowEmptyArchive: true, artifacts: '**/*.log' + //zulipNotification(topic: 'mdm-plugin-explorer') } } } \ No newline at end of file From 6a11dec6c181b9cead77d9f1ea2edf1912a37f10 Mon Sep 17 00:00:00 2001 From: James Welch Date: Fri, 17 May 2024 12:27:32 +0100 Subject: [PATCH 3/4] enable Zulip notification --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8889fb8..91ff635 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -137,7 +137,7 @@ pipeline { outputTestResults() jacoco classPattern: '**/build/classes', execPattern: '**/build/jacoco/*.exec', sourceInclusionPattern: '**/*.java,**/*.groovy', sourcePattern: '**/src/main/groovy,**/grails-app/controllers,**/grails-app/domain,**/grails-app/DTOs,**/grails-app/services,**/grails-app/utils' archiveArtifacts allowEmptyArchive: true, artifacts: '**/*.log' - //zulipNotification(topic: 'mdm-plugin-explorer') + zulipNotification(topic: 'mdm-plugin-explorer') } } } \ No newline at end of file From a362d6d89188be624a5c499fde9881517f0a5cce Mon Sep 17 00:00:00 2001 From: James Welch Date: Fri, 17 May 2024 15:10:47 +0100 Subject: [PATCH 4/4] =?UTF-8?q?Update=20to=20Mauro=20Core=205.4.0-SNAPSHOT?= =?UTF-8?q?=20and=20fix=202=20tests:=E2=80=A8-=20Paths=20are=20now=20retur?= =?UTF-8?q?ned=20in=20search=20results=E2=80=A8-=20Path=20to=20root=20data?= =?UTF-8?q?=20model=20should=20contain=20branch=20name=20/=20finalised=20v?= =?UTF-8?q?ersion=20number?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- .../plugins/explorer/ExplorerFunctionalSpec.groovy | 2 +- .../plugins/explorer/research/SearchFunctionalSpec.groovy | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 853ab0c..8638fb0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ targetCompatibility=17 artifactory_contextUrl=https://jenkins.cs.ox.ac.uk/artifactory mdmGradlePluginVersion=1.3.0 # Mauro Data Mapper -mdmCoreVersion=5.3.0 +mdmCoreVersion=5.4.0-SNAPSHOT # Grails grailsVersion=5.3.2 grailsGradlePluginVersion=5.3.0 diff --git a/src/integration-test/groovy/uk/ac/ox/softeng/maurodatamapper/plugins/explorer/ExplorerFunctionalSpec.groovy b/src/integration-test/groovy/uk/ac/ox/softeng/maurodatamapper/plugins/explorer/ExplorerFunctionalSpec.groovy index a1021af..78d232e 100644 --- a/src/integration-test/groovy/uk/ac/ox/softeng/maurodatamapper/plugins/explorer/ExplorerFunctionalSpec.groovy +++ b/src/integration-test/groovy/uk/ac/ox/softeng/maurodatamapper/plugins/explorer/ExplorerFunctionalSpec.groovy @@ -373,7 +373,7 @@ class ExplorerFunctionalSpec extends BaseFunctionalSpec { void 'root data model: should get root data model'() { given: loginUser('admin@maurodatamapper.com', 'password') - updateApiProperty('explorer.config.root_data_model_path', "fo:${rootFolder.label}|dm:${rootDataModel.label}") + updateApiProperty('explorer.config.root_data_model_path', "fo:${rootFolder.label}|dm:${rootDataModel.label}\$main") when: 'get the root data model' GET("/rootDataModel") diff --git a/src/integration-test/groovy/uk/ac/ox/softeng/maurodatamapper/plugins/explorer/research/SearchFunctionalSpec.groovy b/src/integration-test/groovy/uk/ac/ox/softeng/maurodatamapper/plugins/explorer/research/SearchFunctionalSpec.groovy index ebab047..4cc8c5f 100644 --- a/src/integration-test/groovy/uk/ac/ox/softeng/maurodatamapper/plugins/explorer/research/SearchFunctionalSpec.groovy +++ b/src/integration-test/groovy/uk/ac/ox/softeng/maurodatamapper/plugins/explorer/research/SearchFunctionalSpec.groovy @@ -394,6 +394,7 @@ class SearchFunctionalSpec extends BaseFunctionalSpec implements SecurityDefinit "domainType": "DataClass" } ], + "path": "dm:Search Functional Test Data Model$main|dc:patient|de:date_of_birth", "profileFields": [ { "fieldName":"Identifiable Data", @@ -498,6 +499,7 @@ class SearchFunctionalSpec extends BaseFunctionalSpec implements SecurityDefinit "domainType": "DataClass" } ], + "path":"dm:Search Functional Test Data Model$main|dc:diagnosis|de:diagnosis_date", "profileFields": [ { "fieldName": "Identifiable Data", @@ -626,6 +628,7 @@ class SearchFunctionalSpec extends BaseFunctionalSpec implements SecurityDefinit "domainType": "DataClass" } ], + "path":"dm:Search Functional Test Data Model$main|dc:lab_test|de:test_date", "profileFields": [ { "fieldName": "Identifiable Data",