Skip to content

Commit a7374a5

Browse files
daggerokdaggerok
committed
#35 Add SoapUi Pro 5.1.2 support.
1 parent 428a68f commit a7374a5

19 files changed

+178
-61
lines changed

‎build.gradle‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
buildscript {
22
ext {
3-
soapUIVersion = '5.3.0'
3+
soapUIVersion = '5.1.2'
4+
findbugsVersion = '2.0.0'
45
jgoodiesBindingVersion = '2.0.1'
56
jgoodiesFormsVersion = '1.0.7'
67
jgoodiesLooksVersion = '2.2.0'
78
gradleApiVersion = 2.12
89
projectUrl = 'https://github.com/byte-shifter-ltd/soapui-gradle-plugin'
9-
info = 'Gradle plugin for running SoapUI test projects using testrunner'
10+
description = 'Gradle plugin for running SoapUI test projects using testrunner'
1011
}
1112
apply from: "$rootDir/gradle/repositories.gradle"
1213
}

‎gradle/pluginPortal.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
group = 'io.byteshifter'
2-
version = "${soapUIVersion}.RELEASE"
2+
version = "${soapUIVersion}.PRO-SNAPSHOT"
33

44
pluginBundle {
55
website = "$project.projectUrl"
66
vcsUrl = "${project.projectUrl}.git"
7-
description = "$project.info"
7+
description = project.description
88
tags = [
99
'soapui',
1010
'testing',
@@ -16,7 +16,7 @@ pluginBundle {
1616
plugins {
1717
soapuiPlugin {
1818
id = "${group}.soapui"
19-
displayName = "$project.info"
19+
description = displayName = project.description
2020
}
2121
}
2222
}

‎gradle/repositories.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ repositories {
66
mavenCentral()
77
maven { url 'https://plugins.gradle.org/m2/' }
88
maven { url 'http://smartbearsoftware.com/repository/maven2/' }
9+
maven { url 'http://java.net/projects/maven-repository/' }
910
}
1011
}

‎gradle/soapUIPlugin.gradle‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,25 @@ dependencies {
1616
* Try use approach like SmartBear is using to solve jar-hell issue using for theirs maven plugin.
1717
* @see: http://smartbearsoftware.com/repository/maven2/com/smartbear/soapui/soapui-maven-plugin/5.3.0/soapui-maven-plugin-5.3.0.pom
1818
*/
19-
compile("com.smartbear.soapui:soapui:$soapUIVersion") {
19+
compile "com.smartbear.soapui:soapui:$soapUIVersion", {
2020
exclude group: 'com.jgoodies', module: 'forms'
2121
exclude group: 'com.jgoodies', module: 'looks'
2222
exclude group: 'com.jgoodies', module: 'binding'
2323
exclude group: 'org.codehaus.groovy' // SoapUI 5.3.0 uses groovy-all-2.1.7.jar
2424
}
2525

26-
testCompile('com.netflix.nebula:nebula-test:3.1.0') {
26+
// see http://smartbearsoftware.com/repository/maven2/com/smartbear/soapui/soapui-pro-maven-plugin/5.1.2/soapui-pro-maven-plugin-5.1.2.pom
27+
compile "com.smartbear.soapui:soapui-pro:$soapUIVersion"
28+
compile 'opencsv:opencsv:1.8'
29+
compile 'jasperreports:jasperreports:4.0.2'
30+
compile 'net-components:netcomponents:1.3.8a'
31+
compile 'idw:idw:1.6.1'
32+
compile 'net.sourceforge.jexcelapi:jxl:2.6.12'
33+
34+
runtime "com.google.code.findbugs:annotations:$findbugsVersion"
35+
runtime "com.google.code.findbugs:jsr305:$findbugsVersion"
36+
37+
testCompile 'com.netflix.nebula:nebula-test:3.1.0', {
2738
exclude group: 'org.codehaus.groovy'
2839
}
2940
}
@@ -37,3 +48,7 @@ configurations.all {
3748
'org.spockframework:spock-core:1.0-groovy-2.4'
3849
}
3950
}
51+
52+
apply plugin: 'base'
53+
54+
defaultTasks 'build'

‎src/main/groovy/io/byteshifter/plugins/soapui/SoapUIPlugin.groovy‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,11 @@ class SoapUIPlugin implements Plugin<Project> {
9393
conventionMapping.junitReport = { soapUIPluginExtension.test.junitReport }
9494
conventionMapping.testFailIgnore = { soapUIPluginExtension.test.testFailIgnore }
9595
conventionMapping.saveAfterRun = { soapUIPluginExtension.test.saveAfterRun }
96+
// pro
97+
conventionMapping.environment = { soapUIPluginExtension.test.environment }
98+
conventionMapping.reportName = { soapUIPluginExtension.test.reportName }
99+
conventionMapping.reportFormats = { soapUIPluginExtension.test.reportFormats }
100+
conventionMapping.openReport = { soapUIPluginExtension.test.openReport }
96101
}
97102
}
98103

@@ -134,6 +139,9 @@ class SoapUIPlugin implements Plugin<Project> {
134139
conventionMapping.projectProperties = { soapUIPluginExtension.mock.projectProperties }
135140
conventionMapping.saveAfterRun = { soapUIPluginExtension.mock.saveAfterRun }
136141
conventionMapping.soapuiProperties = { soapUIPluginExtension.mock.soapuiProperties }
142+
// pro
143+
conventionMapping.outputFolder = { soapUIPluginExtension.mock.outputFolder }
144+
conventionMapping.openReport = { soapUIPluginExtension.mock.openReport }
137145
}
138146
}
139147

