Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 11735 fix content type resource test #11738

Merged
merged 9 commits into from
May 30, 2017
Merged

Issue 11735 fix content type resource test #11738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bb7300f
#11695 fixes data as it saves it
wezell May 24, 2017
9c3a721
#11695 fixing data now has unit test
wezell May 24, 2017
18362ee
Merge branch 'issue-11695-unable-edit-system-legacy-field' into relea…
wezell May 24, 2017
4358208
Merge branch 'release-4.1' of github.com:dotCMS/core into release-4.1
wezell May 25, 2017
ff41e0d
Merge branch 'release-4.1' of github.com:dotCMS/core into release-4.1
wezell May 25, 2017
4d394aa
#11735 fixing ContentTypeResourceTest
wezell May 26, 2017
fcec622
#11735 saves a content type with a preset id
wezell May 26, 2017
4332f2a
#11735 Fix resource resolution.
dsilvam May 30, 2017
e811ec4
Merge branch 'release-4.1' of github.com:dotCMS/core into issue-11735…
dsilvam May 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions dotCMS/src/integration-test/java/com/dotcms/contenttype/test/ContentTypeResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@

import javax.servlet.http.HttpServletRequest;

import com.dotcms.util.ConfigTestHelper;
import org.apache.commons.io.IOUtils;
import org.junit.Assert;
import org.junit.Test;

