Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
43 changes: 14 additions & 29 deletions core/src/test/java/com/predic8/membrane/core/UnitTests.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,42 +15,27 @@

import org.junit.platform.suite.api.*;

/**
* TODO Fix:
* - com.predic8.membrane.core.interceptor.opentelemetry.OpenTelemetryInterceptorTest
* - com.predic8.membrane.core.interceptor.rewrite.RewriteInterceptorIntegrationTest // Rewrite as UnitTest with sampleSOAPService
* Still in use?
* - com.predic8.membrane.core.interceptor.oauth2client.OAuth2Resource2InterceptorTest
* - com.predic8.membrane.core.interceptor.shadowing.ShadowingInterceptorTest
*/
@Suite
@SelectPackages({"com.predic8"})
@ExcludeClassNamePatterns({
"com.predic8.membrane.AllTests",
"com.predic8.membrane.core.interceptor.opentelemetry.OpenTelemetryInterceptorTest",
"com.predic8.membrane.core.interceptor.balancer.NodeOnlineCheckerTest",
"com.predic8.membrane.core.interceptor.tunnel.WebsocketStompTest",
"com.predic8.membrane.core.interceptor.oauth2client.OAuth2Resource2InterceptorTest",
"com.predic8.membrane.core.interceptor.shadowing.ShadowingInterceptorTest",
"com.predic8.membrane.core.interceptor.rewrite.RewriteInterceptorIntegrationTest",
//
// From includes, weren't run before!
// TODO: Fix or delete
"com.predic8.membrane.core.transport.http.ConnectionTest",
"com.predic8.membrane.core.util.MemcachedConnectorTest"

"com.predic8.membrane.AllTests", // Replaced with package scan
"com.predic8.membrane.core.transport.http.ConnectionTest", // #2180 should fix it
"com.predic8.membrane.core.interceptor.rewrite.RewriteInterceptorIntegrationTest", // Rewrite as UnitTest with sampleSOAPService
"com.predic8.membrane.core.interceptor.tunnel.WebsocketStompTest", // Fails: not standalone; depends on external WS+STOMP setup
"com.predic8.membrane.core.interceptor.oauth2client.OAuth2Resource2InterceptorTest", // Disabled: incomplete setup; AuthorizationService (and other) not configured
"com.predic8.membrane.core.util.MemcachedConnectorTest" // Disabled: not standalone; needs Memcached at 127.0.0.1:11211 (fails with Connection refused)
})
public class UnitTests {
/*
* Uncomment below to speed up test execution!
*
*/
/*
* @BeforeClass public static void forbidScreenOutput() { PrintStream ps =
* new PrintStream(new OutputStream() {
*
* @Override public void write(int b) throws IOException { throw new
* RuntimeException("this test uses stdout"); } }); System.setOut(ps);
* System.setErr(ps); }
*/
/*
* @BeforeClass public static void forbidScreenOutput() { PrintStream ps =
* new PrintStream(new OutputStream() {
*
* @Override public void write(int b) throws IOException { throw new
* RuntimeException("this test uses stdout"); } }); System.setOut(ps);
* System.setErr(ps); }
*/
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
public class WebsocketStompTest {
@Test
public void testWebsocketStomp() throws Exception{
// Preparation: tart the Websocket-Stomp example from an external source
// Preparation: Start the Websocket-Stomp example from an external source

// Starts embedded ActiveMQ and places "Hello world!" into the "foo" queue
// Verification: If you open "localhost:4333" with running example the message appears -> Server part works
Expand Down
4 changes: 2 additions & 2 deletions distribution/examples/websockets/websocket-stomp/proxies.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

<serviceProxy port="4443">
<ssl>
<keystore location="../../conf/membrane.p12" password="secret" keyPassword="secret" />
<truststore location="../../conf/membrane.p12" password="secret" />
<keystore location="../../../conf/membrane.p12" password="secret" keyPassword="secret" />
<truststore location="../../../conf/membrane.p12" password="secret" />
</ssl>

<log />
Expand Down