-
Notifications
You must be signed in to change notification settings - Fork 819
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
test: test both binaryMode=true,false when creating connections in Da…
…tabaseMetaDataTest #3229
- Loading branch information
Showing
7 changed files
with
161 additions
and
64 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
65 changes: 1 addition & 64 deletions
65
pgjdbc/src/test/java/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java
Large diffs are not rendered by default.
Oops, something went wrong.
1 change: 1 addition & 0 deletions
1
pgjdbc/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
org.postgresql.test.impl.AfterBeforeParameterResolver |
84 changes: 84 additions & 0 deletions
84
pgjdbc/src/testFixtures/java/org/postgresql/test/impl/AfterBeforeParameterResolver.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
/* | ||
* Copyright (c) 2024, PostgreSQL Global Development Group | ||
* See the LICENSE file in the project root for more information. | ||
*/ | ||
|
||
package org.postgresql.test.impl; | ||
|
||
import org.checkerframework.checker.nullness.qual.Nullable; | ||
import org.junit.jupiter.api.AfterEach; | ||
import org.junit.jupiter.api.BeforeEach; | ||
import org.junit.jupiter.api.extension.ExtensionContext; | ||
import org.junit.jupiter.api.extension.ParameterContext; | ||
import org.junit.jupiter.api.extension.ParameterResolutionException; | ||
import org.junit.jupiter.api.extension.ParameterResolver; | ||
import org.junit.jupiter.engine.execution.BeforeEachMethodAdapter; | ||
import org.junit.jupiter.engine.extension.ExtensionRegistry; | ||
|
||
import java.lang.annotation.Annotation; | ||
import java.util.Optional; | ||
|
||
/** | ||
* Passes JUnit5's {@code ParameterizedTest} parameters to {@code @BeforeEach} and {@code AfterEach} | ||
* methods. | ||
* | ||
* @see <a href="https://github.com/junit-team/junit5/issues/3157">Parameterized BeforeEach or | ||
* AfterEach only</a> | ||
*/ | ||
public class AfterBeforeParameterResolver implements BeforeEachMethodAdapter, ParameterResolver { | ||
private @Nullable ParameterResolver parameterisedTestParameterResolver; | ||
|
||
@Override | ||
public void invokeBeforeEachMethod(ExtensionContext context, ExtensionRegistry registry) { | ||
Optional<ParameterResolver> resolverOptional = registry.getExtensions(ParameterResolver.class) | ||
.stream() | ||
.filter(parameterResolver -> parameterResolver.getClass().getName().contains( | ||
"ParameterizedTestParameterResolver")) | ||
.findFirst(); | ||
parameterisedTestParameterResolver = resolverOptional.orElse(null); | ||
} | ||
|
||
@Override | ||
public boolean supportsParameter(ParameterContext parameterContext, | ||
ExtensionContext extensionContext) throws ParameterResolutionException { | ||
// JUnit asks us to resolve a parameter for "BeforeEach" method, | ||
// and we delegate to the "parameterized test" implementation, | ||
// however it expects to resolve a parameter on a "test method". | ||
if (parameterisedTestParameterResolver != null | ||
&& isExecutedOnAfterOrBeforeMethod(parameterContext)) { | ||
// pContext refers to a parameter on a test method | ||
ParameterContext pContext = getTestMethodParameterContext(parameterContext, extensionContext); | ||
return parameterisedTestParameterResolver.supportsParameter(pContext, extensionContext); | ||
} | ||
return false; | ||
} | ||
|
||
private DefaultParameterContext getTestMethodParameterContext(ParameterContext parameterContext, | ||
ExtensionContext extensionContext) { | ||
return new DefaultParameterContext( | ||
parameterContext.getIndex(), | ||
extensionContext.getRequiredTestMethod().getParameters()[parameterContext.getIndex()], | ||
parameterContext.getTarget()); | ||
} | ||
|
||
private boolean isExecutedOnAfterOrBeforeMethod(ParameterContext parameterContext) { | ||
for (Annotation annotation : parameterContext.getDeclaringExecutable().getDeclaredAnnotations()) { | ||
if (isAfterEachOrBeforeEachAnnotation(annotation)) { | ||
return true; | ||
} | ||
} | ||
return false; | ||
} | ||
|
||
private boolean isAfterEachOrBeforeEachAnnotation(Annotation annotation) { | ||
return annotation.annotationType() == BeforeEach.class || annotation.annotationType() == AfterEach.class; | ||
} | ||
|
||
@Override | ||
public Object resolveParameter(ParameterContext parameterContext, | ||
ExtensionContext extensionContext) throws ParameterResolutionException { | ||
return parameterisedTestParameterResolver.resolveParameter( | ||
getTestMethodParameterContext(parameterContext, extensionContext), | ||
extensionContext); | ||
} | ||
} |
65 changes: 65 additions & 0 deletions
65
pgjdbc/src/testFixtures/java/org/postgresql/test/impl/DefaultParameterContext.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
/* | ||
* Copyright (c) 2024, PostgreSQL Global Development Group | ||
* See the LICENSE file in the project root for more information. | ||
*/ | ||
|
||
package org.postgresql.test.impl; | ||
|
||
import org.junit.jupiter.api.extension.ParameterContext; | ||
import org.junit.platform.commons.util.AnnotationUtils; | ||
|
||
import java.lang.annotation.Annotation; | ||
import java.lang.reflect.Parameter; | ||
import java.util.List; | ||
import java.util.Optional; | ||
|
||
/** | ||
* Implements {@link ParameterContext} as JUnit does not provide default implementation. | ||
*/ | ||
public class DefaultParameterContext implements ParameterContext { | ||
private final int index; | ||
private final Parameter parameter; | ||
private final Optional<Object> target; | ||
|
||
public DefaultParameterContext(int index, Parameter parameter, | ||
Optional<Object> target) { | ||
this.index = index; | ||
this.parameter = parameter; | ||
this.target = target; | ||
} | ||
|
||
@Override | ||
public int getIndex() { | ||
return index; | ||
} | ||
|
||
@Override | ||
public Parameter getParameter() { | ||
return parameter; | ||
} | ||
|
||
@Override | ||
public Optional<Object> getTarget() { | ||
return target; | ||
} | ||
|
||
@Override | ||
public boolean isAnnotated(Class<? extends Annotation> annotationType) { | ||
return AnnotationUtils.isAnnotated(parameter, index, annotationType); | ||
} | ||
|
||
@Override | ||
public <A extends Annotation> Optional<A> findAnnotation(Class<A> annotationType) { | ||
return AnnotationUtils.findAnnotation(parameter, index, annotationType); | ||
} | ||
|
||
@Override | ||
public <A extends Annotation> List<A> findRepeatableAnnotations(Class<A> annotationType) { | ||
return AnnotationUtils.findRepeatableAnnotations(parameter, index, annotationType); | ||
} | ||
|
||
@Override | ||
public String toString() { | ||
return "DefaultParameterContext[parameter=" + parameter + ", index=" + index + ", target=" + target + "]"; | ||
} | ||
} |