Skip to content

Commit

Permalink
Renamed a few test classes for consistency
Browse files Browse the repository at this point in the history
  • Loading branch information
davemoore- committed Feb 3, 2021
1 parent 7c13285 commit bfd3266
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 8 deletions.
Expand Up @@ -14,7 +14,7 @@

import java.io.IOException;

public class ResolutionActionTest {
public class InputTest {

// Valid input
private static final String validAttributeArray = "\"attribute_array\":[\"abc\"]";
Expand Down
Expand Up @@ -8,6 +8,7 @@
import org.elasticsearch.client.RestClient;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.testcontainers.containers.DockerComposeContainer;
import org.testcontainers.containers.wait.strategy.Wait;

Expand All @@ -20,7 +21,8 @@
import static org.junit.Assert.*;
import static org.junit.Assume.assumeFalse;

public abstract class AbstractITCase {
@Ignore("Base class")
public abstract class AbstractIT {

public final static String SERVICE_NAME = "es01";
public final static int SERVICE_PORT = 9400;
Expand Down
Expand Up @@ -11,7 +11,7 @@

import static org.junit.Assert.assertEquals;

public class HomeActionIT extends AbstractITCase {
public class HomeActionIT extends AbstractIT {

@Test
public void testHomeAction() throws Exception {
Expand Down
Expand Up @@ -17,7 +17,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;

public class ModelsActionIT extends AbstractITCase {
public class ModelsActionIT extends AbstractIT {

public static void destroyTestResources() throws Exception {
try {
Expand Down
Expand Up @@ -23,7 +23,7 @@

import static org.junit.Assert.*;

public class JobIT extends AbstractITCase {
public class ResolutionActionIT extends AbstractIT {

public static final StringEntity TEST_PAYLOAD_JOB_NO_SCOPE = new StringEntity("{\n" +
" \"attributes\": {\n" +
Expand Down Expand Up @@ -502,7 +502,7 @@ public class JobIT extends AbstractITCase {
"}", ContentType.APPLICATION_JSON);

public static byte[] readFile(String filename) throws IOException {
InputStream stream = JobIT.class.getResourceAsStream("/" + filename);
InputStream stream = ResolutionActionIT.class.getResourceAsStream("/" + filename);
return IOUtils.toByteArray(stream);
}

Expand Down
Expand Up @@ -9,7 +9,7 @@

import static org.junit.Assert.*;

public class SetupActionIT extends AbstractITCase {
public class SetupActionIT extends AbstractIT {

public static void destroyTestResources() throws Exception {
try {
Expand Down
Expand Up @@ -11,7 +11,7 @@

import static org.junit.Assert.assertTrue;

public class ZentityPluginIT extends AbstractITCase {
public class ZentityPluginIT extends AbstractIT {

@Test
public void testPluginIsLoaded() throws Exception {
Expand Down

0 comments on commit bfd3266

Please sign in to comment.