Fixes tests.

Author: cmorgner

structr-base/src/main/java/org/structr/web/entity/AbstractFile.java

@@ -26,6 +26,7 @@
 import org.structr.api.schema.JsonSchema;
 import org.structr.common.PropertyView;
 import org.structr.common.SecurityContext;
+import org.structr.common.View;
 import org.structr.common.error.ErrorBuffer;
 import org.structr.common.error.FrameworkException;
 import org.structr.common.error.SemanticErrorToken;
@@ -61,6 +62,8 @@ public interface AbstractFile extends NodeInterface {
 	Property<Folder> parentProperty                             = new StartNode<>("parent", FolderCONTAINSAbstractFile.class).partOfBuiltInSchema();
 	Property<String> parentIdProperty                           = new EntityIdProperty("parentId", AbstractFile.parentProperty).format("parent, {},").partOfBuiltInSchema();
 
+	View uiView = new View(AbstractFile.class, PropertyView.Ui, parentProperty, storageConfigurationProperty);
+
 	static class Impl { static {
 
 		final JsonSchema schema   = SchemaService.getDynamicSchema();

structr-base/src/main/java/org/structr/web/entity/File.java

@@ -90,6 +90,7 @@ public interface File extends AbstractFile, Indexable, Linkable, JavaScriptSourc
 
 	Property<Folder> fileParentProperty = new StartNode<>("fileParent", FolderCONTAINSFile.class).partOfBuiltInSchema();
 
+
 	static class Impl { static {
 
 		final JsonSchema schema   = SchemaService.getDynamicSchema();

structr-base/src/main/java/org/structr/web/entity/Folder.java

@@ -21,10 +21,7 @@
 import org.structr.api.schema.JsonObjectType;
 import org.structr.api.schema.JsonSchema;
 import org.structr.api.util.Iterables;
-import org.structr.common.ConstantBooleanTrue;
-import org.structr.common.ContextAwareEntity;
-import org.structr.common.PropertyView;
-import org.structr.common.SecurityContext;
+import org.structr.common.*;
 import org.structr.common.error.ErrorBuffer;
 import org.structr.common.error.FrameworkException;
 import org.structr.core.Services;
@@ -48,6 +45,9 @@ public interface Folder extends AbstractFile, ContextAwareEntity {
 	Property<User> homeFolderOfUserProperty            = new StartNode<>("homeFolderOfUser", UserHOME_DIRFolder.class).partOfBuiltInSchema();
 	Property<Iterable<User>> workFolderOfUsersProperty = new StartNodes<>("workFolderOfUsers", UserWORKING_DIRFolder.class).partOfBuiltInSchema();
 
+	View defaultView = new View(Folder.class, PropertyView.Public, filesProperty, foldersProperty, parentIdProperty);
+	View uiView      = new View(Folder.class, PropertyView.Ui,     filesProperty, foldersProperty, imagesProperty);
+
 	static class Impl { static {
 
 		final JsonSchema schema   = SchemaService.getDynamicSchema();

structr-base/src/main/java/org/structr/web/entity/Image.java

@@ -26,10 +26,7 @@
 import org.structr.api.schema.JsonObjectType;
 import org.structr.api.schema.JsonSchema;
 import org.structr.api.schema.JsonSchema.Cascade;
-import org.structr.common.ConstantBooleanTrue;
-import org.structr.common.Permission;
-import org.structr.common.PropertyView;
-import org.structr.common.SecurityContext;
+import org.structr.common.*;
 import org.structr.common.error.ErrorBuffer;
 import org.structr.common.error.FrameworkException;
 import org.structr.core.app.App;
@@ -64,6 +61,9 @@ public interface Image extends File {
 	Property<Iterable<Image>> thumbnailsProperty = new EndNodes<>("thumbnails", ImageTHUMBNAILImage.class).partOfBuiltInSchema();
 	Property<Image> originalImageProperty        = new StartNode<>("originalImage", ImageTHUMBNAILImage.class).partOfBuiltInSchema();
 
+	View publicView = new View(Image.class, PropertyView.Public, parentProperty);
+	View uiView     = new View(Image.class, PropertyView.Ui,     parentProperty);
+
 	final static String STRUCTR_THUMBNAIL_FOLDER = "._structr_thumbnails/";
 
 	static class Impl { static {

structr-modules/structr-media-module/src/main/java/org/structr/media/VideoFile.java

@@ -25,6 +25,7 @@
 import org.structr.common.ConstantBooleanTrue;
 import org.structr.common.PropertyView;
 import org.structr.common.SecurityContext;
+import org.structr.common.View;
 import org.structr.common.error.FrameworkException;
 import org.structr.core.GraphObjectMap;
 import org.structr.core.JsonInput;
@@ -53,6 +54,9 @@ public interface VideoFile extends File {
 	Property<Image> posterImageProperty                   = new EndNode<>("posterImage", VideoFileHAS_POSTER_IMAGEImage.class).partOfBuiltInSchema();
 	Property<VideoFile> originalVideoProperty             = new StartNode<>("originalVideo", VideoFileHAS_CONVERTED_VIDEOVideoFile.class).partOfBuiltInSchema();
 
+	View defaultView = new View(VideoFile.class, PropertyView.Public, convertedVideosProperty, parentProperty, posterImageProperty);
+	View uiView      = new View(VideoFile.class, PropertyView.Ui,     convertedVideosProperty, originalVideoProperty, posterImageProperty);
+
 	static class Impl { static {
 
 		final JsonSchema schema   = SchemaService.getDynamicSchema();

structr-ui/src/test/java/org/structr/test/console/ConsoleTest.java

@@ -151,8 +151,8 @@ public void testRebuildCommand() {
 
 		final Console console = new Console(securityContext, ConsoleMode.JavaScript, Collections.emptyMap());
 
-		final int nodeCount           = 205;
-		final int relCount            = 321;
+		final int nodeCount           = 197;
+		final int relCount            = 307;
 		final int resourceAccessCount = 0;
 
 		final String fullIndexRebuildOutput =