Skip to content

Commit acee768

Browse files
scmacdonscmacdon
committed
updated POM files
1 parent e762a7d commit acee768

File tree

5 files changed

+32
-111
lines changed

5 files changed

+32
-111
lines changed

‎javav2/example_code/appautoscale/pom.xml‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,9 @@
4242
<dependencies>
4343
<dependency>
4444
<groupId>org.junit.jupiter</groupId>
45-
<artifactId>junit-jupiter-api</artifactId>
45+
<artifactId>junit-jupiter</artifactId>
4646
<scope>test</scope>
4747
</dependency>
48-
<dependency>
49-
<groupId>org.junit.jupiter</groupId>
50-
<artifactId>junit-jupiter-engine</artifactId>
51-
<scope>test</scope>
52-
</dependency>
53-
<dependency>
54-
<groupId>org.junit.platform</groupId>
55-
<artifactId>junit-platform-commons</artifactId>
56-
<version>1.9.2</version>
57-
</dependency>
5848
<dependency>
5949
<groupId>software.amazon.awssdk</groupId>
6050
<artifactId>secretsmanager</artifactId>
@@ -68,12 +58,6 @@
6858
<artifactId>gson</artifactId>
6959
<version>2.10.1</version>
7060
</dependency>
71-
<dependency>
72-
<groupId>org.junit.platform</groupId>
73-
<artifactId>junit-platform-launcher</artifactId>
74-
<version>1.9.2</version>
75-
<scope>test</scope>
76-
</dependency>
7761
<dependency>
7862
<groupId>software.amazon.awssdk</groupId>
7963
<artifactId>autoscaling</artifactId>
@@ -91,4 +75,4 @@
9175
<artifactId>ssooidc</artifactId>
9276
</dependency>
9377
</dependencies>
94-
</project>
78+
</project>

‎javav2/example_code/appsync/pom.xml‎

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<groupId>org.example</groupId>
77
<artifactId>AppSyncJ2</artifactId>
88
<version>1.0-SNAPSHOT</version>
9-
<properties>
9+
<properties>
1010
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1111
<java.version>17</java.version>
1212
<maven.compiler.target>17</maven.compiler.target>
@@ -54,12 +54,7 @@
5454
<dependencies>
5555
<dependency>
5656
<groupId>org.junit.jupiter</groupId>
57-
<artifactId>junit-jupiter-api</artifactId>
58-
<scope>test</scope>
59-
</dependency>
60-
<dependency>
61-
<groupId>org.junit.jupiter</groupId>
62-
<artifactId>junit-jupiter-engine</artifactId>
57+
<artifactId>junit-jupiter</artifactId>
6358
<scope>test</scope>
6459
</dependency>
6560
<dependency>
@@ -71,17 +66,6 @@
7166
<artifactId>gson</artifactId>
7267
<version>2.10.1</version>
7368
</dependency>
74-
<dependency>
75-
<groupId>org.junit.platform</groupId>
76-
<artifactId>junit-platform-commons</artifactId>
77-
<version>1.9.2</version>
78-
</dependency>
79-
<dependency>
80-
<groupId>org.junit.platform</groupId>
81-
<artifactId>junit-platform-launcher</artifactId>
82-
<version>1.9.2</version>
83-
<scope>test</scope>
84-
</dependency>
8569
<dependency>
8670
<groupId>software.amazon.awssdk</groupId>
8771
<artifactId>appsync</artifactId>
@@ -95,4 +79,5 @@
9579
<artifactId>ssooidc</artifactId>
9680
</dependency>
9781
</dependencies>
98-
</project>
82+
</project>
83+

‎javav2/example_code/athena/pom.xml‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
21
<project xmlns="http://maven.apache.org/POM/4.0.0"
32
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
43
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -18,9 +17,6 @@
1817
<groupId>org.apache.maven.plugins</groupId>
1918
<artifactId>maven-surefire-plugin</artifactId>
2019
<version>2.22.1</version>
21-
<configuration>
22-
<groups>IntegrationTest</groups>
23-
</configuration>
2420
</plugin>
2521
</plugins>
2622
</build>
@@ -49,22 +45,6 @@
4945
<scope>test</scope>
5046
</dependency>
5147
<dependency>
52-
<groupId>org.junit.jupiter</groupId>
53-
<artifactId>junit-jupiter-engine</artifactId>
54-
<scope>test</scope>
55-
</dependency>
56-
<dependency>
57-
<groupId>org.junit.platform</groupId>
58-
<artifactId>junit-platform-commons</artifactId>
59-
<version>1.9.2</version>
60-
</dependency>
61-
<dependency>
62-
<groupId>org.junit.platform</groupId>
63-
<artifactId>junit-platform-launcher</artifactId>
64-
<version>1.9.2</version>
65-
<scope>test</scope>
66-
</dependency>
67-
<dependency>
6848
<groupId>software.amazon.awssdk</groupId>
6949
<artifactId>athena</artifactId>
7050
</dependency>
@@ -77,4 +57,4 @@
7757
<artifactId>ssooidc</artifactId>
7858
</dependency>
7959
</dependencies>
80-
</project>
60+
</project>

‎javav2/example_code/athena/src/test/java/AmazonAthenaTest.java‎

