Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix broken integration tests #1205

Merged
merged 4 commits into from
Jul 24, 2024
Merged

Fix broken integration tests #1205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf885b4
- Fixed integration test not shutting down router
t-burch Jul 24, 2024
5477932
- Added exception to ConfigSerializationTest
t-burch Jul 24, 2024
ec197ed
Merge branch 'master' into fix-broken-integration-tests
t-burch Jul 24, 2024
1bbb45b
Update version in pom's
t-burch Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion core/src/test/java/com/predic8/membrane/core/rules/SOAPProxyIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,23 @@
public class SOAPProxyIntegrationTest {

private static Router router;
private static Router targetRouter;

@BeforeAll
public static void setup() throws Exception {
Rule rule = new ServiceProxy(new ServiceProxyKey(3000), null, 0);
rule.getInterceptors().add(new SampleSoapServiceInterceptor());

Router targetRouter = new HttpRouter();
targetRouter = new HttpRouter();
targetRouter.getRuleManager().addProxyAndOpenPortIfNew(rule);
targetRouter.init();
}

@AfterAll
public static void teardown() throws IOException {
targetRouter.shutdown();
}

@BeforeEach
public void startRouter() throws Exception {
router = Router.init("classpath:/soap-proxy.xml");
Expand Down
2 changes: 1 addition & 1 deletion distribution/examples/basic-xml-interceptor/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<dependency>
<groupId>org.membrane-soa</groupId>
<artifactId>service-proxy-core</artifactId>
<version>5.5.2-SNAPSHOT</version>
<version>5.5.5-SNAPSHOT</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion distribution/examples/custom-interceptor/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>org.membrane-soa</groupId>
<artifactId>service-proxy-core</artifactId>
<version>5.5.2-SNAPSHOT</version>
<version>5.5.5-SNAPSHOT</version>
</dependency>

</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion distribution/examples/soap/add-soap-header/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<dependency>
<groupId>org.membrane-soa</groupId>
<artifactId>service-proxy-core</artifactId>
<version>5.5.2-SNAPSHOT</version>
<version>5.5.5-SNAPSHOT</version>
</dependency>

</dependencies>
Expand Down
3 changes: 2 additions & 1 deletion distribution/src/test/java/com/predic8/membrane/examples/ConfigSerializationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ public class ConfigSerializationTest {
"validation-security", // throws error because openapi parser does not provide port information
"validation", // throws error because openapi parser does not provide port information
"validation-simple", // throws error because openapi parser does not provide port information
"template"); // template serialization fails
"template", // template serialization fails
"greasing"); // greaser interceptor has a child element of type List, this seems to confuse the parser

public static List<Object[]> getPorts() {
ArrayList<Object[]> res = new ArrayList<>();
Expand Down
Loading