Commit 545c2182 authored by Noel Alonso's avatar Noel Alonso
Browse files

Renombra dto y referencias

parent 96a5f846

src/main/java/es/redmic/usersettingslib/dto/SaveDTO.java→src/main/java/es/redmic/usersettingslib/dto/PersistenceDTO.java

+4 −4
Original line number Diff line number Diff line
@@ -29,13 +29,13 @@ import org.joda.time.DateTimeZone; 
import com.fasterxml.jackson.annotation.JsonIgnore;

import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaDefault;



public class SaveDTO extends SettingsBaseDTO {

public class PersistenceDTO extends SettingsBaseDTO {



	// @formatter:off

	

	@JsonIgnore

	public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse(

		"{\"type\":\"record\",\"name\":\"SaveDTO\",\"namespace\":\"es.redmic.usersettingslib.dto\",\"fields\":["

		"{\"type\":\"record\",\"name\":\"PersistenceDTO\",\"namespace\":\"es.redmic.usersettingslib.dto\",\"fields\":["

			+ "{\"name\":\"name\",\"type\":[\"string\", \"null\"]},"

			+ "{\"name\":\"shared\",\"type\":\"boolean\", \"default\": \"false\"},"

			+ "{\"name\":\"userId\",\"type\":[\"string\", \"null\"]},"
@@ -48,7 +48,7 @@ public class SaveDTO extends SettingsBaseDTO { 
			+ "{\"name\":\"id\",\"type\":\"string\"}]}");

	// @formatter:on



	public SaveDTO() {

	public PersistenceDTO() {

		super();

	}
@@ -102,7 +102,7 @@ public class SaveDTO extends SettingsBaseDTO { 
			return false;

		if (getClass() != obj.getClass())

			return false;

		SaveDTO other = (SaveDTO) obj;

		PersistenceDTO other = (PersistenceDTO) obj;

		if (name == null) {

			if (other.name != null)

				return false;

src/test/java/es/redmic/usersettingslib/unit/dto/SaveCheckAvroSchemaTest.java→src/test/java/es/redmic/usersettingslib/unit/dto/PersistenceCheckAvroSchemaTest.java

+4 −4
Original line number Diff line number Diff line
@@ -27,19 +27,19 @@ import org.junit.Test; 
import org.skyscreamer.jsonassert.JSONAssert;



import es.redmic.testutils.utils.AvroBaseTest;

import es.redmic.usersettingslib.dto.SaveDTO;

import es.redmic.usersettingslib.dto.PersistenceDTO;

import es.redmic.usersettingslib.unit.utils.SettingsDataUtil;



public class SaveCheckAvroSchemaTest extends AvroBaseTest {

public class PersistenceCheckAvroSchemaTest extends AvroBaseTest {



	@Test

	public void serializeAndDeserialize_IsSuccessful_IfSchemaAndDataAreCorrect() throws JSONException {



		SaveDTO dto = SettingsDataUtil.getSaveDTO();

		PersistenceDTO dto = SettingsDataUtil.getSaveDTO();



		Object result = serializerAndDeserializer(dto);



		assertTrue("El objeto obtenido debe ser una instancia de SaveDTO", SaveDTO.class.isInstance(result));

		assertTrue("El objeto obtenido debe ser una instancia de SaveDTO", PersistenceDTO.class.isInstance(result));



		JSONAssert.assertEquals(result.toString(), dto.toString(), false);

	}

src/test/java/es/redmic/usersettingslib/unit/dto/SaveCheckDTOValidationTest.java→src/test/java/es/redmic/usersettingslib/unit/dto/PersistenceCheckDTOValidationTest.java

+3 −3
Original line number Diff line number Diff line
@@ -24,12 +24,12 @@ import org.junit.Before; 
import org.junit.Test;



import es.redmic.testutils.dto.DTOBaseTest;

import es.redmic.usersettingslib.dto.SaveDTO;

import es.redmic.usersettingslib.dto.PersistenceDTO;

import es.redmic.usersettingslib.unit.utils.SettingsDataUtil;



public class SaveCheckDTOValidationTest extends DTOBaseTest<SaveDTO> {

public class PersistenceCheckDTOValidationTest extends DTOBaseTest<PersistenceDTO> {



	private static SaveDTO dto;

	private static PersistenceDTO dto;



	@Before

	public void reset() {

src/test/java/es/redmic/usersettingslib/unit/dto/SaveEqualTest.java→src/test/java/es/redmic/usersettingslib/unit/dto/PersistenceEqualTest.java

+31 −31
Original line number Diff line number Diff line
@@ -26,15 +26,15 @@ import static org.junit.Assert.assertTrue; 
import org.joda.time.DateTime;

import org.junit.Test;



import es.redmic.usersettingslib.dto.SaveDTO;

import es.redmic.usersettingslib.dto.PersistenceDTO;

import es.redmic.usersettingslib.unit.utils.SettingsDataUtil;



public class SaveEqualTest {

public class PersistenceEqualTest {



	@Test

	public void equal_returnTrue_IfSaveTypeIsEqual() {



		SaveDTO dto = SettingsDataUtil.getSaveDTO();

		PersistenceDTO dto = SettingsDataUtil.getSaveDTO();



		assertTrue(dto.equals(dto));

	}
@@ -42,9 +42,9 @@ public class SaveEqualTest { 
	@Test

	public void equal_returnFalse_IfIdIsDifferent() {



		SaveDTO dto1 = SettingsDataUtil.getSaveDTO();

		PersistenceDTO dto1 = SettingsDataUtil.getSaveDTO();



		SaveDTO dto2 = SettingsDataUtil.getSaveDTO();

		PersistenceDTO dto2 = SettingsDataUtil.getSaveDTO();



		dto1.setId("111111");

		assertFalse(dto1.equals(dto2));
@@ -53,9 +53,9 @@ public class SaveEqualTest { 
	@Test

	public void equal_returnFalse_IfIdIsNull() {



		SaveDTO dto1 = SettingsDataUtil.getSaveDTO();

		PersistenceDTO dto1 = SettingsDataUtil.getSaveDTO();



		SaveDTO dto2 = SettingsDataUtil.getSaveDTO();

		PersistenceDTO dto2 = SettingsDataUtil.getSaveDTO();



		dto1.setId(null);

		assertFalse(dto1.equals(dto2));
@@ -64,9 +64,9 @@ public class SaveEqualTest { 
	@Test

	public void equal_returnFalse_IfNameIsDifferent() {



		SaveDTO dto1 = SettingsDataUtil.getSaveDTO();

		PersistenceDTO dto1 = SettingsDataUtil.getSaveDTO();



		SaveDTO dto2 = SettingsDataUtil.getSaveDTO();

		PersistenceDTO dto2 = SettingsDataUtil.getSaveDTO();



		dto1.setName("cddd");

		assertFalse(dto1.equals(dto2));
@@ -75,9 +75,9 @@ public class SaveEqualTest { 
	@Test

	public void equal_returnFalse_IfNameIsNull() {



		SaveDTO dto1 = SettingsDataUtil.getSaveDTO();

		PersistenceDTO dto1 = SettingsDataUtil.getSaveDTO();



		SaveDTO dto2 = SettingsDataUtil.getSaveDTO();

		PersistenceDTO dto2 = SettingsDataUtil.getSaveDTO();



		dto1.setName(null);

		assertFalse(dto1.equals(dto2));
@@ -86,9 +86,9 @@ public class SaveEqualTest { 
	@Test

	public void equal_returnFalse_IfSharedIsDifferent() {



		SaveDTO dto1 = SettingsDataUtil.getSaveDTO();

		PersistenceDTO dto1 = SettingsDataUtil.getSaveDTO();



		SaveDTO dto2 = SettingsDataUtil.getSaveDTO();

		PersistenceDTO dto2 = SettingsDataUtil.getSaveDTO();



		dto1.setShared(true);

		assertFalse(dto1.equals(dto2));
@@ -97,9 +97,9 @@ public class SaveEqualTest { 
	@Test

	public void equal_returnFalse_IfSharedIsNull() {



		SaveDTO dto1 = SettingsDataUtil.getSaveDTO();

		PersistenceDTO dto1 = SettingsDataUtil.getSaveDTO();



		SaveDTO dto2 = SettingsDataUtil.getSaveDTO();

		PersistenceDTO dto2 = SettingsDataUtil.getSaveDTO();



		dto1.setShared(null);

		assertFalse(dto1.equals(dto2));
@@ -108,9 +108,9 @@ public class SaveEqualTest { 
	@Test

	public void equal_returnFalse_IfUserIdIsDifferent() {



		SaveDTO dto1 = SettingsDataUtil.getSaveDTO();

		PersistenceDTO dto1 = SettingsDataUtil.getSaveDTO();



		SaveDTO dto2 = SettingsDataUtil.getSaveDTO();

		PersistenceDTO dto2 = SettingsDataUtil.getSaveDTO();



		dto1.setUserId("ddd");

		assertFalse(dto1.equals(dto2));
@@ -119,9 +119,9 @@ public class SaveEqualTest { 
	@Test

	public void equal_returnFalse_IfUserIdIsNull() {



		SaveDTO dto1 = SettingsDataUtil.getSaveDTO();

		PersistenceDTO dto1 = SettingsDataUtil.getSaveDTO();



		SaveDTO dto2 = SettingsDataUtil.getSaveDTO();

		PersistenceDTO dto2 = SettingsDataUtil.getSaveDTO();



		dto1.setUserId(null);

		assertFalse(dto1.equals(dto2));
@@ -130,9 +130,9 @@ public class SaveEqualTest { 
	@Test

	public void equal_returnFalse_IfInsertedIsDifferent() {



		SaveDTO dto1 = SettingsDataUtil.getSaveDTO();

		PersistenceDTO dto1 = SettingsDataUtil.getSaveDTO();



		SaveDTO dto2 = SettingsDataUtil.getSaveDTO();

		PersistenceDTO dto2 = SettingsDataUtil.getSaveDTO();



		dto1.setInserted(DateTime.now().plus(2));

		assertFalse(dto1.equals(dto2));
@@ -141,9 +141,9 @@ public class SaveEqualTest { 
	@Test

	public void equal_returnFalse_IfInsertedIsNull() {



		SaveDTO dto1 = SettingsDataUtil.getSaveDTO();

		PersistenceDTO dto1 = SettingsDataUtil.getSaveDTO();



		SaveDTO dto2 = SettingsDataUtil.getSaveDTO();

		PersistenceDTO dto2 = SettingsDataUtil.getSaveDTO();



		dto1.setInserted(null);

		assertFalse(dto1.equals(dto2));
@@ -152,9 +152,9 @@ public class SaveEqualTest { 
	@Test

	public void equal_returnFalse_IfUpdatedIsDifferent() {



		SaveDTO dto1 = SettingsDataUtil.getSaveDTO();

		PersistenceDTO dto1 = SettingsDataUtil.getSaveDTO();



		SaveDTO dto2 = SettingsDataUtil.getSaveDTO();

		PersistenceDTO dto2 = SettingsDataUtil.getSaveDTO();



		dto1.setUpdated(DateTime.now().plus(2));

		assertFalse(dto1.equals(dto2));
@@ -163,9 +163,9 @@ public class SaveEqualTest { 
	@Test

	public void equal_returnFalse_IfUpdatedIsNull() {



		SaveDTO dto1 = SettingsDataUtil.getSaveDTO();

		PersistenceDTO dto1 = SettingsDataUtil.getSaveDTO();



		SaveDTO dto2 = SettingsDataUtil.getSaveDTO();

		PersistenceDTO dto2 = SettingsDataUtil.getSaveDTO();



		dto1.setUpdated(null);

		assertFalse(dto1.equals(dto2));
@@ -174,9 +174,9 @@ public class SaveEqualTest { 
	@Test

	public void equal_returnFalse_IfAccessedIsDifferent() {



		SaveDTO dto1 = SettingsDataUtil.getSaveDTO();

		PersistenceDTO dto1 = SettingsDataUtil.getSaveDTO();



		SaveDTO dto2 = SettingsDataUtil.getSaveDTO();

		PersistenceDTO dto2 = SettingsDataUtil.getSaveDTO();



		dto1.setAccessed(DateTime.now().plus(2));

		assertFalse(dto1.equals(dto2));
@@ -185,9 +185,9 @@ public class SaveEqualTest { 
	@Test

	public void equal_returnFalse_IfAccessedIsNull() {



		SaveDTO dto1 = SettingsDataUtil.getSaveDTO();

		PersistenceDTO dto1 = SettingsDataUtil.getSaveDTO();



		SaveDTO dto2 = SettingsDataUtil.getSaveDTO();

		PersistenceDTO dto2 = SettingsDataUtil.getSaveDTO();



		dto1.setAccessed(null);

		assertFalse(dto1.equals(dto2));

src/test/java/es/redmic/usersettingslib/unit/utils/SettingsDataUtil.java

+173 −3
Original line number Diff line number Diff line
@@ -21,12 +21,30 @@ package es.redmic.usersettingslib.unit.utils; 
 */



import java.util.ArrayList;

import java.util.HashMap;

import java.util.Map;

import java.util.UUID;



import org.joda.time.DateTime;



import es.redmic.usersettingslib.dto.SaveDTO;

import es.redmic.usersettingslib.dto.PersistenceDTO;

import es.redmic.usersettingslib.dto.SelectionDTO;

import es.redmic.usersettingslib.events.SettingsEventTypes;

import es.redmic.usersettingslib.events.clear.ClearCancelledEvent;

import es.redmic.usersettingslib.events.clear.ClearConfirmedEvent;

import es.redmic.usersettingslib.events.clear.ClearEvent;

import es.redmic.usersettingslib.events.clear.ClearFailedEvent;

import es.redmic.usersettingslib.events.clear.ClearedEvent;

import es.redmic.usersettingslib.events.deselect.DeselectCancelledEvent;

import es.redmic.usersettingslib.events.deselect.DeselectConfirmedEvent;

import es.redmic.usersettingslib.events.deselect.DeselectEvent;

import es.redmic.usersettingslib.events.deselect.DeselectFailedEvent;

import es.redmic.usersettingslib.events.deselect.DeselectedEvent;

import es.redmic.usersettingslib.events.select.SelectCancelledEvent;

import es.redmic.usersettingslib.events.select.SelectConfirmedEvent;

import es.redmic.usersettingslib.events.select.SelectEvent;

import es.redmic.usersettingslib.events.select.SelectFailedEvent;

import es.redmic.usersettingslib.events.select.SelectedEvent;



public abstract class SettingsDataUtil {
@@ -36,6 +54,158 @@ public abstract class SettingsDataUtil { 
			USER = "1";

	// @formatter:on



	// SELECT



	public static SelectEvent getSelectEvent() {



		SelectEvent evt = new SelectEvent();

		evt.setAggregateId(PREFIX + CODE);

		evt.setType(SettingsEventTypes.SELECT);

		evt.setVersion(1);

		evt.setUserId(USER);

		evt.setSelection(getSelectionDTO());

		return evt;

	}



	public static SelectConfirmedEvent getSelectConfirmedEvent() {



		SelectConfirmedEvent evt = new SelectConfirmedEvent().buildFrom(getSelectEvent());

		evt.setType(SettingsEventTypes.SELECT_CONFIRMED);

		return evt;

	}



	public static SelectedEvent getSelectedEvent() {



		SelectedEvent evt = new SelectedEvent().buildFrom(getSelectEvent());

		evt.setType(SettingsEventTypes.SELECTED);

		evt.setSelection(getSelectionDTO());

		return evt;

	}



	public static SelectFailedEvent getSelectFailedEvent() {



		SelectFailedEvent evt = new SelectFailedEvent().buildFrom(getSelectEvent());

		evt.setType(SettingsEventTypes.SELECT_FAILED);

		evt.setExceptionType("ItemNotFound");

		Map<String, String> arguments = new HashMap<String, String>();

		arguments.put("a", "b");

		evt.setArguments(arguments);

		return evt;

	}



	public static SelectCancelledEvent getSelectCancelledEvent() {



		SelectCancelledEvent evt = new SelectCancelledEvent().buildFrom(getSelectEvent());

		evt.setType(SettingsEventTypes.SELECT_CANCELLED);

		evt.setExceptionType("ItemNotFound");

		Map<String, String> arguments = new HashMap<String, String>();

		arguments.put("a", "b");

		evt.setArguments(arguments);

		return evt;

	}



	// DESELECT



	public static DeselectEvent getDeselectEvent() {



		DeselectEvent evt = new DeselectEvent();

		evt.setAggregateId(PREFIX + CODE);

		evt.setType(SettingsEventTypes.SELECT);

		evt.setVersion(1);

		evt.setUserId(USER);

		evt.setSelection(getSelectionDTO());

		return evt;

	}



	public static DeselectConfirmedEvent getDeselectConfirmedEvent() {



		DeselectConfirmedEvent evt = new DeselectConfirmedEvent().buildFrom(getDeselectEvent());

		evt.setType(SettingsEventTypes.DESELECT_CONFIRMED);

		return evt;

	}



	public static DeselectedEvent getDeselectedEvent() {



		DeselectedEvent evt = new DeselectedEvent().buildFrom(getDeselectEvent());

		evt.setType(SettingsEventTypes.DESELECTED);

		evt.setSelection(getSelectionDTO());

		return evt;

	}



	public static DeselectFailedEvent getDeselectFailedEvent() {



		DeselectFailedEvent evt = new DeselectFailedEvent().buildFrom(getDeselectEvent());

		evt.setType(SettingsEventTypes.DESELECT_FAILED);

		evt.setExceptionType("ItemNotFound");

		Map<String, String> arguments = new HashMap<String, String>();

		arguments.put("a", "b");

		evt.setArguments(arguments);

		return evt;

	}



	public static DeselectCancelledEvent getDeselectCancelledEvent() {



		DeselectCancelledEvent evt = new DeselectCancelledEvent().buildFrom(getDeselectEvent());

		evt.setType(SettingsEventTypes.DESELECT_CANCELLED);

		evt.setExceptionType("ItemNotFound");

		Map<String, String> arguments = new HashMap<String, String>();

		arguments.put("a", "b");

		evt.setArguments(arguments);

		return evt;

	}



	// CLEAR



	public static ClearEvent getClearEvent() {



		ClearEvent evt = new ClearEvent();

		evt.setAggregateId(PREFIX + CODE);

		evt.setType(SettingsEventTypes.CLEAR);

		evt.setVersion(1);

		evt.setUserId(USER);

		evt.setSelection(getSelectionDTO());

		return evt;

	}



	public static ClearConfirmedEvent getClearConfirmedEvent() {



		ClearConfirmedEvent evt = new ClearConfirmedEvent().buildFrom(getClearEvent());

		evt.setType(SettingsEventTypes.CLEAR_CONFIRMED);

		return evt;

	}



	public static ClearedEvent getClearedEvent() {



		ClearedEvent evt = new ClearedEvent().buildFrom(getClearEvent());

		evt.setType(SettingsEventTypes.CLEARED);

		evt.setSelection(getSelectionDTO());

		return evt;

	}



	public static ClearFailedEvent getClearFailedEvent() {



		ClearFailedEvent evt = new ClearFailedEvent().buildFrom(getClearEvent());

		evt.setType(SettingsEventTypes.CLEAR_FAILED);

		evt.setExceptionType("ItemNotFound");

		Map<String, String> arguments = new HashMap<String, String>();

		arguments.put("a", "b");

		evt.setArguments(arguments);

		return evt;

	}



	public static ClearCancelledEvent getClearCancelledEvent() {



		ClearCancelledEvent evt = new ClearCancelledEvent().buildFrom(getClearEvent());

		evt.setType(SettingsEventTypes.CLEAR_CANCELLED);

		evt.setExceptionType("ItemNotFound");

		Map<String, String> arguments = new HashMap<String, String>();

		arguments.put("a", "b");

		evt.setArguments(arguments);

		return evt;

	}



	//



	@SuppressWarnings("serial")

	public static SelectionDTO getSelectionDTO() {
@@ -55,9 +225,9 @@ public abstract class SettingsDataUtil { 
		return selection;

	}



	public static SaveDTO getSaveDTO() {

	public static PersistenceDTO getSaveDTO() {



		SaveDTO save = new SaveDTO();

		PersistenceDTO save = new PersistenceDTO();



		save.setId(PREFIX + CODE);

		save.setName("prueba");