Skip to content

Commit b2a420b

Browse files
committed
fix
1 parent 13fa155 commit b2a420b

2 files changed

Lines changed: 50 additions & 1 deletion

File tree

application-engine/src/test/groovy/com/netgrif/application/engine/petrinet/domain/dataset/FileFieldTest.groovy

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import com.netgrif.application.engine.ApplicationEngine
55
import com.netgrif.application.engine.TestHelper
66
import com.netgrif.application.engine.adapter.spring.auth.domain.AuthorityImpl
77
import com.netgrif.application.engine.auth.service.UserService
8+
import com.netgrif.application.engine.files.minio.MinIoHostInfo
9+
import com.netgrif.application.engine.files.minio.StorageConfigurationProperties
810
import com.netgrif.application.engine.importer.service.Importer
911
import com.netgrif.application.engine.objects.auth.constants.UserConstants
1012
import com.netgrif.application.engine.objects.auth.domain.AbstractUser
@@ -21,6 +23,9 @@ import com.netgrif.application.engine.startup.runner.SuperCreatorRunner
2123
import com.netgrif.application.engine.objects.workflow.domain.Case
2224
import com.netgrif.application.engine.workflow.service.interfaces.IWorkflowService
2325
import com.netgrif.application.engine.workflow.web.requestbodies.file.FileFieldRequest
26+
import io.minio.BucketExistsArgs
27+
import io.minio.MakeBucketArgs
28+
import io.minio.MinioClient
2429
import org.assertj.core.api.Assertions
2530
import org.junit.jupiter.api.BeforeEach
2631
import org.junit.jupiter.api.Test
@@ -35,7 +40,6 @@ import org.springframework.mock.web.MockHttpServletRequest
3540
import org.springframework.mock.web.MockMultipartFile
3641
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken
3742
import org.springframework.security.core.Authentication
38-
import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors
3943
import org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers
4044
import org.springframework.security.web.authentication.WebAuthenticationDetails
4145
import org.springframework.test.context.ActiveProfiles
@@ -66,6 +70,9 @@ class FileFieldTest {
6670
public static final String USER_EMAIL = "super@netgrif.com"
6771
public static final String MOCK_FILE_NAME = "hello.txt"
6872

73+
public static final String BUCKET = "default"
74+
75+
static MinioClient mc;
6976

7077
@Value('${netgrif.engine.security.auth.admin-password:password}')
7178
private String userPassword
@@ -94,6 +101,9 @@ class FileFieldTest {
94101
@Autowired
95102
private SuperCreatorRunner superCreator
96103

104+
@Autowired
105+
private StorageConfigurationProperties.MinIoStorageProperties MinIoStorageProperties
106+
97107
private MockMvc mockMvc
98108

99109
private ObjectMapper objectMapper
@@ -103,6 +113,19 @@ class FileFieldTest {
103113
@BeforeEach
104114
void setup() {
105115
testHelper.truncateDbs()
116+
117+
MinIoHostInfo hostInfo = MinIoStorageProperties.getHosts("host_1")
118+
119+
mc = MinioClient.builder()
120+
.endpoint(hostInfo.host)
121+
.credentials(hostInfo.user, hostInfo.password)
122+
.build();
123+
124+
boolean exists = mc.bucketExists(BucketExistsArgs.builder().bucket(BUCKET).build());
125+
if (!exists) {
126+
mc.makeBucket(MakeBucketArgs.builder().bucket(BUCKET).build());
127+
}
128+
106129
mockMvc = MockMvcBuilders
107130
.webAppContextSetup(context)
108131
.apply(SecurityMockMvcConfigurers.springSecurity())

application-engine/src/test/groovy/com/netgrif/application/engine/petrinet/domain/dataset/FileListFieldTest.groovy

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import com.netgrif.application.engine.ApplicationEngine
55
import com.netgrif.application.engine.TestHelper
66
import com.netgrif.application.engine.adapter.spring.auth.domain.AuthorityImpl
77
import com.netgrif.application.engine.auth.service.UserService
8+
import com.netgrif.application.engine.files.minio.MinIoHostInfo
9+
import com.netgrif.application.engine.files.minio.StorageConfigurationProperties
810
import com.netgrif.application.engine.importer.service.Importer
911
import com.netgrif.application.engine.objects.auth.constants.UserConstants
1012
import com.netgrif.application.engine.objects.auth.domain.AbstractUser
@@ -21,6 +23,9 @@ import com.netgrif.application.engine.startup.ImportHelper
2123
import com.netgrif.application.engine.startup.runner.SuperCreatorRunner
2224
import com.netgrif.application.engine.workflow.service.interfaces.IWorkflowService
2325
import com.netgrif.application.engine.workflow.web.requestbodies.file.FileFieldRequest
26+
import io.minio.BucketExistsArgs
27+
import io.minio.MakeBucketArgs
28+
import io.minio.MinioClient
2429
import org.assertj.core.api.Assertions
2530
import org.junit.jupiter.api.BeforeEach
2631
import org.junit.jupiter.api.Test
@@ -64,6 +69,10 @@ class FileListFieldTest {
6469
public static final String USER_EMAIL = "super@netgrif.com"
6570
public static final String MOCK_FILE_NAME = "hello.txt"
6671

72+
public static final String BUCKET = "default"
73+
74+
static MinioClient mc;
75+
6776
@Value('${netgrif.engine.security.auth.admin-password:password}')
6877
private String userPassword
6978

@@ -97,9 +106,26 @@ class FileListFieldTest {
97106

98107
private Authentication auth
99108

109+
@Autowired
110+
private StorageConfigurationProperties.MinIoStorageProperties MinIoStorageProperties
111+
100112
@BeforeEach
101113
void setup() {
102114
testHelper.truncateDbs()
115+
116+
MinIoHostInfo hostInfo = MinIoStorageProperties.getHosts("host_1")
117+
118+
mc = MinioClient.builder()
119+
.endpoint(hostInfo.host)
120+
.credentials(hostInfo.user, hostInfo.password)
121+
.build();
122+
123+
boolean exists = mc.bucketExists(BucketExistsArgs.builder().bucket(BUCKET).build());
124+
if (!exists) {
125+
mc.makeBucket(MakeBucketArgs.builder().bucket(BUCKET).build());
126+
}
127+
128+
103129
mockMvc = MockMvcBuilders
104130
.webAppContextSetup(context)
105131
.apply(SecurityMockMvcConfigurers.springSecurity())

0 commit comments

Comments
 (0)