inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)

Browse Source 
115549 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      112033: Merged 5.0.N (5.0.3) to 5.1.N (5.1.0)
         111936: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            111829: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               111784: Merged DEV to V4.2.5 (4.2.5)
                  111783: MNT-14432 : DB TestPublicAp*TCK failures on DB2, MariaDB, Oracle & SQL Server
                     - Extended QueryLikeTest in order to create test data folder with temporary aspect.,
      112919: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         112547 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            112542: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               111974: Merged DEV to V4.2.5 (4.2.5)
                  111967: MNT-14432 : DB TestPublicAp*TCK failures on DB2, MariaDB, Oracle & SQL Server
                     - skipped deletion of test data,
      114016: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         113902 amorarasu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113818 abozianu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113605 adragoi: Merged DEV to V4.2.5 (4.2.5)
                  113579: MNT-14432 : DB TestPublicAp*TCK failures on DB2, MariaDB, Oracle & SQL Server
                     - skip deletion for test data for QueryForObject and QueryInFolderTest 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115686 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-10-30 00:16:17 +00:00
parent 114566a80e
commit 4b2179865b
6 changed files with 127 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
source/test-java/org/alfresco/opencmis/tck/tests/query/QueryForObjectCustom.java Normal file
View File

@@ -0,0 +1,37 @@
/*
* Copyright (C) 2005-2015 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.opencmis.tck.tests.query;
import org.apache.chemistry.opencmis.tck.tests.query.QueryForObject;
/**
* Fix for MNT-14432 - skip deletion of test data
*
* @author Andreea Dragoi
* @since 4.2.5
*/
public class QueryForObjectCustom extends QueryForObject
{
protected void deleteTestFolder()
{
// do nothing - skip deletion of test folder
}
}

37
source/test-java/org/alfresco/opencmis/tck/tests/query/QueryInFolderTestCustom.java Normal file
View File

@@ -0,0 +1,37 @@
/*
* Copyright (C) 2005-2015 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.opencmis.tck.tests.query;
import org.apache.chemistry.opencmis.tck.tests.query.QueryInFolderTest;
/**
* Fix for MNT-14432 - skip deletion of test data
*
* @author Andreea Dragoi
* @since 4.2.5
*/
public class QueryInFolderTestCustom extends QueryInFolderTest
{
protected void deleteTestFolder()
{
// do nothing - skip deletion of test folder
}
}

37
source/test-java/org/alfresco/opencmis/tck/tests/query/QueryLikeTestCustom.java Normal file
View File

@@ -0,0 +1,37 @@
/*
* Copyright (C) 2005-2015 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.opencmis.tck.tests.query;
import org.apache.chemistry.opencmis.tck.tests.query.QueryLikeTest;
/**
* Fix for MNT-14432 - skip deletion of test data
*
* @author Andreea Dragoi
* @since 4.2.5
*/
public class QueryLikeTestCustom extends QueryLikeTest
{
protected void deleteTestFolder()
{
// do nothing - skip deletion of test folder
}
}

12
source/test-java/org/alfresco/rest/api/tests/AbstractEnterpriseOpenCMIS11TCKTest.java
View File

@@ -2,6 +2,9 @@ package org.alfresco.rest.api.tests;
import java.util.Map;
import org.alfresco.opencmis.tck.tests.query.QueryForObjectCustom;
import org.alfresco.opencmis.tck.tests.query.QueryInFolderTestCustom;
import org.alfresco.opencmis.tck.tests.query.QueryLikeTestCustom;
import org.apache.chemistry.opencmis.tck.impl.AbstractSessionTestGroup;
import org.apache.chemistry.opencmis.tck.impl.JUnitHelper;
import org.apache.chemistry.opencmis.tck.tests.basics.BasicsTestGroup;
@@ -23,9 +26,6 @@ import org.apache.chemistry.opencmis.tck.tests.crud.SetAndDeleteContentTest;
import org.apache.chemistry.opencmis.tck.tests.crud.UpdateSmokeTest;
import org.apache.chemistry.opencmis.tck.tests.filing.FilingTestGroup;
import org.apache.chemistry.opencmis.tck.tests.query.ContentChangesSmokeTest;
import org.apache.chemistry.opencmis.tck.tests.query.QueryForObject;
import org.apache.chemistry.opencmis.tck.tests.query.QueryInFolderTest;
import org.apache.chemistry.opencmis.tck.tests.query.QueryLikeTest;
import org.apache.chemistry.opencmis.tck.tests.query.QuerySmokeTest;
import org.apache.chemistry.opencmis.tck.tests.versioning.VersionDeleteTest;
import org.apache.chemistry.opencmis.tck.tests.versioning.VersioningSmokeTest;
@@ -138,9 +138,9 @@ public abstract class AbstractEnterpriseOpenCMIS11TCKTest extends AbstractEnterp
addTest(new QuerySmokeTest());
// The test fails on Lucene see MNT-11223
// addTest(new QueryRootFolderTest());
addTest(new QueryForObject());
addTest(new QueryLikeTest());
addTest(new QueryInFolderTest());
addTest(new QueryForObjectCustom());
addTest(new QueryLikeTestCustom());
addTest(new QueryInFolderTestCustom());
addTest(new ContentChangesSmokeTest());
}
}