Lines changed: 25 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0
3+
34
import aws.example.athena.*;
45
import org.junit.jupiter.api.*;
56
import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider;
@@ -21,9 +22,9 @@ public class AmazonAthenaTest {
2122
@BeforeAll
2223
public static void setUp() throws IOException {
2324
athenaClient = AthenaClient.builder()
24-
.region(Region.US_WEST_2)
25-
.credentialsProvider(ProfileCredentialsProvider.create())
26-
.build();
25+
.region(Region.US_WEST_2)
26+
.credentialsProvider(ProfileCredentialsProvider.create())
27+
.build();
2728

2829
try (InputStream input = AmazonAthenaTest.class.getClassLoader().getResourceAsStream("config.properties")) {
2930

@@ -45,70 +46,52 @@ public static void setUp() throws IOException {
4546
ex.printStackTrace();
4647
}
4748
}
48-
@Test
49-
@Order(1)
50-
public void whenInitializingAWSAthenaService_thenNotNull() {
51-
assertNotNull(athenaClient);
52-
System.out.println("Test 1 passed");
53-
}
5449

5550
@Test
56-
@Order(2)
51+
@Order(1)
5752
public void CreateNamedQueryExample() {
58-
59-
CreateNamedQueryExample.createNamedQuery(athenaClient, nameQuery);
60-
System.out.println("Test 2 passed");
53+
assertDoesNotThrow(() -> CreateNamedQueryExample.createNamedQuery(athenaClient, nameQuery));
54+
System.out.println("Test passed");
6155
}
6256

6357
@Test
64-
@Order(3)
58+
@Order(2)
6559
public void ListNamedQueryExample() {
66-
67-
ListNamedQueryExample.listNamedQueries(athenaClient);
68-
System.out.println("Test 3 passed");
60+
assertDoesNotThrow(() -> ListNamedQueryExample.listNamedQueries(athenaClient));
61+
System.out.println("Test passed");
6962
}
7063

7164
@Test
72-
@Order(4)
65+
@Order(3)
7366
public void ListQueryExecutionsExample() {
74-
75-
ListQueryExecutionsExample.listQueryIds(athenaClient);
76-
System.out.println("Test 4 passed");
67+
assertDoesNotThrow(() -> ListQueryExecutionsExample.listQueryIds(athenaClient));
68+
System.out.println("Test passed");
7769
}
7870

7971
@Test
80-
@Order(5)
81-
public void DeleteNamedQueryExample()
82-
{
72+
@Order(4)
73+
public void DeleteNamedQueryExample() {
8374
String sampleNamedQueryId = DeleteNamedQueryExample.getNamedQueryId(athenaClient, nameQuery);
84-
DeleteNamedQueryExample.deleteQueryName(athenaClient, sampleNamedQueryId);
85-
System.out.println("Test 5 passed");
75+
assertDoesNotThrow(() -> DeleteNamedQueryExample.deleteQueryName(athenaClient, sampleNamedQueryId));
76+
System.out.println("Test passed");
8677

8778
}
8879

89-
9080
@Test
91-
@Order(6)
81+
@Order(5)
9282
public void StartQueryExample() {
93-
94-
try {
95-
String queryExecutionId = StartQueryExample.submitAthenaQuery(athenaClient);
96-
StartQueryExample.waitForQueryToComplete(athenaClient, queryExecutionId);
97-
StartQueryExample.processResultRows(athenaClient, queryExecutionId);
98-
System.out.println("Test 6 passed");
99-
100-
}catch (InterruptedException e) {
101-
e.getMessage();
102-
}
83+
String queryExecutionId = StartQueryExample.submitAthenaQuery(athenaClient);
84+
assertDoesNotThrow(() -> StartQueryExample.waitForQueryToComplete(athenaClient, queryExecutionId));
85+
assertDoesNotThrow(() -> StartQueryExample.processResultRows(athenaClient, queryExecutionId));
86+
System.out.println("Test passed");
10387
}
10488

10589
@Test
106-
@Order(7)
90+
@Order(6)
10791
public void StopQueryExecutionExample() {
108-
10992
String sampleQueryExecutionId = StopQueryExecutionExample.submitAthenaQuery(athenaClient);
110-
StopQueryExecutionExample.stopAthenaQuery(athenaClient, sampleQueryExecutionId);
111-
System.out.println("Test 7 passed");
93+
assertDoesNotThrow(() -> StopQueryExecutionExample.stopAthenaQuery(athenaClient, sampleQueryExecutionId));
94+
System.out.println("Test passed");
11295
}
11396
}
11497

‎javav2/example_code/autoscale/pom.xml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,6 @@
5050
<artifactId>junit-jupiter-engine</artifactId>
5151
<scope>test</scope>
5252
</dependency>
53-
<dependency>
54-
<groupId>org.junit.platform</groupId>
55-
<artifactId>junit-platform-commons</artifactId>
56-
<version>1.9.2</version>
57-
</dependency>
5853
<dependency>
5954
<groupId>software.amazon.awssdk</groupId>
6055
<artifactId>secretsmanager</artifactId>
@@ -64,12 +59,6 @@
6459
<artifactId>gson</artifactId>
6560
<version>2.10.1</version>
6661
</dependency>
67-
<dependency>
68-
<groupId>org.junit.platform</groupId>
69-
<artifactId>junit-platform-launcher</artifactId>
70-
<version>1.9.2</version>
71-
<scope>test</scope>
72-
</dependency>
7362
<dependency>
7463
<groupId>software.amazon.awssdk</groupId>
7564
<artifactId>autoscaling</artifactId>

0 commit comments

Comments
 (0)