@@ -14,6 +14,7 @@ import org.gradle.testkit.runner.BuildResult
14
14
import org.gradle.testkit.runner.TaskOutcome
15
15
16
16
class AbstractTransportVersionFuncTest extends AbstractGradleFuncTest {
17
+
17
18
def javaResource (String project , String path , String content ) {
18
19
file(" ${ project} /src/main/resources/${ path} " ). withWriter { writer ->
19
20
writer << content
@@ -45,10 +46,18 @@ class AbstractTransportVersionFuncTest extends AbstractGradleFuncTest {
45
46
return referableAndReferencedTransportVersion(name, ids, " Test${ name.capitalize()} " )
46
47
}
47
48
48
- def referableAndReferencedTransportVersion (String name , String ids , String classname ) {
49
+ def referencedTransportVersion (String name ) {
50
+ referencedTransportVersion(name, " Test${ name.capitalize()} " )
51
+ }
52
+
53
+ def referencedTransportVersion (String name , String classname ) {
49
54
javaSource(" myserver" , " org.elasticsearch" , classname, " " , """
50
55
static final TransportVersion usage = TransportVersion.fromName("${ name} ");
51
56
""" )
57
+ }
58
+
59
+ def referableAndReferencedTransportVersion (String name , String ids , String classname ) {
60
+ referencedTransportVersion(name, classname)
52
61
referableTransportVersion(name, ids)
53
62
}
54
63
@@ -74,6 +83,20 @@ class AbstractTransportVersionFuncTest extends AbstractGradleFuncTest {
74
83
assertOutputContains(result. output, expectedOutput)
75
84
}
76
85
86
+ void assertReferableDefinition (String name , String content ) {
87
+ File definitionFile = file(" myserver/src/main/resources/transport/definitions/referable/${ name} .csv" )
88
+ assert definitionFile. exists()
89
+ assert definitionFile. text. strip() == content
90
+ }
91
+
92
+ void assertReferableDefinitionDoesNotExist (String name ) {
93
+ assert file(" myserver/src/main/resources/transport/definitions/referable/${ name} .csv" ). exists() == false
94
+ }
95
+
96
+ void assertUpperBound (String name , String content ) {
97
+ assert file(" myserver/src/main/resources/transport/upper_bounds/${ name} .csv" ). text. strip() == content
98
+ }
99
+
77
100
def setup () {
78
101
configurationCacheCompatible = false
79
102
internalBuild()
@@ -86,12 +109,17 @@ class AbstractTransportVersionFuncTest extends AbstractGradleFuncTest {
86
109
apply plugin: 'java-library'
87
110
apply plugin: 'elasticsearch.transport-version-references'
88
111
apply plugin: 'elasticsearch.transport-version-resources'
112
+
113
+ tasks.named('generateTransportVersionDefinition') {
114
+ currentUpperBoundName = '9.2'
115
+ }
89
116
"""
90
117
referableTransportVersion(" existing_91" , " 8012000" )
91
118
referableTransportVersion(" existing_92" , " 8123000,8012001" )
92
119
unreferableTransportVersion(" initial_9_0_0" , " 8000000" )
93
120
transportVersionUpperBound(" 9.2" , " existing_92" , " 8123000" )
94
121
transportVersionUpperBound(" 9.1" , " existing_92" , " 8012001" )
122
+ transportVersionUpperBound(" 9.0" , " initial_9_0_0" , " 8000000" )
95
123
// a mock version of TransportVersion, just here so we can compile Dummy.java et al
96
124
javaSource(" myserver" , " org.elasticsearch" , " TransportVersion" , " " , """
97
125
public static TransportVersion fromName(String name) {
0 commit comments