12
source/test-java/org/alfresco/rest/api/tests/TestEnterpriseAtomPubTCK.java
View File

@@ -26,6 +26,9 @@ import java.util.Map;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel;
import org.alfresco.opencmis.OpenCMISClientContext;
import org.alfresco.opencmis.tck.tests.query.QueryForObjectCustom;
import org.alfresco.opencmis.tck.tests.query.QueryInFolderTestCustom;
import org.alfresco.opencmis.tck.tests.query.QueryLikeTestCustom;
import org.alfresco.repo.dictionary.DictionaryDAO;
import org.alfresco.repo.dictionary.M2Aspect;
import org.alfresco.repo.dictionary.M2Model;
@@ -50,9 +53,6 @@ import org.apache.chemistry.opencmis.tck.tests.control.ControlTestGroup;
import org.apache.chemistry.opencmis.tck.tests.crud.CRUDTestGroup;
import org.apache.chemistry.opencmis.tck.tests.filing.FilingTestGroup;
import org.apache.chemistry.opencmis.tck.tests.query.ContentChangesSmokeTest;
import org.apache.chemistry.opencmis.tck.tests.query.QueryForObject;
import org.apache.chemistry.opencmis.tck.tests.query.QueryInFolderTest;
import org.apache.chemistry.opencmis.tck.tests.query.QueryLikeTest;
import org.apache.chemistry.opencmis.tck.tests.query.QuerySmokeTest;
import org.apache.chemistry.opencmis.tck.tests.types.TypesTestGroup;
import org.apache.chemistry.opencmis.tck.tests.versioning.CheckedOutTest;
@@ -203,9 +203,9 @@ public class TestEnterpriseAtomPubTCK extends AbstractEnterpriseOpenCMIS10TCKTes
addTest(new QuerySmokeTest());
// The test fails on Lucene see MNT-11223
// addTest(new QueryRootFolderTest());
addTest(new QueryForObject());
addTest(new QueryLikeTest());
addTest(new QueryInFolderTest());
addTest(new QueryForObjectCustom());
addTest(new QueryLikeTestCustom());
addTest(new QueryInFolderTestCustom());
addTest(new ContentChangesSmokeTest());
}
}

8
source/test-java/org/alfresco/rest/api/tests/TestPublicApiAtomPub10TCK.java
View File

@@ -5,6 +5,8 @@ import java.util.HashMap;
import java.util.Map;
import org.alfresco.opencmis.OpenCMISClientContext;
import org.alfresco.opencmis.tck.tests.query.QueryForObjectCustom;
import org.alfresco.opencmis.tck.tests.query.QueryLikeTestCustom;
import org.alfresco.rest.api.tests.RepoService.TestNetwork;
import org.apache.chemistry.opencmis.commons.enums.BindingType;
import org.apache.chemistry.opencmis.tck.impl.AbstractSessionTestGroup;
@@ -15,8 +17,6 @@ import org.apache.chemistry.opencmis.tck.tests.control.ControlTestGroup;
import org.apache.chemistry.opencmis.tck.tests.crud.CRUDTestGroup;
import org.apache.chemistry.opencmis.tck.tests.filing.FilingTestGroup;
import org.apache.chemistry.opencmis.tck.tests.query.ContentChangesSmokeTest;
import org.apache.chemistry.opencmis.tck.tests.query.QueryForObject;
import org.apache.chemistry.opencmis.tck.tests.query.QueryLikeTest;
import org.apache.chemistry.opencmis.tck.tests.versioning.CheckedOutTest;
import org.apache.chemistry.opencmis.tck.tests.versioning.VersionDeleteTest;
import org.apache.chemistry.opencmis.tck.tests.versioning.VersioningSmokeTest;
@@ -131,8 +131,8 @@ public class TestPublicApiAtomPub10TCK extends AbstractEnterpriseOpenCMIS10TCKTe
// addTest(new QuerySmokeTest());
// The test fails on Lucene see MNT-11223
// addTest(new QueryRootFolderTest());
addTest(new QueryForObject());
addTest(new QueryLikeTest());
addTest(new QueryForObjectCustom());
addTest(new QueryLikeTestCustom());
addTest(new ContentChangesSmokeTest());
}
}