Projects >> opencms-core >>e86868ffe7fc8cf916ce1a67874da0e02201d030

Chunk
Conflicting content 
import org.opencms.file.CmsFile;
import org.opencms.file.CmsObject;
import org.opencms.file.CmsProperty;
<<<<<<< HEAD:test/org/opencms/search/solr/TestCmsSearchAdvancedFeatures.java
import org.opencms.file.CmsPropertyDefinition;
=======
import org.opencms.file.types.CmsResourceTypeBinary;
import org.opencms.file.types.CmsResourceTypeFolder;
>>>>>>> 13f28f919642c2f48065eed8bf616cc1de40ff91:test/org/opencms/search/solr/TestSolrSearch.java
import org.opencms.file.types.CmsResourceTypePlain;
import org.opencms.main.OpenCms;
import org.opencms.report.CmsShellReport;
Solution content 
import org.opencms.file.CmsFile;
import org.opencms.file.CmsObject;
import org.opencms.file.CmsProperty;
import org.opencms.file.types.CmsResourceTypeBinary;
import org.opencms.file.types.CmsResourceTypeFolder;
import org.opencms.file.types.CmsResourceTypePlain;
import org.opencms.main.OpenCms;
import org.opencms.report.CmsShellReport;
File
TestSolrSearch.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
    }

    /**
<<<<<<< HEAD:test/org/opencms/search/solr/TestCmsSearchAdvancedFeatures.java
     * Tests search category grouping.

     * 
     * @throws Exception if the test fails
     */
    public void testSearchCategories() throws Exception {

        CmsObject cms = getCmsObject();
        echo("Testing searching for categories");
=======
     * Tests an issue where no results are found in folders that have names
     * like /basisdienstleistungen_-_zka/.

     * 
     * @throws Exception if the test fails
     */
    public void testSearchIssueWithSpecialFoldernames() throws Exception {

        CmsObject cms = getCmsObject();
        echo("Testing search issue with special folder name");

        String folderName = "/basisdienstleistungen_-_zka/";
        cms.copyResource("/types/", folderName);
        cms.unlockProject(cms.getRequestContext().getCurrentProject().getUuid());
        OpenCms.getPublishManager().publishProject(cms);
        OpenCms.getPublishManager().waitWhileRunning();
>>>>>>> 13f28f919642c2f48065eed8bf616cc1de40ff91:test/org/opencms/search/solr/TestSolrSearch.java

        OpenCms.getSearchManager().getSearchIndexes();
        CmsSolrIndex index = OpenCms.getSearchManager().getIndexSolr(AllSolrTests.SOLR_OFFLINE);
Solution content 
    }

    /**
     * Tests an issue where no results are found in folders that have names
     * like /basisdienstleistungen_-_zka/.

     * 
     * @throws Exception if the test fails
     */
    public void testSearchIssueWithSpecialFoldernames() throws Exception {

        CmsObject cms = getCmsObject();
        echo("Testing search issue with special folder name");

        String folderName = "/basisdienstleistungen_-_zka/";
        cms.copyResource("/types/", folderName);
        cms.unlockProject(cms.getRequestContext().getCurrentProject().getUuid());
        OpenCms.getPublishManager().publishProject(cms);
        OpenCms.getPublishManager().waitWhileRunning();

        OpenCms.getSearchManager().getSearchIndexes();
        CmsSolrIndex index = OpenCms.getSearchManager().getIndexSolr(AllSolrTests.SOLR_OFFLINE);
File
TestSolrSearch.java
Developer's decision
Version 2
Kind of conflict
Comment
Method invocation
Method signature
Variable