Skip to content

Commit 4c8bf08

Browse files
eldimijeromevdl
andcommitted
chore(unit-test): rename, reformat, fix typos as suggested from code review
Co-authored-by: Jérôme Van Der Linden <[email protected]>
1 parent 5b3083f commit 4c8bf08

File tree

8 files changed

+18
-16
lines changed

8 files changed

+18
-16
lines changed

powertools-core/src/test/java/software/amazon/lambda/powertools/core/internal/LambdaHandlerProcessorTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ void placedOnRequestHandler_shouldInvalidateOnWrongTypeOfArgs() {
8080

8181
boolean isPlacedOnRequestHandler = LambdaHandlerProcessor.placedOnRequestHandler(pjpMock);
8282

83-
assertFalse(isPlacedOnRequestHandler);
83+
assertThat(isPlacedOnRequestHandler).isFalse();
8484
}
8585

8686
@Test
@@ -104,7 +104,7 @@ void placedOnStreamHandler_shouldInvalidateOnWrongTypeOfArgs() {
104104
}
105105

106106
@Test
107-
void placedOStreamHandler_shouldInvalidateOnTypeOfArgsOneValid() {
107+
void placedOnStreamHandler_shouldInvalidateOnTypeOfArgsOneValid() {
108108
Object[] args = {mock(InputStream.class), new Object(), new Object()};
109109
ProceedingJoinPoint pjpMock = mockRequestHandlerPjp(RequestStreamHandler.class, args);
110110

@@ -114,7 +114,7 @@ void placedOStreamHandler_shouldInvalidateOnTypeOfArgsOneValid() {
114114
}
115115

116116
@Test
117-
void placedOStreamHandler_shouldInvalidateOnTypeOfArgsSomeValid() {
117+
void placedOnStreamHandler_shouldInvalidateOnTypeOfArgsSomeValid() {
118118
Object[] args = {mock(InputStream.class), mock(OutputStream.class), new Object()};
119119
ProceedingJoinPoint pjpMock = mockRequestHandlerPjp(RequestStreamHandler.class, args);
120120

@@ -132,7 +132,7 @@ void getXrayTraceId_present() {
132132
Optional xRayTraceId = LambdaHandlerProcessor.getXrayTraceId();
133133

134134
assertTrue(xRayTraceId.isPresent());
135-
assertEquals(traceID.split(";")[0].replace(LambdaConstants.ROOT_EQUALS, ""), xRayTraceId.get());
135+
assertThat(traceID.split(";")[0].replace(LambdaConstants.ROOT_EQUALS, "")).isEqualTo(xRayTraceId.get());
136136
}
137137
}
138138

@@ -154,7 +154,7 @@ void extractContext_fromRequestHandler() {
154154

155155
Context context = LambdaHandlerProcessor.extractContext(pjpMock);
156156

157-
assertNotNull(context);
157+
assertThat(context).isNotNull();
158158
}
159159

160160
@Test

powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/handlers/PowerLogToolEnabledWithClearState.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
public class PowerLogToolEnabledWithClearState implements RequestHandler<Object, Object> {
2424
public static int COUNT = 1;
25-
private final Logger LOG = LogManager.getLogger(PowerLogToolEnabledWithClearState.class);
25+
private static final Logger LOG = LogManager.getLogger(PowerLogToolEnabledWithClearState.class);
2626

2727
@Override
2828
@Logging(clearState = true)

powertools-logging/src/test/java/software/amazon/lambda/powertools/logging/internal/LambdaLoggingAspectTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ void shouldLogCorrelationIdOnALBEvent(ApplicationLoadBalancerRequestEvent event)
276276
void shouldLogCorrelationIdOnStreamHandler() throws IOException {
277277
RequestStreamHandler handler = new PowerLogToolEventBridgeCorrelationId();
278278
String eventId = "3";
279-
String event = "{\"id\":" + eventId + "}";
279+
String event = "{\"id\":" + eventId + "}"; // CorrelationIdPathConstants.EVENT_BRIDGE
280280
ByteArrayInputStream inputStream = new ByteArrayInputStream(event.getBytes());
281281
handler.handleRequest(inputStream, new ByteArrayOutputStream(), context);
282282

powertools-parameters/src/main/java/software/amazon/lambda/powertools/parameters/ParamManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public static TransformationManager getTransformationManager() {
164164
return transformationManager;
165165
}
166166

167-
protected static <T extends BaseProvider> T createProvider(Class<T> providerClass) {
167+
static <T extends BaseProvider> T createProvider(Class<T> providerClass) {
168168
try {
169169
Constructor<T> constructor = providerClass.getDeclaredConstructor(CacheManager.class);
170170
T provider = constructor.newInstance(cacheManager);

powertools-parameters/src/test/java/software/amazon/lambda/powertools/parameters/AppConfigProviderTest.java

+3
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,13 @@ public class AppConfigProviderTest {
2323
private final String environmentName = "test";
2424
private final String applicationName = "fakeApp";
2525
private final String defaultTestKey = "key1";
26+
2627
@Mock
2728
AppConfigDataClient client;
29+
2830
@Captor
2931
ArgumentCaptor<StartConfigurationSessionRequest> startSessionRequestCaptor;
32+
3033
@Captor
3134
ArgumentCaptor<GetLatestConfigurationRequest> getLatestConfigurationRequestCaptor;
3235
private AppConfigProvider provider;

powertools-parameters/src/test/java/software/amazon/lambda/powertools/parameters/ParamManagerTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public void testCreateProvider() {
5555
}
5656

5757
@Test
58-
public void testCreateProvider_throwsException() {
58+
public void testCreateUninstanciableProvider_throwsException() {
5959

6060
// Act & Assert
6161
assertThatRuntimeException().isThrownBy(() -> ParamManager.createProvider(BaseProvider.class));

powertools-parameters/src/test/java/software/amazon/lambda/powertools/parameters/transform/TransformationManagerTest.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@ public class TransformationManagerTest {
2828

2929
TransformationManager manager;
3030

31-
Class<BasicTransformer> transformer;
31+
Class<BasicTransformer> basicTransformer = BasicTransformer.class;
3232

3333
@BeforeEach
3434
public void setup() {
35-
transformer = BasicTransformer.class;
3635
manager = new TransformationManager();
3736
}
3837

@@ -63,8 +62,8 @@ public void performBasicTransformation_notBasicTransformer_shouldThrowException(
6362
}
6463

6564
@Test
66-
public void performBasicTransformation_throwsTransformationException() {
67-
manager.setTransformer(transformer);
65+
public void performBasicTransformation_abstractTransformer_throwsTransformationException() {
66+
manager.setTransformer(basicTransformer);
6867

6968
assertThatExceptionOfType(TransformationException.class)
7069
.isThrownBy(() -> manager.performBasicTransformation("value"));
@@ -97,7 +96,7 @@ public void performComplexTransformation_shouldPerformTransformation() {
9796

9897
@Test
9998
public void performComplexTransformation_throwsTransformationException() {
100-
manager.setTransformer(transformer);
99+
manager.setTransformer(basicTransformer);
101100

102101
assertThatExceptionOfType(TransformationException.class)
103102
.isThrownBy(() -> manager.performComplexTransformation("value", ObjectToDeserialize.class));

powertools-serialization/src/test/java/software/amazon/lambda/powertools/utilities/jmespath/Base64GZipFunctionTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void testPowertoolsGzip() throws IOException {
4848
}
4949

5050
@Test
51-
public void testPowertoolsGdzipEmptyJsonAttribute() throws IOException {
51+
public void testPowertoolsGzipEmptyJsonAttribute() throws IOException {
5252
JsonNode event = JsonConfig.get().getObjectMapper().readTree(this.getClass().getResourceAsStream("/custom_event_gzip.json"));
5353
Expression<JsonNode> expression = JsonConfig.get().getJmesPath().compile("basket.powertools_base64_gzip('')");
5454
JsonNode result = expression.search(event);
@@ -57,7 +57,7 @@ public void testPowertoolsGdzipEmptyJsonAttribute() throws IOException {
5757
}
5858

5959
@Test
60-
public void testPowertoolsGdzipNotCompressedJsonAttribute() throws IOException {
60+
public void testPowertoolsGzipNotCompressedJsonAttribute() throws IOException {
6161
JsonNode event = JsonConfig.get().getObjectMapper().readTree(this.getClass().getResourceAsStream("/custom_event_gzip.json"));
6262
Expression<JsonNode> expression = JsonConfig.get().getJmesPath().compile("basket.powertools_base64_gzip(encodedString)");
6363
JsonNode result = expression.search(event);

0 commit comments

Comments
 (0)