[#12] Extend method logic
All checks were successful
DCO / DCO (pull_request) Successful in 34s
All checks were successful
DCO / DCO (pull_request) Successful in 34s
Signed-off-by: Ori Bruk <o.bruk@yadro.com>
This commit is contained in:
parent
c9a54d56fb
commit
23bbe08893
70 changed files with 1375 additions and 587 deletions
|
@ -1,33 +0,0 @@
|
|||
package info.frostfs.sdk.mappers;
|
||||
|
||||
import info.frostfs.sdk.dto.MetaHeader;
|
||||
import info.frostfs.sdk.dto.Version;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
public class MetaHeaderMapperTest {
|
||||
|
||||
@Test
|
||||
void toGrpcMessage_success() {
|
||||
//Given
|
||||
var version = new Version(1, 2);
|
||||
var metaHeader = new MetaHeader(version, 1, 2);
|
||||
|
||||
//When
|
||||
var result = MetaHeaderMapper.toGrpcMessage(metaHeader);
|
||||
|
||||
//Then
|
||||
assertNotNull(result);
|
||||
assertEquals(metaHeader.getEpoch(), result.getEpoch());
|
||||
assertEquals(metaHeader.getTtl(), result.getTtl());
|
||||
assertEquals(metaHeader.getVersion().getMajor(), result.getVersion().getMajor());
|
||||
assertEquals(metaHeader.getVersion().getMinor(), result.getVersion().getMinor());
|
||||
}
|
||||
|
||||
@Test
|
||||
void toGrpcMessage_null() {
|
||||
//When + Then
|
||||
assertNull(MetaHeaderMapper.toGrpcMessage(null));
|
||||
}
|
||||
}
|
|
@ -1,7 +1,7 @@
|
|||
package info.frostfs.sdk.mappers;
|
||||
package info.frostfs.sdk.mappers.netmap;
|
||||
|
||||
import frostfs.refs.Types;
|
||||
import info.frostfs.sdk.dto.Version;
|
||||
import info.frostfs.sdk.dto.netmap.Version;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
|
@ -18,7 +18,7 @@ public class ObjectFilterMapperTest {
|
|||
@EnumSource(value = ObjectMatchType.class)
|
||||
void toGrpcMessage_success(ObjectMatchType type) {
|
||||
//Given
|
||||
var objectFilter = new ObjectFilter(type, "key", "value");
|
||||
var objectFilter = new ObjectFilter.FilterByAttribute(type, "key", "value");
|
||||
|
||||
//When
|
||||
var result = ObjectFilterMapper.toGrpcMessage(objectFilter);
|
||||
|
@ -40,7 +40,7 @@ public class ObjectFilterMapperTest {
|
|||
@Test
|
||||
void toGrpcMessage_notValidScheme() {
|
||||
//Given
|
||||
var objectFilter = new ObjectFilter(UNSPECIFIED, "key", "value");
|
||||
var objectFilter = new ObjectFilter.FilterByAttribute(UNSPECIFIED, "key", "value");
|
||||
|
||||
//When + Then
|
||||
try (MockedStatic<Types.MatchType> mockStatic = mockStatic(Types.MatchType.class)) {
|
||||
|
|
|
@ -3,16 +3,16 @@ package info.frostfs.sdk.mappers.object;
|
|||
import com.google.protobuf.ByteString;
|
||||
import frostfs.object.Types;
|
||||
import info.frostfs.sdk.dto.container.ContainerId;
|
||||
import info.frostfs.sdk.dto.netmap.Version;
|
||||
import info.frostfs.sdk.dto.object.ObjectAttribute;
|
||||
import info.frostfs.sdk.dto.object.ObjectHeader;
|
||||
import info.frostfs.sdk.dto.object.OwnerId;
|
||||
import info.frostfs.sdk.enums.ObjectType;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.params.ParameterizedTest;
|
||||
import org.junit.jupiter.params.provider.EnumSource;
|
||||
import org.mockito.MockedStatic;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
import static org.mockito.Mockito.mockStatic;
|
||||
|
@ -27,8 +27,11 @@ public class ObjectHeaderMapperTest {
|
|||
var objectHeader = new ObjectHeader(
|
||||
containerId,
|
||||
type,
|
||||
List.of(new ObjectAttribute("Filename", "cat.jpg"), new ObjectAttribute("Filename2", "cat2.jpg"))
|
||||
new ObjectAttribute("Filename", "cat.jpg"),
|
||||
new ObjectAttribute("Filename2", "cat2.jpg")
|
||||
);
|
||||
objectHeader.setOwnerId(new OwnerId("NVxUSpEEJzYXZZtUs18PrJTD9QZkLLNQ8S"));
|
||||
objectHeader.setVersion(new Version(1, 2));
|
||||
|
||||
//When
|
||||
var result = ObjectHeaderMapper.toGrpcMessage(objectHeader);
|
||||
|
@ -59,7 +62,7 @@ public class ObjectHeaderMapperTest {
|
|||
void toGrpcMessage_notValidScheme() {
|
||||
//Given
|
||||
var containerId = new ContainerId("EQGx2QeYHJb53uRwYGzcQaW191sZpdNrjutk6veUSV2R");
|
||||
var objectHeader = new ObjectHeader(containerId, ObjectType.REGULAR, null);
|
||||
var objectHeader = new ObjectHeader(containerId, ObjectType.REGULAR);
|
||||
|
||||
//When + Then
|
||||
try (MockedStatic<Types.ObjectType> mockStatic = mockStatic(Types.ObjectType.class)) {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
package info.frostfs.sdk.mappers;
|
||||
package info.frostfs.sdk.mappers.object;
|
||||
|
||||
import info.frostfs.sdk.dto.OwnerId;
|
||||
import info.frostfs.sdk.dto.object.OwnerId;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
|
@ -0,0 +1,57 @@
|
|||
package info.frostfs.sdk.mappers.response;
|
||||
|
||||
import frostfs.session.Types;
|
||||
import info.frostfs.sdk.dto.netmap.Version;
|
||||
import info.frostfs.sdk.dto.response.MetaHeader;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
public class MetaHeaderMapperTest {
|
||||
|
||||
@Test
|
||||
void toGrpcMessage_success() {
|
||||
//Given
|
||||
var version = new Version(1, 2);
|
||||
var metaHeader = new MetaHeader(version, 1, 2);
|
||||
|
||||
//When
|
||||
Types.RequestMetaHeader result = MetaHeaderMapper.toGrpcMessage(metaHeader);
|
||||
|
||||
//Then
|
||||
assertNotNull(result);
|
||||
assertEquals(metaHeader.getEpoch(), result.getEpoch());
|
||||
assertEquals(metaHeader.getTtl(), result.getTtl());
|
||||
assertEquals(metaHeader.getVersion().getMajor(), result.getVersion().getMajor());
|
||||
assertEquals(metaHeader.getVersion().getMinor(), result.getVersion().getMinor());
|
||||
}
|
||||
|
||||
@Test
|
||||
void toGrpcMessage_null() {
|
||||
//When + Then
|
||||
assertThrows(IllegalArgumentException.class, () -> MetaHeaderMapper.toGrpcMessage(null));
|
||||
}
|
||||
|
||||
@Test
|
||||
void toGrpcMessageBuilder_success() {
|
||||
//Given
|
||||
var version = new Version(1, 2);
|
||||
var metaHeader = new MetaHeader(version, 1, 2);
|
||||
|
||||
//When
|
||||
Types.RequestMetaHeader.Builder result = MetaHeaderMapper.toGrpcMessageBuilder(metaHeader);
|
||||
|
||||
//Then
|
||||
assertNotNull(result);
|
||||
assertEquals(metaHeader.getEpoch(), result.getEpoch());
|
||||
assertEquals(metaHeader.getTtl(), result.getTtl());
|
||||
assertEquals(metaHeader.getVersion().getMajor(), result.getVersion().getMajor());
|
||||
assertEquals(metaHeader.getVersion().getMinor(), result.getVersion().getMinor());
|
||||
}
|
||||
|
||||
@Test
|
||||
void toGrpcMessageBuilder_null() {
|
||||
//When + Then
|
||||
assertThrows(IllegalArgumentException.class, () -> MetaHeaderMapper.toGrpcMessageBuilder(null));
|
||||
}
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
package info.frostfs.sdk.mappers;
|
||||
package info.frostfs.sdk.mappers.response;
|
||||
|
||||
import frostfs.status.Types;
|
||||
import info.frostfs.sdk.enums.StatusCode;
|
||||
|
@ -8,7 +8,7 @@ import org.junit.jupiter.params.provider.EnumSource;
|
|||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
public class StatusMapperTest {
|
||||
public class ResponseStatusMapperTest {
|
||||
|
||||
@ParameterizedTest
|
||||
@EnumSource(value = StatusCode.class)
|
||||
|
@ -20,7 +20,7 @@ public class StatusMapperTest {
|
|||
.build();
|
||||
|
||||
//When
|
||||
var result = StatusMapper.toModel(status);
|
||||
var result = ResponseStatusMapper.toModel(status);
|
||||
|
||||
//Then
|
||||
assertNotNull(result);
|
||||
|
@ -31,7 +31,7 @@ public class StatusMapperTest {
|
|||
@Test
|
||||
void toModel_null() {
|
||||
//When
|
||||
var result = StatusMapper.toModel(null);
|
||||
var result = ResponseStatusMapper.toModel(null);
|
||||
|
||||
//Then
|
||||
assertNotNull(result);
|
||||
|
@ -48,6 +48,6 @@ public class StatusMapperTest {
|
|||
.build();
|
||||
|
||||
//When + Then
|
||||
assertThrows(IllegalArgumentException.class, () -> StatusMapper.toModel(status));
|
||||
assertThrows(IllegalArgumentException.class, () -> ResponseStatusMapper.toModel(status));
|
||||
}
|
||||
}
|
|
@ -1,7 +1,7 @@
|
|||
package info.frostfs.sdk.mappers;
|
||||
package info.frostfs.sdk.mappers.response;
|
||||
|
||||
import frostfs.refs.Types;
|
||||
import info.frostfs.sdk.dto.Signature;
|
||||
import info.frostfs.sdk.dto.response.Signature;
|
||||
import info.frostfs.sdk.enums.SignatureScheme;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.params.ParameterizedTest;
|
|
@ -1,4 +1,4 @@
|
|||
package info.frostfs.sdk.mappers;
|
||||
package info.frostfs.sdk.mappers.session;
|
||||
|
||||
import com.google.protobuf.ByteString;
|
||||
import frostfs.session.Types;
|
Loading…
Add table
Add a link
Reference in a new issue