Moving the DisabledOnOs down to the subclasses, not the base class

This commit is contained in:
2022-07-28 13:48:16 -05:00
parent 35839f8fb7
commit 715c6f36d0
5 changed files with 12 additions and 1 deletions

View File

@ -45,6 +45,8 @@ import com.kingsrook.qqq.backend.module.filesystem.s3.actions.AbstractS3Action;
import com.kingsrook.qqq.backend.module.filesystem.s3.model.metadata.S3BackendMetaData; import com.kingsrook.qqq.backend.module.filesystem.s3.model.metadata.S3BackendMetaData;
import com.kingsrook.qqq.backend.module.filesystem.s3.model.metadata.S3TableBackendDetails; import com.kingsrook.qqq.backend.module.filesystem.s3.model.metadata.S3TableBackendDetails;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
@ -52,6 +54,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
/******************************************************************************* /*******************************************************************************
** Unit test for FilesystemSyncProcess using S3 backend ** Unit test for FilesystemSyncProcess using S3 backend
*******************************************************************************/ *******************************************************************************/
@DisabledOnOs(OS.LINUX)
class FilesystemSyncProcessS3Test extends BaseS3Test class FilesystemSyncProcessS3Test extends BaseS3Test
{ {

View File

@ -41,7 +41,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
*******************************************************************************/ *******************************************************************************/
@ExtendWith(LocalstackDockerExtension.class) @ExtendWith(LocalstackDockerExtension.class)
@LocalstackDockerProperties(services = { ServiceName.S3 }, portEdge = "2960", portElasticSearch = "2961") @LocalstackDockerProperties(services = { ServiceName.S3 }, portEdge = "2960", portElasticSearch = "2961")
@DisabledOnOs(OS.LINUX)
public class BaseS3Test public class BaseS3Test
{ {
public static final String BUCKET_NAME = "localstack-test-bucket"; public static final String BUCKET_NAME = "localstack-test-bucket";

View File

@ -32,11 +32,14 @@ import com.kingsrook.qqq.backend.module.filesystem.exceptions.FilesystemExceptio
import com.kingsrook.qqq.backend.module.filesystem.s3.actions.AbstractS3Action; import com.kingsrook.qqq.backend.module.filesystem.s3.actions.AbstractS3Action;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
/******************************************************************************* /*******************************************************************************
** Unit test for S3BackendModule ** Unit test for S3BackendModule
*******************************************************************************/ *******************************************************************************/
@DisabledOnOs(OS.LINUX)
public class S3BackendModuleTest extends BaseS3Test public class S3BackendModuleTest extends BaseS3Test
{ {
private final String PATH_THAT_WONT_EXIST = "some/path/that/wont/exist"; private final String PATH_THAT_WONT_EXIST = "some/path/that/wont/exist";

View File

@ -31,11 +31,14 @@ import com.kingsrook.qqq.backend.module.filesystem.base.FilesystemRecordBackendD
import com.kingsrook.qqq.backend.module.filesystem.s3.BaseS3Test; import com.kingsrook.qqq.backend.module.filesystem.s3.BaseS3Test;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
/******************************************************************************* /*******************************************************************************
** **
*******************************************************************************/ *******************************************************************************/
@DisabledOnOs(OS.LINUX)
public class S3QueryActionTest extends BaseS3Test public class S3QueryActionTest extends BaseS3Test
{ {

View File

@ -29,12 +29,15 @@ import com.amazonaws.services.s3.model.S3ObjectSummary;
import com.kingsrook.qqq.backend.module.filesystem.s3.BaseS3Test; import com.kingsrook.qqq.backend.module.filesystem.s3.BaseS3Test;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
/******************************************************************************* /*******************************************************************************
** **
*******************************************************************************/ *******************************************************************************/
@DisabledOnOs(OS.LINUX)
public class S3UtilsTest extends BaseS3Test public class S3UtilsTest extends BaseS3Test
{ {