@@ -165,6 +173,11 @@ class SoapUIPlugin implements Plugin<Project> {
165173
conventionMapping.loadTest = { soapUIPluginExtension.load.loadTest }
166174
conventionMapping.limit = { soapUIPluginExtension.load.limit }
167175
conventionMapping.threadCount = { soapUIPluginExtension.load.threadCount }
176+
// pro
177+
conventionMapping.environment = { soapUIPluginExtension.test.environment }
178+
conventionMapping.reportName = { soapUIPluginExtension.test.reportName }
179+
conventionMapping.reportFormats = { soapUIPluginExtension.test.reportFormats }
180+
conventionMapping.openReport = { soapUIPluginExtension.test.openReport }
168181
}
169182
}
170183

@@ -200,6 +213,11 @@ class SoapUIPlugin implements Plugin<Project> {
200213
conventionMapping.junitReport = { soapUIPluginExtension.security.junitReport }
201214
conventionMapping.testFailIgnore = { soapUIPluginExtension.security.testFailIgnore }
202215
conventionMapping.saveAfterRun = { soapUIPluginExtension.security.saveAfterRun }
216+
// pro
217+
conventionMapping.environment = { soapUIPluginExtension.security.environment }
218+
conventionMapping.reportName = { soapUIPluginExtension.security.reportName }
219+
conventionMapping.reportFormats = { soapUIPluginExtension.security.reportFormats }
220+
conventionMapping.openReport = { soapUIPluginExtension.security.openReport }
203221
}
204222
}
205223
}

‎src/main/groovy/io/byteshifter/plugins/soapui/extensions/SoapUILoadConvention.groovy‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,10 @@ class SoapUILoadConvention {
5050
boolean saveAfterRun
5151
boolean printReport
5252
String outputFolder
53+
54+
// pro
55+
String environment // ("E", true, "Sets the environment")
56+
String reportName // ("R", true, "Report to Generate")
57+
String[] reportFormats // ("F", true, "Report format. Used with -R. Valid options PDF, XLS, HTML, RTF, CSV, TXT, and XML (comma-separated)")
58+
boolean openReport // ("o", false, "Opens generated report(s) in a browser")
5359
}

‎src/main/groovy/io/byteshifter/plugins/soapui/extensions/SoapUIMockConvention.groovy‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,9 @@ class SoapUIMockConvention {
3838
String[] projectProperties
3939
boolean saveAfterRun
4040
Properties soapuiProperties
41+
42+
// pro:
43+
// ("g", false, "Sets the output to include Coverage HTML reports")
44+
String outputFolder // ("f", true, "Sets the output folder to export results to")
45+
boolean openReport // ("o", false, "Opens the Coverage Report in a browser (with the -g option)")
4146
}

‎src/main/groovy/io/byteshifter/plugins/soapui/extensions/SoapUIPluginExtension.groovy‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ package io.byteshifter.plugins.soapui.extensions
2828
* @author Sion Williams
2929
*/
3030
class SoapUIPluginExtension {
31-
3231
// the following convention properties are added dynamically when the plugin is applied:
3332
// SoapUIToolConvention tool
3433
// SoapUISecurityConvention security

‎src/main/groovy/io/byteshifter/plugins/soapui/extensions/SoapUISecurityConvention.groovy‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,10 @@ class SoapUISecurityConvention {
5555
boolean printReport
5656
String outputFolder
5757
boolean testFailIgnore
58+
59+
// pro
60+
String environment // ("E", true, "Sets the environment")
61+
String reportName // ("R", true, "Report to Generate");
62+
String[] reportFormats // ("F", true, "Report format. Used with -R. Valid options PDF, XLS, HTML, RTF, CSV, TXT, and XML (comma-separated)");
63+
boolean openReport // ("o", false, "Opens generated report(s) in a browser");
5864
}

‎src/main/groovy/io/byteshifter/plugins/soapui/extensions/SoapUITestConvention.groovy‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,12 @@ class SoapUITestConvention {
5353
boolean saveAfterRun
5454
boolean printReport
5555
boolean testFailIgnore
56+
57+
// pro
58+
// ("g", false, "Sets the output to include Coverage HTML reports");
59+
// ("l", true, "Installs an activated SoapUI Pro license file")
60+
String environment // ("E", true, "Sets the environment")
61+
String reportName // ("R", true, "Report to Generate")
62+
String[] reportFormats // ("F", true, "Report format. Used with -R. Valid options PDF, XLS, HTML, RTF, CSV, TXT, and XML (comma-separated)")
63+
boolean openReport // ("o", false, "Opens generated report(s) in a browser")
5664
}

0 commit comments

Comments
 (0)