Skip to content

Commit f17f59f

Browse files
bnusunnybnusunny
committed
chore(test): more updates to integration tests
1 parent 9fbd6e4 commit f17f59f

39 files changed

Lines changed: 1982 additions & 35 deletions

‎tests/integration/buildcmd/build_integ_base.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -634,6 +634,7 @@ class BuildIntegJavaBase(BuildIntegBase):
634634
FUNCTION_LOGICAL_ID = "Function"
635635
USING_GRADLE_PATH = os.path.join("Java", "gradle")
636636
USING_GRADLEW_PATH = os.path.join("Java", "gradlew")
637+
USING_GRADLEW_IN_CONTAINER_PATH = os.path.join("Java", "gradlew-in-container")
637638
USING_GRADLE_KOTLIN_PATH = os.path.join("Java", "gradle-kotlin")
638639
USING_MAVEN_PATH = os.path.join("Java", "maven")
639640

‎tests/integration/buildcmd/test_build_cmd.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -998,7 +998,7 @@ class TestBuildWithDedupBuilds(DedupBuildIntegBase):
998998
# container
999999
(
10001000
"use_container",
1001-
"Java/gradlew/8",
1001+
"Java/gradlew-in-container/8",
10021002
"aws.example.Hello::myHandler",
10031003
"aws.example.SecondFunction::myHandler",
10041004
"java8.al2",
@@ -1322,7 +1322,7 @@ class TestParallelBuilds(DedupBuildIntegBase):
13221322
# container
13231323
(
13241324
"use_container",
1325-
"Java/gradlew/8",
1325+
"Java/gradlew-in-container/8",
13261326
"aws.example.Hello::myHandler",
13271327
"aws.example.SecondFunction::myHandler",
13281328
"java8.al2",

‎tests/integration/buildcmd/test_build_cmd_arm64.py‎

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -311,34 +311,35 @@ def test_building_java_in_container_with_arm64_architecture(
311311
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_MAVEN,
312312
BuildIntegJavaBase.EXPECTED_MAVEN_DEPENDENCIES,
313313
),
314-
(
315-
"java25",
316-
"25",
317-
BuildIntegJavaBase.USING_GRADLE_PATH,
318-
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
319-
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
320-
),
321-
(
322-
"java25",
323-
"25",
324-
BuildIntegJavaBase.USING_GRADLEW_PATH,
325-
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
326-
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
327-
),
328-
(
329-
"java25",
330-
"25",
331-
BuildIntegJavaBase.USING_GRADLE_KOTLIN_PATH,
332-
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
333-
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
334-
),
335-
(
336-
"java25",
337-
"25",
338-
BuildIntegJavaBase.USING_MAVEN_PATH,
339-
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_MAVEN,
340-
BuildIntegJavaBase.EXPECTED_MAVEN_DEPENDENCIES,
341-
),
314+
# skip these tests until java25 build image is released
315+
# (
316+
# "java25",
317+
# "25",
318+
# BuildIntegJavaBase.USING_GRADLE_PATH,
319+
# BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
320+
# BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
321+
# ),
322+
# (
323+
# "java25",
324+
# "25",
325+
# BuildIntegJavaBase.USING_GRADLEW_PATH,
326+
# BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
327+
# BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
328+
# ),
329+
# (
330+
# "java25",
331+
# "25",
332+
# BuildIntegJavaBase.USING_GRADLE_KOTLIN_PATH,
333+
# BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
334+
# BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
335+
# ),
336+
# (
337+
# "java25",
338+
# "25",
339+
# BuildIntegJavaBase.USING_MAVEN_PATH,
340+
# BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_MAVEN,
341+
# BuildIntegJavaBase.EXPECTED_MAVEN_DEPENDENCIES,
342+
# ),
342343
]
343344
)
344345
@skipIf(SKIP_DOCKER_TESTS or SKIP_DOCKER_BUILD, SKIP_DOCKER_MESSAGE)

‎tests/integration/buildcmd/test_build_cmd_java.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class TestBuildCommand_Java(BuildIntegJavaBase):
3737
(
3838
"java8.al2",
3939
"8",
40-
BuildIntegJavaBase.USING_GRADLEW_PATH,
40+
BuildIntegJavaBase.USING_GRADLEW_IN_CONTAINER_PATH,
4141
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
4242
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
4343
),
@@ -65,7 +65,7 @@ class TestBuildCommand_Java(BuildIntegJavaBase):
6565
(
6666
"java11",
6767
"11",
68-
BuildIntegJavaBase.USING_GRADLEW_PATH,
68+
BuildIntegJavaBase.USING_GRADLEW_IN_CONTAINER_PATH,
6969
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
7070
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
7171
),
@@ -93,7 +93,7 @@ class TestBuildCommand_Java(BuildIntegJavaBase):
9393
(
9494
"java17",
9595
"17",
96-
BuildIntegJavaBase.USING_GRADLEW_PATH,
96+
BuildIntegJavaBase.USING_GRADLEW_IN_CONTAINER_PATH,
9797
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
9898
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
9999
),
@@ -138,7 +138,7 @@ def test_building_java_in_container(
138138
(
139139
"java21",
140140
"21",
141-
BuildIntegJavaBase.USING_GRADLEW_PATH,
141+
BuildIntegJavaBase.USING_GRADLEW_IN_CONTAINER_PATH,
142142
BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
143143
BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
144144
),
@@ -167,7 +167,7 @@ def test_building_java_in_container(
167167
# (
168168
# "java25",
169169
# "25",
170-
# BuildIntegJavaBase.USING_GRADLEW_PATH,
170+
# BuildIntegJavaBase.USING_GRADLEW_IN_CONTAINER_PATH,
171171
# BuildIntegJavaBase.EXPECTED_FILES_PROJECT_MANIFEST_GRADLE,
172172
# BuildIntegJavaBase.EXPECTED_GRADLE_DEPENDENCIES,
173173
# ),

‎tests/integration/testdata/buildcmd/Java/gradlew-in-container/11/build.gradle‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
plugins {
2+
id 'java'
3+
}
4+
5+
repositories {
6+
mavenCentral()
7+
}
8+
9+
dependencies {
10+
implementation 'software.amazon.awssdk:annotations:2.1.0'
11+
implementation 'com.amazonaws:aws-lambda-java-core:1.1.0'
12+
}
13+
14+
java.sourceCompatibility = JavaVersion.VERSION_11
15+
java.targetCompatibility = JavaVersion.VERSION_11

‎tests/integration/testdata/buildcmd/Java/gradlew-in-container/11/gradle/wrapper/gradle-wrapper.jar‎

62.2 KB
Binary file not shown.

‎tests/integration/testdata/buildcmd/Java/gradlew-in-container/11/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
6+
zipStoreBase=GRADLE_USER_HOME
7+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)