Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/test-java/org/alfresco/repo/model/ModelTestSuite.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2005-2010 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.alfresco.repo.model;
+
+import org.alfresco.repo.model.filefolder.FileFolderDuplicateChildTest;
+import org.alfresco.repo.model.filefolder.FileFolderServiceImplTest;
+import org.alfresco.repo.model.filefolder.HiddenAspectTest;
+import org.alfresco.repo.model.ml.tools.ContentFilterLanguagesMapTest;
+import org.alfresco.repo.model.ml.tools.EditionServiceImplTest;
+import org.alfresco.repo.model.ml.tools.EmptyTranslationAspectTest;
+import org.alfresco.repo.model.ml.tools.MLContainerTypeTest;
+import org.alfresco.repo.model.ml.tools.MultilingualContentServiceImplTest;
+import org.alfresco.repo.model.ml.tools.MultilingualDocumentAspectTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+/**
+ * Model test suite
+ */
+@RunWith(Suite.class)
+@SuiteClasses({
+    ContentFilterLanguagesMapTest.class,
+    EmptyTranslationAspectTest.class,
+    MLContainerTypeTest.class,
+    MultilingualContentServiceImplTest.class,
+    MultilingualDocumentAspectTest.class,
+    EditionServiceImplTest.class,
+    
+	HiddenAspectTest.class,
+	
+    // Add the file folder tests
+    // These need to come afterwards, as they insert extra
+    //  interceptors which would otherwise confuse things
+    FileFolderServiceImplTest.class,
+    FileFolderDuplicateChildTest.class,
+})
+public class ModelTestSuite
+{
+}