Skip to content

Commit

Permalink
Remove new tests
Browse files Browse the repository at this point in the history
  • Loading branch information
mark-bathori committed Oct 27, 2023
1 parent 3f508d2 commit acf00e8
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 86 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@
import okhttp3.mockwebserver.MockResponse;
import okhttp3.mockwebserver.MockWebServer;
import okhttp3.mockwebserver.RecordedRequest;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.security.util.SslContextFactory;
import org.apache.nifi.security.util.TemporaryKeyStoreBuilder;
import org.apache.nifi.security.util.TlsConfiguration;
import org.apache.nifi.security.util.TlsException;
import org.apache.nifi.ssl.SSLContextService;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.junit.jupiter.api.BeforeEach;
Expand All @@ -33,13 +27,10 @@
import javax.json.Json;
import javax.json.JsonObject;
import javax.json.JsonReader;
import javax.net.ssl.SSLContext;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

public class PostSlackTextMessageTest {
private static final String RESPONSE_SUCCESS_TEXT_MSG = "{\"ok\": true}";
Expand Down Expand Up @@ -285,26 +276,6 @@ public void sendInternationalMessageSuccessfully() {
assertEquals("Iñtërnâtiônàližætiøn", requestBodyJson.getString("text"));
}

@Test
public void sendTextOnlyMessageWithSSLContext() throws TlsException, InitializationException {
configureSSLContextService();
testRunner.setProperty(PostSlack.POST_MESSAGE_URL, url);
testRunner.setProperty(PostSlack.ACCESS_TOKEN, "my-access-token");
testRunner.setProperty(PostSlack.CHANNEL, "my-channel");
testRunner.setProperty(PostSlack.TEXT, "my-text");

mockWebServer.enqueue(new MockResponse().setResponseCode(200).setBody(RESPONSE_SUCCESS_TEXT_MSG));

testRunner.enqueue(new byte[0]);
testRunner.run(1);

testRunner.assertAllFlowFilesTransferred(PutSlack.REL_SUCCESS);

JsonObject requestBodyJson = getRequestBodyJson();
assertBasicRequest(requestBodyJson);
assertEquals("my-text", requestBodyJson.getString("text"));
}

private void assertBasicRequest(JsonObject requestBodyJson) {
assertEquals("my-channel", requestBodyJson.getString("channel"));
}
Expand All @@ -321,19 +292,4 @@ private JsonObject getRequestBodyJson() {
}
}

private void configureSSLContextService() throws InitializationException, TlsException {
final TlsConfiguration tlsConfiguration = new TemporaryKeyStoreBuilder().build();
final SSLContext sslContext = SslContextFactory.createSslContext(tlsConfiguration);

mockWebServer.useHttps(sslContext.getSocketFactory(), false);
url = mockWebServer.url("/").toString();

SSLContextService sslService = mock(SSLContextService.class);
when(sslService.getIdentifier()).thenReturn("ssl-context");
when(sslService.createContext()).thenReturn(sslContext);

testRunner.addControllerService("ssl-context", sslService);
testRunner.enableControllerService(sslService);
testRunner.setProperty(PutSlack.SSL_CONTEXT_SERVICE, "ssl-context");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,17 @@
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.reporting.InitializationException;
import org.apache.nifi.security.util.SslContextFactory;
import org.apache.nifi.security.util.TemporaryKeyStoreBuilder;
import org.apache.nifi.security.util.TlsConfiguration;
import org.apache.nifi.security.util.TlsException;
import org.apache.nifi.ssl.SSLContextService;
import org.apache.nifi.util.TestRunner;
import org.apache.nifi.util.TestRunners;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import javax.net.ssl.SSLContext;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

public class PutSlackTest {

Expand Down Expand Up @@ -256,37 +247,4 @@ public void testSimplePutWithEL() throws InterruptedException {
assertEquals(expected, requestBody);
}

@Test
public void testWithSSLContext() throws InterruptedException, InitializationException, TlsException {
configureSSLContextService();
testRunner.setProperty(PutSlack.WEBHOOK_URL, url);
testRunner.setProperty(PutSlack.WEBHOOK_TEXT, PutSlackTest.WEBHOOK_TEST_TEXT);

mockWebServer.enqueue(new MockResponse().setResponseCode(200));

testRunner.enqueue(new byte[0]);
testRunner.run(1);
testRunner.assertAllFlowFilesTransferred(PutSlack.REL_SUCCESS, 1);

String expected = "payload=%7B%22text%22%3A%22Hello+From+Apache+NiFi%22%7D";
final RecordedRequest recordedRequest = mockWebServer.takeRequest();
final String requestBody = recordedRequest.getBody().readString(StandardCharsets.UTF_8);
assertEquals(expected, requestBody);
}

private void configureSSLContextService() throws InitializationException, TlsException {
final TlsConfiguration tlsConfiguration = new TemporaryKeyStoreBuilder().build();
final SSLContext sslContext = SslContextFactory.createSslContext(tlsConfiguration);

mockWebServer.useHttps(sslContext.getSocketFactory(), false);
url = mockWebServer.url("/").toString();

SSLContextService sslService = mock(SSLContextService.class);
when(sslService.getIdentifier()).thenReturn("ssl-context");
when(sslService.createContext()).thenReturn(sslContext);

testRunner.addControllerService("ssl-context", sslService);
testRunner.enableControllerService(sslService);
testRunner.setProperty(PutSlack.SSL_CONTEXT_SERVICE, "ssl-context");
}
}

0 comments on commit acf00e8

Please sign in to comment.