Skip to content

Commit e7c9b71

Browse files
scmacdonscmacdon
committed
updated POM to use JDK 21
1 parent f0664f4 commit e7c9b71

7 files changed

Lines changed: 44 additions & 51 deletions

File tree

‎javav2/example_code/cloudtrail/src/test/java/CloudTrailTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ public static void setUp() {
3838
SecretValues values = gson.fromJson(json, SecretValues.class);
3939
trailName = values.getTrailName();
4040
s3BucketName = values.getS3BucketName();
41-
42-
// Uncomment this code block if you prefer using a config.properties file to
43-
// retrieve AWS values required for these tests.
4441
}
4542

4643
@Test

‎javav2/example_code/cloudwatch/src/test/java/CloudWatchTest.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,8 @@ public class CloudWatchTest {
4545
private static String dashboardJsonSc = "";
4646
private static String dashboardAddSc = "";
4747
private static String settingsSc = "";
48-
4948
private static String alarmName = "";
50-
5149
private static final CloudWatchActions cwActions = new CloudWatchActions();
52-
5350
private static Dimension myDimension = null;
5451

5552
@BeforeAll
@@ -91,7 +88,6 @@ public void testListNameSpaces() {
9188
logger.info("Test 2 passed");
9289
}
9390

94-
9591
@Test
9692
@Tag("IntegrationTest")
9793
@Order(3)

‎javav2/example_code/personalize/src/test/java/PersonalizeTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public static void setUp() {
6666
@Test
6767
@Tag("IntegrationTest")
6868
@Order(1)
69-
public void CreateSolution() {
69+
public void testCreateSolution() {
7070
solutionArn = CreateSolution.createPersonalizeSolution(personalizeClient, datasetGroupArn, solutionName,
7171
recipeArn);
7272
assertFalse(solutionArn.isEmpty());
@@ -76,23 +76,23 @@ public void CreateSolution() {
7676
@Test
7777
@Tag("IntegrationTest")
7878
@Order(2)
79-
public void ListSolutions() {
79+
public void testListSolutions() {
8080
assertDoesNotThrow(() -> ListSolutions.listAllSolutions(personalizeClient, datasetGroupArn));
8181
logger.info("Test 2 passed");
8282
}
8383

8484
@Test
8585
@Tag("IntegrationTest")
8686
@Order(3)
87-
public void DescribeSolution() {
87+
public void testDescribeSolution() {
8888
assertDoesNotThrow(() -> DescribeSolution.describeSpecificSolution(personalizeClient, solutionArn));
8989
logger.info("Test 3 passed");
9090
}
9191

9292
@Test
9393
@Tag("IntegrationTest")
9494
@Order(4)
95-
public void CreateCampaign() {
95+
public void testCreateCampaign() {
9696
campaignArn = CreateCampaign.createPersonalCompaign(personalizeClient, solutionVersionArn, campaignName);
9797
assertFalse(campaignArn.isEmpty());
9898
logger.info("Test 4 passed");
@@ -101,39 +101,39 @@ public void CreateCampaign() {
101101
@Test
102102
@Tag("IntegrationTest")
103103
@Order(5)
104-
public void ListCampaigns() {
104+
public void testListCampaigns() {
105105
assertDoesNotThrow(() -> ListCampaigns.listAllCampaigns(personalizeClient, existingSolutionArn));
106106
logger.info("Test 5 passed");
107107
}
108108

109109
@Test
110110
@Tag("IntegrationTest")
111111
@Order(6)
112-
public void DescribeRecipe() {
112+
public void testDescribeRecipe() {
113113
assertDoesNotThrow(() -> DescribeRecipe.describeSpecificRecipe(personalizeClient, recipeArn));
114114
logger.info("Test 6 passed");
115115
}
116116

117117
@Test
118118
@Tag("IntegrationTest")
119119
@Order(7)
120-
public void ListRecipes() {
120+
public void testListRecipes() {
121121
assertDoesNotThrow(() -> ListRecipes.listAllRecipes(personalizeClient));
122122
logger.info("Test 7 passed");
123123
}
124124

125125
@Test
126126
@Tag("IntegrationTest")
127127
@Order(8)
128-
public void ListDatasetGroups() {
128+
public void testListDatasetGroups() {
129129
assertDoesNotThrow(() -> ListDatasetGroups.listDSGroups(personalizeClient));
130130
logger.info("Test 8 passed");
131131
}
132132

133133
@Test
134134
@Tag("IntegrationTest")
135135
@Order(9)
136-
public void DeleteSolution() {
136+
public void testDeleteSolution() {
137137
assertDoesNotThrow(() -> DeleteSolution.deleteGivenSolution(personalizeClient, solutionArn));
138138
logger.info("Test 9 passed");
139139
}
@@ -142,7 +142,7 @@ public void DeleteSolution() {
142142
@Test
143143
@Tag("IntegrationTest")
144144
@Order(10)
145-
public void DeleteCampaign() {
145+
public void testDeleteCampaign() {
146146
assertDoesNotThrow(() -> {
147147
DeleteCampaign.waitForCampaignToBeDeletable(personalizeClient, campaignArn);
148148
DeleteCampaign.deleteSpecificCampaign(personalizeClient, campaignArn);

‎javav2/example_code/polly/src/test/java/AWSPollyTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@ public static void setUp() {
3232
@Test
3333
@Tag("IntegrationTest")
3434
@Order(1)
35-
public void describeVoicesSample() {
35+
public void testDescribeVoicesSample() {
3636
assertDoesNotThrow(() ->DescribeVoicesSample.describeVoice(polly));
37-
logger.info("describeVoicesSample test passed");
37+
logger.info("Test 1 passed");
3838
}
3939

4040
@Test
4141
@Tag("IntegrationTest")
4242
@Order(2)
43-
public void listLexicons() {
43+
public void testListLexicons() {
4444
assertDoesNotThrow(() ->ListLexicons.listLexicons(polly));
45-
logger.info("listLexicons test passed");
45+
logger.info("Test 2 passed");
4646
}
4747
}

‎javav2/example_code/quicksight/src/test/java/QuickSightTest.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -51,66 +51,66 @@ public static void setUp() {
5151
@Test
5252
@Tag("IntegrationTest")
5353
@Order(1)
54-
public void DescribeAnalysis() {
54+
public void testDescribeAnalysis() {
5555
assertDoesNotThrow(() -> DescribeAnalysis.describeSpecificAnalysis(qsClient, account, analysisId));
56-
logger.info("DescribeAnalysis test passed");
56+
logger.info("Test 1 passed");
5757
}
5858

5959
@Test
6060
@Tag("IntegrationTest")
6161
@Order(2)
62-
public void DescribeDashboard() {
62+
public void testDescribeDashboard() {
6363
assertDoesNotThrow(() -> DescribeDashboard.describeSpecificDashboard(qsClient, account, dashboardId));
64-
logger.info("DescribeDashboard test passed");
64+
logger.info("Test 2 passed");
6565
}
6666

6767
@Test
6868
@Tag("IntegrationTest")
6969
@Order(3)
70-
public void DescribeTemplate() {
70+
public void testDescribeTemplate() {
7171
assertDoesNotThrow(() -> DescribeTemplate.describeSpecificTemplate(qsClient, account, templateId));
72-
logger.info("DescribeTemplate test passed");
72+
logger.info("Test 3 passed");
7373
}
7474

7575
@Test
7676
@Tag("IntegrationTest")
7777
@Order(4)
78-
public void ListThemes() {
78+
public void testListThemes() {
7979
assertDoesNotThrow(() -> ListThemes.listAllThemes(qsClient, account));
80-
logger.info("ListThemes test passed");
80+
logger.info("Test 4 passed");
8181
}
8282

8383
@Test
8484
@Tag("IntegrationTest")
85-
@Order(6)
86-
public void ListAnalyses() {
85+
@Order(5)
86+
public void testListAnalyses() {
8787
assertDoesNotThrow(() -> ListAnalyses.listAllAnAnalyses(qsClient, account));
88-
logger.info("ListAnalyses test passed");
88+
logger.info("Test 5 passed");
8989
}
9090

9191
@Test
9292
@Tag("IntegrationTest")
93-
@Order(7)
94-
public void ListDashboards() {
93+
@Order(6)
94+
public void testListDashboards() {
9595
assertDoesNotThrow(() -> ListDashboards.listAllDashboards(qsClient, account));
96-
logger.info("ListDashboards test passed");
96+
logger.info("Test 6 passed");
9797
}
9898

9999
@Test
100100
@Tag("IntegrationTest")
101-
@Order(8)
102-
public void ListTemplates() {
101+
@Order(7)
102+
public void testListTemplates() {
103103
assertDoesNotThrow(() -> ListTemplates.listAllTemplates(qsClient, account));
104-
logger.info("ListTemplates test passed");
104+
logger.info("Test 7 passed");
105105
}
106106

107107
@Test
108108
@Tag("IntegrationTest")
109-
@Order(9)
110-
public void UpdateDashboard() {
109+
@Order(8)
110+
public void testUpdateDashboard() {
111111
assertDoesNotThrow(
112112
() -> UpdateDashboard.updateSpecificDashboard(qsClient, account, dashboardId, dataSetArn, analysisArn));
113-
logger.info("UpdateDashboard test passed");
113+
logger.info("Test 8 passed");
114114
}
115115

116116
private static String getSecretValues() {

‎javav2/example_code/rds/src/test/java/AmazonRDSTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,31 +83,31 @@ public void testCreateDBInstance() {
8383
User user = gson.fromJson(String.valueOf(RDSScenario.getSecretValues(secretDBName)), User.class);
8484
assertDoesNotThrow(() -> CreateDBInstance.createDatabaseInstance(rdsClient, dbInstanceIdentifier, dbName,
8585
user.getUsername(), user.getPassword()));
86-
logger.info("CreateDBInstance test passed");
86+
logger.info("\nTest 1 passed");
8787
}
8888

8989
@Test
9090
@Tag("IntegrationTest")
9191
@Order(2)
9292
public void testWaitForInstanceReady() {
9393
assertDoesNotThrow(() -> CreateDBInstance.waitForInstanceReady(rdsClient, dbInstanceIdentifier));
94-
logger.info("waitForInstanceReady test passed");
94+
logger.info("\nTest 2 passed");
9595
}
9696

9797
@Test
9898
@Tag("IntegrationTest")
9999
@Order(3)
100100
public void testDescribeAccountAttributes() {
101101
assertDoesNotThrow(() -> DescribeAccountAttributes.getAccountAttributes(rdsClient));
102-
logger.info("DescribeAccountAttributes test passed");
102+
logger.info("\nTest 3 passed");
103103
}
104104

105105
@Test
106106
@Tag("IntegrationTest")
107107
@Order(4)
108108
public void testDescribeDBInstances() {
109109
assertDoesNotThrow(() -> DescribeDBInstances.describeInstances(rdsClient));
110-
logger.info("DescribeDBInstances test passed");
110+
logger.info("\nTest 4 passed");
111111
}
112112

113113
@Test
@@ -116,23 +116,23 @@ public void testDescribeDBInstances() {
116116
public void testModifyDBInstance() {
117117
assertDoesNotThrow(
118118
() -> ModifyDBInstance.updateIntance(rdsClient, dbInstanceIdentifier, newMasterUserPassword));
119-
logger.info("ModifyDBInstance test passed");
119+
logger.info("\nTest 5 passed");
120120
}
121121

122122
@Test
123123
@Order(6)
124124
public void testCreateDBSnapshot() {
125125
assertDoesNotThrow(
126126
() -> CreateDBSnapshot.createSnapshot(rdsClient, dbInstanceIdentifier, dbSnapshotIdentifier));
127-
logger.info("CreateDBSnapshot test passed");
127+
logger.info("\nTest 6 passed");
128128
}
129129

130130
@Test
131131
@Tag("IntegrationTest")
132132
@Order(7)
133133
public void testDeleteDBInstance() {
134134
assertDoesNotThrow(() -> DeleteDBInstance.deleteDatabaseInstance(rdsClient, dbInstanceIdentifier));
135-
logger.info("DeleteDBInstance test passed");
135+
logger.info("\nTest 7 passed");
136136
}
137137

138138
@Test
@@ -159,7 +159,7 @@ public void testRDSScenario() {
159159
() -> RDSScenario.waitForSnapshotReady(rdsClient, dbInstanceIdentifierSc, dbSnapshotIdentifierSc));
160160
assertDoesNotThrow(() -> RDSScenario.deleteDatabaseInstance(rdsClient, dbInstanceIdentifierSc));
161161
assertDoesNotThrow(() -> RDSScenario.deleteParaGroup(rdsClient, dbGroupNameSc, dbARN));
162-
System.out.println("TestRDSScenario test passed");
162+
logger.info("\nTest 8 passed");
163163
}
164164

165165
@Test
@@ -209,7 +209,7 @@ public void testAuroraScenario() throws InterruptedException {
209209
assertDoesNotThrow(() -> AuroraScenario.deleteCluster(rdsClient, dbInstanceClusterIdentifier));
210210
System.out.println("16. Delete the DB cluster group");
211211
assertDoesNotThrow(() -> AuroraScenario.deleteDBClusterGroup(rdsClient, dbClusterGroupName, clusterDBARN));
212-
System.out.println("TestAuroraScenario test passed");
212+
logger.info("\nTest 9 passed");
213213
}
214214

215215
private static String getSecretValues() {

‎javav2/example_code/ses/src/test/java/AWSSesTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public void testListEmailIdentities() {
110110
@Test
111111
@Tag("IntegrationTest")
112112
@Order(6)
113-
public void ListEmailTemplates() {
113+
public void testListEmailTemplates() {
114114
assertDoesNotThrow(() -> ListTemplates.listAllTemplates(sesv2Client));
115115
logger.info("Test 6 passed");
116116
}

0 commit comments

Comments
 (0)