LPS-42647 SF and sort

22996963 · Dec 3, 2013 · 3e9fc70 · 3e9fc70
1 parent 6cda5f6
commit 3e9fc70
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/...t-resources-importer-portlet/docroot/WEB-INF/src/test/resource/templates/page/page_1.json b/...t-resources-importer-portlet/docroot/WEB-INF/src/test/resource/templates/page/page_1.json
@@ -17,4 +17,4 @@
 		"title": "Page 1"
 	},
 	"layoutTemplateId": "2_columns_ii"
-}
+}
diff --git a/...t-resources-importer-portlet/docroot/WEB-INF/src/test/resource/templates/page/page_2.json b/...t-resources-importer-portlet/docroot/WEB-INF/src/test/resource/templates/page/page_2.json
@@ -12,4 +12,4 @@
 		"title": "Page 2"
 	},
 	"layoutTemplateId": "2_columns_ii"
-}
+}
diff --git a/portlets/test-resources-importer-portlet/docroot/view.jsp b/portlets/test-resources-importer-portlet/docroot/view.jsp
@@ -178,15 +178,14 @@ for (String importer : importers) {
 		dynamicQuery.setProjection(ProjectionFactoryUtil.distinct(ProjectionFactoryUtil.property("name")));
 
 		Criterion layout1Criterion = RestrictionsFactoryUtil.eq("description", "Page 1");
-
 		Criterion layout2Criterion = RestrictionsFactoryUtil.eq("description", "Page 2");
 
 		dynamicQuery.add(RestrictionsFactoryUtil.or(layout1Criterion, layout2Criterion));
 
 		List<Object> layoutPrototypes = LayoutPrototypeLocalServiceUtil.dynamicQuery(dynamicQuery);
 		%>
 
-		LayoutPrototype#getLayoutPrototypesCount=<%= _assertEquals(2, layoutPrototypes.size()) %><br />
+		LayoutPrototype#getLayoutPrototypesCount=<%= _assertEquals(2, layoutPrototypes.size()) %>
 	</p>
 
 	<p>
@@ -207,7 +206,7 @@ for (String importer : importers) {
 
 		DDMStructure#getParentStructureId=<%= _assertEquals("PARENT-STRUCTURE", parentStructureKey) %><br />
 		DDMStructureLocalServiceUtil#getStructuresCount(groupId, DDLRecordSet)=<%= _assertEquals(2, DDMStructureLocalServiceUtil.getStructuresCount(groupId, PortalUtil.getClassNameId(DDLRecordSet.class))) %><br />
-		DDMStructureLocalServiceUtil#getStructuresCount=<%= _assertEquals(5, DDMStructureLocalServiceUtil.getStructuresCount(groupId)) %><br />
+		DDMStructureLocalServiceUtil#getStructuresCount=<%= _assertEquals(5, DDMStructureLocalServiceUtil.getStructuresCount(groupId)) %>
 	</p>
 
 	<p>
@@ -229,10 +228,10 @@ for (String importer : importers) {
 		DDMTemplateLocalServiceUtil#getTemplatesCount(groupId, AssetEntry)=<%= _assertEquals(2, DDMTemplateLocalServiceUtil.getTemplatesCount(groupId, PortalUtil.getClassNameId(AssetEntry.class))) %><br />
 		DDMTemplateLocalServiceUtil#getTemplatesCount(groupId, AssetTag)=<%= _assertEquals(1, DDMTemplateLocalServiceUtil.getTemplatesCount(groupId, PortalUtil.getClassNameId(AssetTag.class))) %><br />
 		DDMTemplateLocalServiceUtil#getTemplatesCount(groupId, BlogsEntry)=<%= _assertEquals(1, DDMTemplateLocalServiceUtil.getTemplatesCount(groupId, PortalUtil.getClassNameId(BlogsEntry.class))) %><br />
+		DDMTemplateLocalServiceUtil#getTemplatesCount(groupId, DDMStructure)=<%= _assertEquals(8, DDMTemplateLocalServiceUtil.getTemplatesCount(groupId, PortalUtil.getClassNameId(DDMStructure.class))) %><br />
 		DDMTemplateLocalServiceUtil#getTemplatesCount(groupId, FileEntry)=<%= _assertEquals(1, DDMTemplateLocalServiceUtil.getTemplatesCount(groupId, PortalUtil.getClassNameId(FileEntry.class))) %><br />
 		DDMTemplateLocalServiceUtil#getTemplatesCount(groupId, LayoutSet)=<%= _assertEquals(1, DDMTemplateLocalServiceUtil.getTemplatesCount(groupId, PortalUtil.getClassNameId(LayoutSet.class))) %><br />
 		DDMTemplateLocalServiceUtil#getTemplatesCount(groupId, WikiPage)=<%= _assertEquals(1, DDMTemplateLocalServiceUtil.getTemplatesCount(groupId, PortalUtil.getClassNameId(WikiPage.class))) %><br />
-		DDMTemplateLocalServiceUtil#getTemplatesCount(groupId, DDMStructure)=<%= _assertEquals(8, DDMTemplateLocalServiceUtil.getTemplatesCount(groupId, PortalUtil.getClassNameId(DDMStructure.class))) %><br />
 		DDMTemplateLocalServiceUtil#getTemplatesCount=<%= _assertEquals(16, DDMTemplateLocalServiceUtil.getTemplatesCount(groupId)) %><br />
 	</p>
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,4 +17,4 @@ @@
     		"title": "Page 1"
     	},
     	"layoutTemplateId": "2_columns_ii"
-    }
+    }