import com.dotcms.contenttype.exception.NotFoundInDbException;
Expand All @@ -30,8 +32,9 @@ public class ContentTypeResourceTest extends ContentTypeBaseTest {
@Test
public void jsonTests() throws Exception {

URL resource = this.getClass().getResource(base);
File directory = new File(resource.toURI());
URL resource = ConfigTestHelper.getUrlToTestResource("com/dotcms/contenttype/test/file-asset.json");
File pivotResource = new File(resource.toURI());
File directory = pivotResource.getParentFile();
assertThat("we have a testing directory with json in it", directory != null);

for (String file : directory.list()) {
Expand Down Expand Up @@ -68,7 +71,7 @@ public void testJson(String jsonFile) throws Exception {
Response response = resource.createType(getHttpRequest(), json);

int x = response.getStatus();
assertThat("result:200 with json " + jsonFile, x == 200);
assertThat("result:200 with json " + jsonFile + "got :" + x, x == 200);
}

/**
Expand Down
91 changes: 91 additions & 0 deletions ...ntegration-test/java/com/dotmarketing/portlets/contentlet/business/ContentletAPITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Expand All @@ -28,6 +30,7 @@
import com.dotcms.content.business.DotMappingException;
import com.dotcms.content.elasticsearch.business.ESMappingAPIImpl;
import com.dotcms.contenttype.model.type.BaseContentType;
import com.dotcms.contenttype.model.type.ContentType;
import com.dotcms.datagen.ContainerDataGen;
import com.dotcms.datagen.ContentletDataGen;
import com.dotcms.datagen.FileAssetDataGen;
Expand All @@ -39,6 +42,7 @@
import com.dotcms.mock.response.BaseResponse;
import com.dotcms.repackage.org.apache.commons.io.FileUtils;
import com.dotcms.repackage.org.apache.commons.lang.time.FastDateFormat;
import com.dotcms.repackage.twitter4j.IDs;
import com.dotmarketing.beans.Host;
import com.dotmarketing.beans.Identifier;
import com.dotmarketing.beans.MultiTree;
Expand Down Expand Up @@ -1159,6 +1163,93 @@ public void archive () throws DotDataException, DotSecurityException {
}
}

/**
* https://github.com/dotCMS/core/issues/11716
* @throws DotDataException
* @throws DotSecurityException
*/

@Test
public void addRemoveContentFromIndex () throws DotDataException, DotSecurityException {
// respect CMS Anonymous permissions
boolean respectFrontendRoles = false;
int num = 5;
Host host = APILocator.getHostAPI().findDefaultHost(user, respectFrontendRoles);
Folder folder = APILocator.getFolderAPI().findSystemFolder();

Language lang = APILocator.getLanguageAPI().getDefaultLanguage();
ContentType type = APILocator.getContentTypeAPI(user).find("webPageContent");
List<Contentlet> origCons = new ArrayList<>();

Map map = new HashMap<>();
map.put("stInode", type.id());
map.put("host", host.getIdentifier());
map.put("folder", folder.getInode());
map.put("languageId", lang.getId());
map.put("sortOrder", new Long(0));
map.put("body", "body");


//add 5 contentlets
for(int i = 0;i<num;i++){
map.put("title", i+ "my test title");

// create a new piece of content backed by the map created above
Contentlet content = new Contentlet(map);

// check in the content
content= contentletAPI.checkin(content,user, respectFrontendRoles);

assertTrue( content.getIdentifier()!=null );
assertTrue( content.isWorking());
assertFalse( content.isLive());
// publish the content
contentletAPI.publish(content, user, respectFrontendRoles);
assertTrue( content.isLive());
origCons.add(content);
}


//commit it index
HibernateUtil.closeSession();
for(Contentlet c : origCons){
assertTrue(contentletAPI.indexCount("+live:true +identifier:" +c.getIdentifier() + " +inode:" + c.getInode() , user, respectFrontendRoles)>0);
}


HibernateUtil.startTransaction();
try{
List<Contentlet> checkedOut=contentletAPI.checkout(origCons, user, respectFrontendRoles);
for(Contentlet c : checkedOut){
c.setStringProperty("title", c.getStringProperty("title") + " new");
c = contentletAPI.checkin(c,user, respectFrontendRoles);
contentletAPI.publish(c, user, respectFrontendRoles);
assertTrue( c.isLive());
}
throw new DotDataException("uh oh, what happened?");
}
catch(DotDataException e){
HibernateUtil.rollbackTransaction();

}
finally{
HibernateUtil.closeSession();
}
for(Contentlet c : origCons){
assertTrue(contentletAPI.indexCount("+live:true +identifier:" +c.getIdentifier() + " +inode:" + c.getInode() , user, respectFrontendRoles)>0);
}

}










/**
* Testing {@link ContentletAPI#delete(com.dotmarketing.portlets.contentlet.model.Contentlet, com.liferay.portal.model.User, boolean)}
*
Expand Down
56 changes: 29 additions & 27 deletions ...src/integration-test/resources/com/dotcms/contenttype/test/content-type-array-insert.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@
"modDate": 1479496985000,
"name": "",
"userId": "dotcms.org.1",
"value": "werew"
"value": "werew",
"clazz" : "com.dotcms.contenttype.model.field.ImmutableFieldVariable"
}
],
"fixed": false,
"implClass": "com.dotcms.contenttype.model.field.ImmutableHostFolderField",
"clazz": "com.dotcms.contenttype.model.field.ImmutableHostFolderField",
"indexed": true,
"inode": "ee91a37d-9d9f-4488-a1ce-50516e5309dc",
"listed": false,
Expand All @@ -43,7 +44,7 @@
"fieldVariables": [],
"fixed": false,
"iDate": 1308941148000,
"implClass": "com.dotcms.contenttype.model.field.ImmutableTextField",
"clazz": "com.dotcms.contenttype.model.field.ImmutableTextField",
"indexed": true,
"inode": "5c21daa4-1482-4bc9-9d61-04b42d35a6ee",
"listed": true,
Expand All @@ -64,7 +65,7 @@
"fieldVariables": [],
"fixed": false,
"iDate": 1453474468000,
"implClass": "com.dotcms.contenttype.model.field.ImmutableTagField",
"clazz": "com.dotcms.contenttype.model.field.ImmutableTagField",
"indexed": true,
"inode": "0030b173-41c4-40ae-8331-1c438fcb514e",
"listed": false,
Expand All @@ -87,7 +88,7 @@
"fieldVariables": [],
"fixed": false,
"iDate": 1411763369000,
"implClass": "com.dotcms.contenttype.model.field.ImmutableWysiwygField",
"clazz": "com.dotcms.contenttype.model.field.ImmutableWysiwygField",
"indexed": false,
"inode": "abb57118-7979-400e-9e7d-208e9dfe1f64",
"listed": false,
Expand All @@ -114,7 +115,7 @@
"fieldVariables": [],
"fixed": false,
"iDate": 1453472236000,
"implClass": "com.dotcms.contenttype.model.field.ImmutableSelectField",
"clazz": "com.dotcms.contenttype.model.field.ImmutableSelectField",
"indexed": false,
"inode": "bd07dab3-c559-4d1b-873a-050e8cc6359c",
"listed": false,
Expand All @@ -136,7 +137,7 @@
"fixed": false,
"hint": "Recommended size 940x350",
"iDate": 1308941399000,
"implClass": "com.dotcms.contenttype.model.field.ImmutableBinaryField",
"clazz": "com.dotcms.contenttype.model.field.ImmutableBinaryField",
"indexed": false,
"inode": "fff86d86-7908-4922-aaed-a3e8b0c6aae4",
"listed": false,
Expand All @@ -161,7 +162,7 @@
"fieldVariables": [],
"fixed": false,
"iDate": 1412016702000,
"implClass": "com.dotcms.contenttype.model.field.ImmutableCustomField",
"clazz": "com.dotcms.contenttype.model.field.ImmutableCustomField",
"indexed": true,
"inode": "c4712e56-ec64-4795-8613-63dff910b34e",
"listed": true,
Expand All @@ -186,7 +187,7 @@
"fieldVariables": [],
"fixed": false,
"iDate": 1412187539000,
"implClass": "com.dotcms.contenttype.model.field.ImmutableCustomField",
"clazz": "com.dotcms.contenttype.model.field.ImmutableCustomField",
"indexed": true,
"inode": "46e98b70-d4f8-4dbe-9e12-eb65ae00a07e",
"listed": true,
Expand All @@ -205,7 +206,7 @@
"folder": "SYSTEM_FOLDER",
"host": "48190c8c-42c4-46af-8d1a-0cd5db894797",
"iDate": 1453474503000,
"implClass": "com.dotcms.contenttype.model.type.ImmutableSimpleContentType",
"clazz": "com.dotcms.contenttype.model.type.ImmutableSimpleContentType",
"inode": "4c441ada-944a-43af-a653-9bb4f3f0cb2b",
"modDate": 1478557845000,
"multilingualable": false,
Expand All @@ -230,12 +231,13 @@
"modDate": 1479506692000,
"name": "",
"userId": "dotcms.org.1",
"value": "asdasdasd"
"value": "asdasdasd",
"clazz" : "com.dotcms.contenttype.model.field.ImmutableFieldVariable"
}
],
"fixed": false,
"iDate": 1352489401000,
"implClass": "com.dotcms.contenttype.model.field.HostFolderField",
"clazz": "com.dotcms.contenttype.model.field.HostFolderField",
"indexed": false,
"listed": false,
"modDate": 1395411079000,
Expand All @@ -253,7 +255,7 @@
"fieldVariables": [],
"fixed": false,
"iDate": 1352489482000,
"implClass": "com.dotcms.contenttype.model.field.DateTimeField",
"clazz": "com.dotcms.contenttype.model.field.DateTimeField",
"indexed": true,
"listed": true,
"modDate": 1395411079000,
Expand All @@ -271,7 +273,7 @@
"fieldVariables": [],
"fixed": false,
"iDate": 1352489522000,
"implClass": "com.dotcms.contenttype.model.field.TextField",
"clazz": "com.dotcms.contenttype.model.field.TextField",
"indexed": true,
"listed": true,
"modDate": 1395411079000,
Expand All @@ -290,7 +292,7 @@
"fieldVariables": [],
"fixed": false,
"iDate": 1352489564000,
"implClass": "com.dotcms.contenttype.model.field.CustomField",
"clazz": "com.dotcms.contenttype.model.field.CustomField",
"indexed": true,
"listed": false,
"modDate": 1407252812000,
Expand All @@ -309,7 +311,7 @@
"fieldVariables": [],
"fixed": false,
"iDate": 1352489616000,
"implClass": "com.dotcms.contenttype.model.field.TextField",
"clazz": "com.dotcms.contenttype.model.field.TextField",
"indexed": true,
"listed": true,
"modDate": 1395411079000,
Expand All @@ -328,7 +330,7 @@
"fieldVariables": [],
"fixed": false,
"iDate": 1352489643000,
"implClass": "com.dotcms.contenttype.model.field.TextAreaField",
"clazz": "com.dotcms.contenttype.model.field.TextAreaField",
"indexed": false,
"listed": false,
"modDate": 1395411079000,
Expand All @@ -347,7 +349,7 @@
"fieldVariables": [],
"fixed": false,
"iDate": 1352489664000,
"implClass": "com.dotcms.contenttype.model.field.WysiwygField",
"clazz": "com.dotcms.contenttype.model.field.WysiwygField",
"indexed": false,
"listed": false,
"modDate": 1395411079000,
Expand All @@ -365,7 +367,7 @@
"fieldVariables": [],
"fixed": false,
"iDate": 1352489688000,
"implClass": "com.dotcms.contenttype.model.field.BinaryField",
"clazz": "com.dotcms.contenttype.model.field.BinaryField",
"indexed": false,
"listed": false,
"modDate": 1395411079000,
Expand All @@ -383,7 +385,7 @@
"fieldVariables": [],
"fixed": false,
"iDate": 1352489743000,
"implClass": "com.dotcms.contenttype.model.field.TextField",
"clazz": "com.dotcms.contenttype.model.field.TextField",
"indexed": false,
"listed": false,
"modDate": 1395411079000,
Expand All @@ -402,7 +404,7 @@
"fieldVariables": [],
"fixed": false,
"iDate": 1352489779000,
"implClass": "com.dotcms.contenttype.model.field.LineDividerField",
"clazz": "com.dotcms.contenttype.model.field.LineDividerField",
"indexed": false,
"listed": false,
"modDate": 1395411079000,
Expand All @@ -420,7 +422,7 @@
"fieldVariables": [],
"fixed": false,
"iDate": 1352489810000,
"implClass": "com.dotcms.contenttype.model.field.CategoryField",
"clazz": "com.dotcms.contenttype.model.field.CategoryField",
"indexed": true,
"listed": false,
"modDate": 1395411079000,
Expand All @@ -439,7 +441,7 @@
"fieldVariables": [],
"fixed": false,
"iDate": 1352489845000,
"implClass": "com.dotcms.contenttype.model.field.TagField",
"clazz": "com.dotcms.contenttype.model.field.TagField",
"indexed": true,
"listed": false,
"modDate": 1395411079000,
Expand All @@ -457,7 +459,7 @@
"fieldVariables": [],
"fixed": false,
"iDate": 1352489885000,
"implClass": "com.dotcms.contenttype.model.field.TextField",
"clazz": "com.dotcms.contenttype.model.field.TextField",
"indexed": true,
"listed": false,
"modDate": 1395411079000,
Expand All @@ -476,7 +478,7 @@
"fieldVariables": [],
"fixed": false,
"iDate": 1352489917000,
"implClass": "com.dotcms.contenttype.model.field.LineDividerField",
"clazz": "com.dotcms.contenttype.model.field.LineDividerField",
"indexed": false,
"listed": false,
"modDate": 1395411079000,
Expand All @@ -493,7 +495,7 @@
"dbColumn": "system_field2",
"fieldVariables": [],
"fixed": false,
"implClass": "com.dotcms.contenttype.model.field.RelationshipsTabField",
"clazz": "com.dotcms.contenttype.model.field.RelationshipsTabField",
"indexed": false,
"listed": false,
"name": "Relationships",
Expand All @@ -508,7 +510,7 @@
"fixed": false,
"folder": "SYSTEM_FOLDER",
"host": "SYSTEM_HOST",
"implClass": "com.dotcms.contenttype.model.type.SimpleContentType",
"clazz": "com.dotcms.contenttype.model.type.SimpleContentType",
"name": "Wiki",
"owner": "dotcms.org.1",
"system": false,
Expand Down
Loading