LPS-155275 Include integration tests for Custom Object Fields

modules/apps/object/object-test/src/testIntegration/java/com/liferay/object/service/test/ObjectFieldLocalServiceTest.java

@@ -89,6 +89,35 @@ public class ObjectFieldLocalServiceTest {
 	public static final AggregateTestRule aggregateTestRule =
 		new LiferayIntegrationTestRule();
 
+	@Test
+	public void testAddCustomObjectField() throws Exception {
+
+		// Reserved name
+
+		String[] reservedNames = {
+			"actions", "companyId", "createDate", "creator", "dateCreated",
+			"dateModified", "externalReferenceCode", "groupId", "id",
+			"lastPublishDate", "modifiedDate", "statusByUserId",
+			"statusByUserName", "statusDate", "userId", "userName"
+		};
+
+		for (String reservedName : reservedNames) {
+			try {
+				_testAddCustomObjectField(
+					ObjectFieldUtil.createObjectField(
+						"Text", "String", reservedName,
+						_getObjectFieldSettings("Text")));
+
+				Assert.fail();
+			}
+			catch (ObjectFieldNameException objectFieldNameException) {
+				Assert.assertEquals(
+					"Reserved name " + reservedName,
+					objectFieldNameException.getMessage());
+			}
+		}
+	}
+
 	@Test
 	public void testAddSystemObjectField() throws Exception {
 
@@ -913,6 +942,32 @@ private boolean _hasColumn(String tableName, String columnName)
 		}
 	}
 
+	private void _testAddCustomObjectField(ObjectField... objectFields)
+		throws Exception {
+
+		ObjectDefinition objectDefinition = null;
+
+		try {
+			objectDefinition =
+				_objectDefinitionLocalService.addCustomObjectDefinition(
+					TestPropsValues.getUserId(),
+					LocalizedMapUtil.getLocalizedMap(
+						RandomTestUtil.randomString()),
+					"A" + RandomTestUtil.randomString(), null, null,
+					LocalizedMapUtil.getLocalizedMap(
+						RandomTestUtil.randomString()),
+					ObjectDefinitionConstants.SCOPE_COMPANY,
+					ObjectDefinitionConstants.STORAGE_TYPE_DEFAULT,
+					Arrays.asList(objectFields));
+		}
+		finally {
+			if (objectDefinition != null) {
+				_objectDefinitionLocalService.deleteObjectDefinition(
+					objectDefinition);
+			}
+		}
+	}
+
 	private String _testAddSystemObjectField(ObjectField... objectFields)
 		throws Exception {