Attachment #115159 for bug #207340

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 207340
Collapse All | Expand All

Lines 60-66 Link Here

(-)versioning.core/src/org/netbeans/modules/versioning/core/DelegatingVCS.java (-2 / +2 lines)
60	import org.netbeans.modules.versioning.core.spi.VersioningSystem;	60	import org.netbeans.modules.versioning.core.spi.VersioningSystem;
61	import org.netbeans.modules.versioning.core.api.VCSFileProxy;	61	import org.netbeans.modules.versioning.core.api.VCSFileProxy;
62	import org.netbeans.modules.versioning.core.api.VersioningSupport;	62	import org.netbeans.modules.versioning.core.api.VersioningSupport;
63	import org.netbeans.spi.queries.CollocationQueryImplementation;	63	import org.netbeans.spi.queries.CollocationQueryImplementation2;
64	import org.openide.util.ContextAwareAction;	64	import org.openide.util.ContextAwareAction;
65	import org.openide.util.Utilities;	65	import org.openide.util.Utilities;
66	import org.openide.util.lookup.Lookups;	66	import org.openide.util.lookup.Lookups;
Lines 137-143 Link Here
137	}	137	}
138		138
139	@Override	139	@Override
140	public CollocationQueryImplementation getCollocationQueryImplementation() {	140	public CollocationQueryImplementation2 getCollocationQueryImplementation() {
141	return getDelegate().getCollocationQueryImplementation();	141	return getDelegate().getCollocationQueryImplementation();
142	}	142	}
143		143

Lines 43-74 Link Here

(-)versioning.core/src/org/netbeans/modules/versioning/core/VcsCollocationQueryImplementation.java (-13 / +59 lines)
43	*/	43	*/
44	package org.netbeans.modules.versioning.core;	44	package org.netbeans.modules.versioning.core;
45		45
46	import org.netbeans.spi.queries.CollocationQueryImplementation;	46	import java.net.MalformedURLException;
47	import org.netbeans.modules.versioning.core.util.VCSSystemProvider.VersioningSystem;	47	import org.netbeans.modules.versioning.core.util.VCSSystemProvider.VersioningSystem;
48		48
49	import java.io.File;	49	import java.net.URI;
		50	import java.net.URISyntaxException;
		51	import java.util.logging.Level;
50	import org.netbeans.modules.versioning.core.api.VCSFileProxy;	52	import org.netbeans.modules.versioning.core.api.VCSFileProxy;
		53	import org.netbeans.spi.queries.CollocationQueryImplementation2;
		54	import org.openide.filesystems.FileObject;
		55	import org.openide.filesystems.URLMapper;
51		56
52	/**	57	/**
53	* Delegates the work to the owner of files in query.	58	* Delegates the work to the owner of files in query.
54	*	59	*
55	* @author Maros Sandor	60	* @author Maros Sandor
		61	* @author Tomas Stupka
56	*/	62	*/
57	@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.queries.CollocationQueryImplementation.class, position=50)	63	@org.openide.util.lookup.ServiceProvider(service=org.netbeans.spi.queries.CollocationQueryImplementation2.class, position=50)
58	public class VcsCollocationQueryImplementation implements CollocationQueryImplementation {	64	public class VcsCollocationQueryImplementation implements CollocationQueryImplementation2 {
59		65
60	public boolean areCollocated(File a, File b) {	66	@Override
61	VersioningSystem vsa = VersioningManager.getInstance().getOwner(VCSFileProxy.createFileProxy(a));	67	public boolean areCollocated(URI file1, URI file2) {
62	VersioningSystem vsb = VersioningManager.getInstance().getOwner(VCSFileProxy.createFileProxy(b));	68	VCSFileProxy proxy1 = toFileProxy(file1);
		69	VCSFileProxy proxy2 = toFileProxy(file2);
		70
		71	if(proxy1 == null \|\| proxy2 == null) return false;
		72	VersioningSystem vsa = VersioningManager.getInstance().getOwner(proxy1);
		73	VersioningSystem vsb = VersioningManager.getInstance().getOwner(proxy2);
63	if (vsa == null \|\| vsa != vsb) return false;	74	if (vsa == null \|\| vsa != vsb) return false;
64		75
65	CollocationQueryImplementation cqi = vsa.getCollocationQueryImplementation();	76	CollocationQueryImplementation2 cqi = vsa.getCollocationQueryImplementation();
66	return cqi != null && cqi.areCollocated(a, b);	77	return cqi != null && cqi.areCollocated(file1, file2);
67	}	78	}
68		79
69	public File findRoot(File file) {	80	@Override
70	VersioningSystem system = VersioningManager.getInstance().getOwner(VCSFileProxy.createFileProxy(file));	81	public URI findRoot(URI file) {
71	CollocationQueryImplementation cqi = system.getCollocationQueryImplementation();	82	VCSFileProxy proxy = toFileProxy(file);
72	return cqi == null ? null : cqi.findRoot(file);	83	if(proxy != null) {
		84	VersioningSystem system = VersioningManager.getInstance().getOwner(proxy);
		85	CollocationQueryImplementation2 cqi = system != null ? system.getCollocationQueryImplementation() : null;
		86	return cqi != null ? cqi.findRoot(file) : null;
73	}	87	}
		88	return null;
74	}	89	}
		90
		91	private static VCSFileProxy toFileProxy(URI uri) {
		92	FileObject fo = getFileObject(uri);
		93	return fo != null ? VCSFileProxy.createFileProxy(fo) : null;
		94	}
		95
		96	private static FileObject getFileObject(URI uri) {
		97	FileObject fo = null;
		98	try {
		99	fo = URLMapper.findFileObject(uri.toURL());
		100	} catch (MalformedURLException ex) {
		101	VersioningManager.LOG.log(Level.WARNING, uri != null ? uri.toString() : null, ex);
		102	}
		103	if(fo == null) {
		104	// file doesn't exists? use parent for the query then.
		105	// By the means of VCS it has to be collocated in the same way.
		106	String path = uri.getPath();
		107	URI parent;
		108	try {
		109	parent = new URI(path.endsWith("/") ? path : path + "/").resolve(".."); // NOI18N
		110	path = parent.getPath();
		111	uri = new URI(uri.getScheme(), uri.getUserInfo(), uri.getHost(), uri.getPort(), path, uri.getQuery(), uri.getFragment());
		112	} catch (URISyntaxException ex) {
		113	VersioningManager.LOG.log(Level.WARNING, path, ex);
		114	return null;
		115	}
		116	fo = getFileObject(uri);
		117	}
		118	return fo;
		119	}
		120	}




package org.netbeans.modules.versioning.core.spi;

import org.netbeans.modules.versioning.core.VersioningManager;
import org.netbeans.spi.queries.CollocationQueryImplementation;

import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;

import java.lang.annotation.Target;
import java.util.*;
import org.netbeans.modules.versioning.core.api.VCSFileProxy;
import org.netbeans.spi.queries.CollocationQueryImplementation2;
import org.openide.awt.ActionID;
import org.openide.awt.ActionReference;
import org.openide.awt.ActionRegistration;

     * 
     * @return CollocationQueryImplementation a CollocationQueryImplementation instance or null if the system does not provide the service
     */
    public CollocationQueryImplementation2 getCollocationQueryImplementation() {
        return null;
    }    


Lines 49-55 Link Here

(-)versioning.core/src/org/netbeans/modules/versioning/core/util/VCSSystemProvider.java (-2 / +2 lines)
49	import org.netbeans.modules.versioning.core.spi.VCSContext;	49	import org.netbeans.modules.versioning.core.spi.VCSContext;
50	import org.netbeans.modules.versioning.core.spi.VCSInterceptor;	50	import org.netbeans.modules.versioning.core.spi.VCSInterceptor;
51	import org.netbeans.modules.versioning.core.spi.VCSVisibilityQuery;	51	import org.netbeans.modules.versioning.core.spi.VCSVisibilityQuery;
52	import org.netbeans.spi.queries.CollocationQueryImplementation;	52	import org.netbeans.spi.queries.CollocationQueryImplementation2;
53		53
54	/**	54	/**
55	* Warning: VCS internal use only. Not to be implemented by clients.	55	* Warning: VCS internal use only. Not to be implemented by clients.
Lines 103-109 Link Here
103		103
104	public void getOriginalFile(VCSFileProxy workingCopy, VCSFileProxy originalFile);	104	public void getOriginalFile(VCSFileProxy workingCopy, VCSFileProxy originalFile);
105		105
106	public CollocationQueryImplementation getCollocationQueryImplementation();	106	public CollocationQueryImplementation2 getCollocationQueryImplementation();
107		107
108	public VCSVisibilityQuery getVisibility();	108	public VCSVisibilityQuery getVisibility();
109		109

Lines 54-60 Link Here

(-)versioning.core/test/unit/src/org/netbeans/modules/versioning/core/ConnectDisconnectTest.java (-2 / +2 lines)
54	import org.netbeans.modules.versioning.core.spi.VCSVisibilityQuery;	54	import org.netbeans.modules.versioning.core.spi.VCSVisibilityQuery;
55	import org.netbeans.modules.versioning.core.api.VersioningSupport;	55	import org.netbeans.modules.versioning.core.api.VersioningSupport;
56	import org.netbeans.modules.versioning.core.spi.VCSContext;	56	import org.netbeans.modules.versioning.core.spi.VCSContext;
57	import org.netbeans.spi.queries.CollocationQueryImplementation;	57	import org.netbeans.spi.queries.CollocationQueryImplementation2;
58	import org.openide.util.NbPreferences;	58	import org.openide.util.NbPreferences;
59	import org.openide.util.test.MockLookup;	59	import org.openide.util.test.MockLookup;
60		60
Lines 269-275 Link Here
269	public void getOriginalFile(VCSFileProxy workingCopy, VCSFileProxy originalFile) { }	269	public void getOriginalFile(VCSFileProxy workingCopy, VCSFileProxy originalFile) { }
270		270
271	@Override	271	@Override
272	public CollocationQueryImplementation getCollocationQueryImplementation() {	272	public CollocationQueryImplementation2 getCollocationQueryImplementation() {
273	return null;	273	return null;
274	}	274	}
275		275




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * Contributor(s):
 *
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
 * Microsystems, Inc. All Rights Reserved.
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 */
package org.netbeans.modules.versioning.core.spi;

import java.io.IOException;
import org.openide.filesystems.FileStateInvalidException;

import java.io.File;
import org.netbeans.api.queries.CollocationQuery;
import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.versioning.spi.testvcs.TestVCS;
import org.netbeans.modules.versioning.spi.testvcs.TestVCSCollocationQuery;
import org.openide.util.test.MockLookup;

/**
 * Versioning SPI unit tests of VCSVisibilityQuery.
 * 
 * @author Tomas Stupka
 */
public class VCSCollocationQueryTest extends NbTestCase {
    

    public VCSCollocationQueryTest(String testName) {
        super(testName);
        MockLookup.setLayersAndInstances();
    }

    protected void setUp() throws Exception {
        MockLookup.setLayersAndInstances();
        File userdir = new File(getWorkDir() + "userdir");
        userdir.mkdirs();
        System.setProperty("netbeans.user", userdir.getAbsolutePath());
        super.setUp();
    }

    public void testFindRootExisting() throws FileStateInvalidException, IOException, Exception {
        File folder = createVersionedFolder();
        folder.mkdirs();
        File file = new File(folder, "somefile");
        file.createNewFile();
        
        assertRoot(folder, file);
    }

    public void testFindRootNotExisting() throws FileStateInvalidException, IOException, Exception {
        File folder = createVersionedFolder();
        File file = new File(folder, "dontexist");
        assertRoot(folder, file);
    }
    
    public void testFindRootBogusFile() throws FileStateInvalidException, IOException, Exception {
        assertNull(CollocationQuery.findRoot(new File("/a/b/c").toURI()));
    }
    
    private void assertRoot(File root, File file) {
        assertEquals(root.toURI(), CollocationQuery.findRoot(file.toURI()));
    }
    
    public void testAreCollocatedExisting() throws FileStateInvalidException, IOException, Exception {
        File folder = createVersionedFolder();

        File file1 = new File(folder, "file2" + TestVCSCollocationQuery.COLLOCATED_FILENAME_SUFFIX);
        file1.createNewFile();
        File file2 = new File(folder, "file1" + TestVCSCollocationQuery.COLLOCATED_FILENAME_SUFFIX);
        file2.createNewFile();
        
        assertCollocated(true, file1, file2);
    }
    
    public void testAreCollocatedNotExisting() throws FileStateInvalidException, IOException, Exception {
        File folder = createVersionedFolder();

        File file1 = new File(folder, "file2" + TestVCSCollocationQuery.COLLOCATED_FILENAME_SUFFIX);
        file1.createNewFile();
        File file2 = new File(folder, "file1" + TestVCSCollocationQuery.COLLOCATED_FILENAME_SUFFIX);
        file2.createNewFile();
        
        assertCollocated(true, file1, file2);
    }
    
    
    public void testNotCollocatedExisting() throws FileStateInvalidException, IOException, Exception {
        File folder = createVersionedFolder();

        File file1 = new File(folder, "file1");
        file1.createNewFile();
        File file2 = new File(folder, "file2");
        file2.createNewFile();
        
        assertCollocated(false, file1, file2);
    }
    
    public void testNotCollocatedNotExisting() throws FileStateInvalidException, IOException, Exception {
        File folder = createVersionedFolder();

        File file1 = new File(folder, "file1");
        file1.createNewFile();
        File file2 = new File(folder, "file2");
        file2.createNewFile();
        
        assertCollocated(false, file1, file2);
    }
    
    void assertCollocated(boolean expected, File file1, File file2) {
        if(expected) {
            assertTrue(CollocationQuery.areCollocated(file1.toURI(), file2.toURI()));
        } else {
            assertFalse(CollocationQuery.areCollocated(file1.toURI(), file2.toURI()));
        }
    }

    private File createVersionedFolder() throws IOException {
        File folder = new File(getWorkDir(), TestVCS.VERSIONED_FOLDER_SUFFIX);
        new File(folder, TestVCS.TEST_VCS_METADATA).mkdirs();
        return folder;
    }
    
}





import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import org.netbeans.modules.versioning.core.VcsCollocationQueryImplementation;
import org.netbeans.modules.versioning.core.api.VCSFileProxy;
import org.netbeans.modules.versioning.core.spi.VCSAnnotator;
import org.netbeans.modules.versioning.core.spi.VCSInterceptor;
import org.netbeans.modules.versioning.core.spi.VCSVisibilityQuery;
import org.netbeans.modules.versioning.core.spi.VersioningSystem;
import org.netbeans.spi.queries.CollocationQueryImplementation2;
import org.openide.awt.ActionID;
import org.openide.awt.ActionReference;
import org.openide.awt.ActionReferences;

    private VCSInterceptor interceptor;
    private VCSAnnotator annotator;
    private VCSVisibilityQuery vq;
    private TestVCSCollocationQuery vcq;

    public static final String TEST_VCS_METADATA = ".testvcs";
    public static final String VERSIONED_FOLDER_SUFFIX = "-test-versioned";

        interceptor = new TestVCSInterceptor();
        annotator = new TestVCSAnnotator();
        vq = new TestVCSVisibilityQuery();
        vcq = new TestVCSCollocationQuery();
    }

    public VCSFileProxy getTopmostManagedAncestor(VCSFileProxy file) {

        return vq;
    }

    @Override
    public CollocationQueryImplementation2 getCollocationQueryImplementation() {
        return vcq;
    }

    public void fire() {
        VCSFileProxy file = null;
        super.fireStatusChanged(file);




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2012 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2012 Sun Microsystems, Inc.
 */
package org.netbeans.modules.versioning.spi.testvcs;

import java.io.File;
import java.net.URI;
import org.netbeans.spi.queries.CollocationQueryImplementation2;

/**
 *
 * @author tomas
 */
public class TestVCSCollocationQuery implements CollocationQueryImplementation2 {

    public static String COLLOCATED_FILENAME_SUFFIX = "_iscollocated";
    @Override
    public boolean areCollocated(URI file1, URI file2) {
        String name1 = file1.getPath();
        String name2 = file2.getPath();
        
        return name1.endsWith(COLLOCATED_FILENAME_SUFFIX) && name2.endsWith(COLLOCATED_FILENAME_SUFFIX);
    }

    @Override
    public URI findRoot(URI uri) {
        File root = getRoot(new File(uri));
        return root != null ? root.toURI() : null;
    }
    
    private File getRoot(File file) {
        File topmost = null;
        for (; file != null; file = file.getParentFile()) {
            if (file.getName().endsWith(TestVCS.VERSIONED_FOLDER_SUFFIX)) {
                topmost = file;
            }
        }
        return topmost;
    }
    
}




import java.beans.PropertyChangeSupport;
import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.util.*;
import java.util.logging.Level;
import java.util.logging.Logger;

import org.netbeans.modules.versioning.core.spi.VCSVisibilityQuery;
import org.netbeans.modules.versioning.spi.VersioningSupport;
import org.netbeans.spi.queries.CollocationQueryImplementation;
import org.netbeans.spi.queries.CollocationQueryImplementation2;
import org.openide.util.ContextAwareAction;
import org.openide.util.Utilities;
import org.openide.util.lookup.Lookups;

    private VCSAnnotator annotator;
    private VCSVisibilityQuery visibilityQuery;
    private VCSInterceptor interceptor;
    private CollocationQueryImplementation2 collocationQuery;
    
    private DelegatingVCS(Map<?, ?> map) {
        this.map = map;

    }

    @Override
    public CollocationQueryImplementation2 getCollocationQueryImplementation() {
        if(collocationQuery == null) {
            collocationQuery = new CollocationQueryImplementation2() {
                private CollocationQueryImplementation cqi = getDelegate().getCollocationQueryImplementation();
                @Override
                public boolean areCollocated(URI uri1, URI uri2) {
                    return cqi != null && cqi.areCollocated(new File(uri1), new File(uri2));
    }
                @Override
                public URI findRoot(URI uri) {
                    File file = cqi != null ? cqi.findRoot(new File(uri)) : null;
                    return file != null ? file.toURI() : null;
                }
            };
        } 
        return collocationQuery;        
    }

    @Override
    public VCSFileProxy getTopmostManagedAncestor(VCSFileProxy proxy) {




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * Contributor(s):
 *
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
 * Microsystems, Inc. All Rights Reserved.
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 */
package org.netbeans.modules.versioning.spi;

import java.io.IOException;
import org.openide.filesystems.FileStateInvalidException;

import java.io.File;
import org.netbeans.api.queries.CollocationQuery;
import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.versioning.spi.testvcs.TestVCS;
import org.netbeans.modules.versioning.spi.testvcs.TestVCSCollocationQuery;
import org.openide.util.test.MockLookup;

/**
 * Versioning SPI unit tests of VCSVisibilityQuery.
 * 
 * @author Tomas Stupka
 */
public class VCSCollocationQueryTest extends NbTestCase {
    

    public VCSCollocationQueryTest(String testName) {
        super(testName);
    }

    protected void setUp() throws Exception {
        MockLookup.setLayersAndInstances();
        File userdir = new File(getWorkDir() + "userdir");
        userdir.mkdirs();
        System.setProperty("netbeans.user", userdir.getAbsolutePath());
        super.setUp();
    }

    public void testFindRootExisting() throws FileStateInvalidException, IOException, Exception {
        File folder = new File(getWorkDir(), TestVCS.VERSIONED_FOLDER_SUFFIX);
        folder.mkdirs();
        File file = new File(folder, "somefile");
        file.createNewFile();
        
        assertRoot(folder, file);
    }
    
    public void testFindRootNotExisting() throws FileStateInvalidException, IOException, Exception {
        File folder = new File(getWorkDir(), TestVCS.VERSIONED_FOLDER_SUFFIX);
        folder.mkdirs();
        File file = new File(folder, "somefile");
        assertRoot(folder, file);
    }
    
    public void testFindRootBogusFile() throws FileStateInvalidException, IOException, Exception {
        assertNull(CollocationQuery.findRoot(new File("/a/b/c")));
    }
    
    private void assertRoot(File root, File file) {
        assertEquals(root, CollocationQuery.findRoot(file));
    }
    
    public void testAreCollocatedExisting() throws FileStateInvalidException, IOException, Exception {
        File folder = new File(getWorkDir(), TestVCS.VERSIONED_FOLDER_SUFFIX);
        folder.mkdirs();

        File file1 = new File(folder, "file2" + TestVCSCollocationQuery.COLLOCATED_FILENAME_SUFFIX);
        file1.createNewFile();
        File file2 = new File(folder, "file1" + TestVCSCollocationQuery.COLLOCATED_FILENAME_SUFFIX);
        file2.createNewFile();
        
        assertCollocated(true, file1, file2);
    }
    
    public void testAreCollocatedNotExisting() throws FileStateInvalidException, IOException, Exception {
        File folder = new File(getWorkDir(), TestVCS.VERSIONED_FOLDER_SUFFIX);
        folder.mkdirs();

        File file1 = new File(folder, "file2" + TestVCSCollocationQuery.COLLOCATED_FILENAME_SUFFIX);
        file1.createNewFile();
        File file2 = new File(folder, "file1" + TestVCSCollocationQuery.COLLOCATED_FILENAME_SUFFIX);
        file2.createNewFile();
        
        assertCollocated(true, file1, file2);
    }
    
    
    public void testNotCollocatedExisting() throws FileStateInvalidException, IOException, Exception {
        File folder = new File(getWorkDir(), TestVCS.VERSIONED_FOLDER_SUFFIX);
        folder.mkdirs();

        File file1 = new File(folder, "file1");
        file1.createNewFile();
        File file2 = new File(folder, "file2");
        file2.createNewFile();
        
        assertCollocated(false, file1, file2);
    }
    
    public void testNotCollocatedNotExisting() throws FileStateInvalidException, IOException, Exception {
        File folder = new File(getWorkDir(), TestVCS.VERSIONED_FOLDER_SUFFIX);
        folder.mkdirs();

        File file1 = new File(folder, "file1");
        file1.createNewFile();
        File file2 = new File(folder, "file2");
        file2.createNewFile();
        
        assertCollocated(false, file1, file2);
    }
    
    void assertCollocated(boolean expected, File file1, File file2) {
        if(expected) {
            assertTrue(CollocationQuery.areCollocated(file1, file2));
        } else {
            assertFalse(CollocationQuery.areCollocated(file1, file2));
        }
    }
    
    
}





import java.io.File;
import org.netbeans.modules.versioning.spi.VCSVisibilityQuery;
import org.netbeans.spi.queries.CollocationQueryImplementation;

/**
 * Test versioning system.

    private VCSInterceptor interceptor;
    private VCSAnnotator annotator;
    private VCSVisibilityQuery vq;
    private TestVCSCollocationQuery vcq;

    public static final String VERSIONED_FOLDER_SUFFIX = "-test-versioned";


        interceptor = new TestVCSInterceptor();
        annotator = new TestVCSAnnotator();
        vq = new TestVCSVisibilityQuery();
        vcq = new TestVCSCollocationQuery();
    }

    public File getTopmostManagedAncestor(File file) {

        return vq;
}

    @Override
    public CollocationQueryImplementation getCollocationQueryImplementation() {
        return vcq;
}
    
    
}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2012 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2012 Sun Microsystems, Inc.
 */
package org.netbeans.modules.versioning.spi.testvcs;

import java.io.File;
import org.netbeans.spi.queries.CollocationQueryImplementation;

/**
 *
 * @author tomas
 */
public class TestVCSCollocationQuery implements CollocationQueryImplementation {

    public static String COLLOCATED_FILENAME_SUFFIX = "_iscollocated";
    @Override
    public boolean areCollocated(File file1, File file2) {
        String name1 = file1.getName();
        String name2 = file2.getName();
        
        return name1.endsWith(COLLOCATED_FILENAME_SUFFIX) && name2.endsWith(COLLOCATED_FILENAME_SUFFIX);
    }

    @Override
    public File findRoot(File file) {
        return TestVCS.getInstance().getTopmostManagedAncestor(file);
    }
    
}

Return to bug 207340

Line 0 Link Here

(-)versioning.core/test/unit/src/org/netbeans/modules/versioning/core/spi/VCSCollocationQueryTest.java (+159 lines)
		1	/*
		2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
		3	*
		4	* Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
		5	*
		6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
		7	* Other names may be trademarks of their respective owners.
		8	*
		9	* The contents of this file are subject to the terms of either the GNU
		10	* General Public License Version 2 only ("GPL") or the Common
		11	* Development and Distribution License("CDDL") (collectively, the
		12	* "License"). You may not use this file except in compliance with the
		13	* License. You can obtain a copy of the License at
		14	* http://www.netbeans.org/cddl-gplv2.html
		15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
		16	* specific language governing permissions and limitations under the
		17	* License. When distributing the software, include this License Header
		18	* Notice in each file and include the License file at
		19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
		20	* particular file as subject to the "Classpath" exception as provided
		21	* by Oracle in the GPL Version 2 section of the License file that
		22	* accompanied this code. If applicable, add the following below the
		23	* License Header, with the fields enclosed by brackets [] replaced by
		24	* your own identifying information:
		25	* "Portions Copyrighted [year] [name of copyright owner]"
		26	*
		27	* Contributor(s):
		28	*
		29	* The Original Software is NetBeans. The Initial Developer of the Original
		30	* Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
		31	* Microsystems, Inc. All Rights Reserved.
		32	*
		33	* If you wish your version of this file to be governed by only the CDDL
		34	* or only the GPL Version 2, indicate your decision by adding
		35	* "[Contributor] elects to include this software in this distribution
		36	* under the [CDDL or GPL Version 2] license." If you do not indicate a
		37	* single choice of license, a recipient has the option to distribute
		38	* your version of this file under either the CDDL, the GPL Version 2 or
		39	* to extend the choice of license to its licensees as provided above.
		40	* However, if you add GPL Version 2 code and therefore, elected the GPL
		41	* Version 2 license, then the option applies only if the new code is
		42	* made subject to such option by the copyright holder.
		43	*/
		44	package org.netbeans.modules.versioning.core.spi;
		45
		46	import java.io.IOException;
		47	import org.openide.filesystems.FileStateInvalidException;
		48
		49	import java.io.File;
		50	import org.netbeans.api.queries.CollocationQuery;
		51	import org.netbeans.junit.NbTestCase;
		52	import org.netbeans.modules.versioning.spi.testvcs.TestVCS;
		53	import org.netbeans.modules.versioning.spi.testvcs.TestVCSCollocationQuery;
		54	import org.openide.util.test.MockLookup;
		55
		56	/**
		57	* Versioning SPI unit tests of VCSVisibilityQuery.
		58	*
		59	* @author Tomas Stupka
		60	*/
		61	public class VCSCollocationQueryTest extends NbTestCase {
		62
		63
		64	public VCSCollocationQueryTest(String testName) {
65	super(testName);
66	MockLookup.setLayersAndInstances();
67	}
68
69	protected void setUp() throws Exception {
70	MockLookup.setLayersAndInstances();
71	File userdir = new File(getWorkDir() + "userdir");
72	userdir.mkdirs();
73	System.setProperty("netbeans.user", userdir.getAbsolutePath());
74	super.setUp();
75	}
76
77	public void testFindRootExisting() throws FileStateInvalidException, IOException, Exception {
78	File folder = createVersionedFolder();
79	folder.mkdirs();
80	File file = new File(folder, "somefile");
81	file.createNewFile();
82
83	assertRoot(folder, file);
84	}
85
86	public void testFindRootNotExisting() throws FileStateInvalidException, IOException, Exception {
87	File folder = createVersionedFolder();
88	File file = new File(folder, "dontexist");
89	assertRoot(folder, file);
90	}
91
92	public void testFindRootBogusFile() throws FileStateInvalidException, IOException, Exception {
93	assertNull(CollocationQuery.findRoot(new File("/a/b/c").toURI()));
94	}
95
96	private void assertRoot(File root, File file) {
97	assertEquals(root.toURI(), CollocationQuery.findRoot(file.toURI()));
98	}
99
100	public void testAreCollocatedExisting() throws FileStateInvalidException, IOException, Exception {
101	File folder = createVersionedFolder();
102
103	File file1 = new File(folder, "file2" + TestVCSCollocationQuery.COLLOCATED_FILENAME_SUFFIX);
104	file1.createNewFile();
105	File file2 = new File(folder, "file1" + TestVCSCollocationQuery.COLLOCATED_FILENAME_SUFFIX);
106	file2.createNewFile();
107
108	assertCollocated(true, file1, file2);
109	}
110
111	public void testAreCollocatedNotExisting() throws FileStateInvalidException, IOException, Exception {
112	File folder = createVersionedFolder();
113
114	File file1 = new File(folder, "file2" + TestVCSCollocationQuery.COLLOCATED_FILENAME_SUFFIX);
115	file1.createNewFile();
116	File file2 = new File(folder, "file1" + TestVCSCollocationQuery.COLLOCATED_FILENAME_SUFFIX);
117	file2.createNewFile();
118
119	assertCollocated(true, file1, file2);
120	}
121
122
123	public void testNotCollocatedExisting() throws FileStateInvalidException, IOException, Exception {
124	File folder = createVersionedFolder();
125
126	File file1 = new File(folder, "file1");
127	file1.createNewFile();
128	File file2 = new File(folder, "file2");
129	file2.createNewFile();
130
131	assertCollocated(false, file1, file2);
132	}
133
134	public void testNotCollocatedNotExisting() throws FileStateInvalidException, IOException, Exception {
135	File folder = createVersionedFolder();
136
137	File file1 = new File(folder, "file1");
138	file1.createNewFile();
139	File file2 = new File(folder, "file2");
140	file2.createNewFile();
141
142	assertCollocated(false, file1, file2);
143	}
144
145	void assertCollocated(boolean expected, File file1, File file2) {
146	if(expected) {
147	assertTrue(CollocationQuery.areCollocated(file1.toURI(), file2.toURI()));
148	} else {
149	assertFalse(CollocationQuery.areCollocated(file1.toURI(), file2.toURI()));
150	}
151	}
152
153	private File createVersionedFolder() throws IOException {
154	File folder = new File(getWorkDir(), TestVCS.VERSIONED_FOLDER_SUFFIX);
155	new File(folder, TestVCS.TEST_VCS_METADATA).mkdirs();
156	return folder;
157	}
158
159	}

Lines 46-56 Link Here

(-)versioning.core/test/unit/src/org/netbeans/modules/versioning/spi/testvcs/TestVCS.java (+9 lines)
46		46
47	import java.awt.event.ActionEvent;	47	import java.awt.event.ActionEvent;
48	import java.awt.event.ActionListener;	48	import java.awt.event.ActionListener;
		49	import org.netbeans.modules.versioning.core.VcsCollocationQueryImplementation;
49	import org.netbeans.modules.versioning.core.api.VCSFileProxy;	50	import org.netbeans.modules.versioning.core.api.VCSFileProxy;
50	import org.netbeans.modules.versioning.core.spi.VCSAnnotator;	51	import org.netbeans.modules.versioning.core.spi.VCSAnnotator;
51	import org.netbeans.modules.versioning.core.spi.VCSInterceptor;	52	import org.netbeans.modules.versioning.core.spi.VCSInterceptor;
52	import org.netbeans.modules.versioning.core.spi.VCSVisibilityQuery;	53	import org.netbeans.modules.versioning.core.spi.VCSVisibilityQuery;
53	import org.netbeans.modules.versioning.core.spi.VersioningSystem;	54	import org.netbeans.modules.versioning.core.spi.VersioningSystem;
		55	import org.netbeans.spi.queries.CollocationQueryImplementation2;
54	import org.openide.awt.ActionID;	56	import org.openide.awt.ActionID;
55	import org.openide.awt.ActionReference;	57	import org.openide.awt.ActionReference;
56	import org.openide.awt.ActionReferences;	58	import org.openide.awt.ActionReferences;
Lines 79-84 Link Here
79	private VCSInterceptor interceptor;	81	private VCSInterceptor interceptor;
80	private VCSAnnotator annotator;	82	private VCSAnnotator annotator;
81	private VCSVisibilityQuery vq;	83	private VCSVisibilityQuery vq;
		84	private TestVCSCollocationQuery vcq;
82		85
83	public static final String TEST_VCS_METADATA = ".testvcs";	86	public static final String TEST_VCS_METADATA = ".testvcs";
84	public static final String VERSIONED_FOLDER_SUFFIX = "-test-versioned";	87	public static final String VERSIONED_FOLDER_SUFFIX = "-test-versioned";
Lines 96-101 Link Here
96	interceptor = new TestVCSInterceptor();	99	interceptor = new TestVCSInterceptor();
97	annotator = new TestVCSAnnotator();	100	annotator = new TestVCSAnnotator();
98	vq = new TestVCSVisibilityQuery();	101	vq = new TestVCSVisibilityQuery();
		102	vcq = new TestVCSCollocationQuery();
99	}	103	}
100		104
101	public VCSFileProxy getTopmostManagedAncestor(VCSFileProxy file) {	105	public VCSFileProxy getTopmostManagedAncestor(VCSFileProxy file) {
Lines 121-126 Link Here
121	return vq;	125	return vq;
122	}	126	}
123		127
		128	@Override
		129	public CollocationQueryImplementation2 getCollocationQueryImplementation() {
		130	return vcq;
		131	}
		132
124	public void fire() {	133	public void fire() {
125	VCSFileProxy file = null;	134	VCSFileProxy file = null;
126	super.fireStatusChanged(file);	135	super.fireStatusChanged(file);

Line 0 Link Here

(-)versioning.core/test/unit/src/org/netbeans/modules/versioning/spi/testvcs/TestVCSCollocationQuery.java (+79 lines)
		1	/*
		2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
		3	*
		4	* Copyright 2012 Oracle and/or its affiliates. All rights reserved.
		5	*
		6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
		7	* Other names may be trademarks of their respective owners.
		8	*
		9	* The contents of this file are subject to the terms of either the GNU
		10	* General Public License Version 2 only ("GPL") or the Common
		11	* Development and Distribution License("CDDL") (collectively, the
		12	* "License"). You may not use this file except in compliance with the
		13	* License. You can obtain a copy of the License at
		14	* http://www.netbeans.org/cddl-gplv2.html
		15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
		16	* specific language governing permissions and limitations under the
		17	* License. When distributing the software, include this License Header
		18	* Notice in each file and include the License file at
		19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
		20	* particular file as subject to the "Classpath" exception as provided
		21	* by Oracle in the GPL Version 2 section of the License file that
		22	* accompanied this code. If applicable, add the following below the
		23	* License Header, with the fields enclosed by brackets [] replaced by
		24	* your own identifying information:
		25	* "Portions Copyrighted [year] [name of copyright owner]"
		26	*
		27	* If you wish your version of this file to be governed by only the CDDL
		28	* or only the GPL Version 2, indicate your decision by adding
		29	* "[Contributor] elects to include this software in this distribution
		30	* under the [CDDL or GPL Version 2] license." If you do not indicate a
		31	* single choice of license, a recipient has the option to distribute
		32	* your version of this file under either the CDDL, the GPL Version 2 or
		33	* to extend the choice of license to its licensees as provided above.
		34	* However, if you add GPL Version 2 code and therefore, elected the GPL
		35	* Version 2 license, then the option applies only if the new code is
		36	* made subject to such option by the copyright holder.
		37	*
		38	* Contributor(s):
		39	*
		40	* Portions Copyrighted 2012 Sun Microsystems, Inc.
		41	*/
		42	package org.netbeans.modules.versioning.spi.testvcs;
		43
		44	import java.io.File;
		45	import java.net.URI;
		46	import org.netbeans.spi.queries.CollocationQueryImplementation2;
		47
		48	/**
		49	*
		50	* @author tomas
		51	*/
		52	public class TestVCSCollocationQuery implements CollocationQueryImplementation2 {
		53
		54	public static String COLLOCATED_FILENAME_SUFFIX = "_iscollocated";
		55	@Override
		56	public boolean areCollocated(URI file1, URI file2) {
		57	String name1 = file1.getPath();
		58	String name2 = file2.getPath();
		59
		60	return name1.endsWith(COLLOCATED_FILENAME_SUFFIX) && name2.endsWith(COLLOCATED_FILENAME_SUFFIX);
		61	}
		62
		63	@Override
		64	public URI findRoot(URI uri) {
65	File root = getRoot(new File(uri));
66	return root != null ? root.toURI() : null;
67	}
68
69	private File getRoot(File file) {
70	File topmost = null;
71	for (; file != null; file = file.getParentFile()) {
72	if (file.getName().endsWith(TestVCS.VERSIONED_FOLDER_SUFFIX)) {
73	topmost = file;
74	}
75	}
76	return topmost;
77	}
78
79	}

Lines 47-52 Link Here

(-)versioning/src/org/netbeans/modules/versioning/DelegatingVCS.java (-2 / +19 lines)
47	import java.beans.PropertyChangeSupport;	47	import java.beans.PropertyChangeSupport;
48	import java.io.File;	48	import java.io.File;
49	import java.io.IOException;	49	import java.io.IOException;
		50	import java.net.URI;
50	import java.util.*;	51	import java.util.*;
51	import java.util.logging.Level;	52	import java.util.logging.Level;
52	import java.util.logging.Logger;	53	import java.util.logging.Logger;
Lines 59-64 Link Here
59	import org.netbeans.modules.versioning.core.spi.VCSVisibilityQuery;	60	import org.netbeans.modules.versioning.core.spi.VCSVisibilityQuery;
60	import org.netbeans.modules.versioning.spi.VersioningSupport;	61	import org.netbeans.modules.versioning.spi.VersioningSupport;
61	import org.netbeans.spi.queries.CollocationQueryImplementation;	62	import org.netbeans.spi.queries.CollocationQueryImplementation;
		63	import org.netbeans.spi.queries.CollocationQueryImplementation2;
62	import org.openide.util.ContextAwareAction;	64	import org.openide.util.ContextAwareAction;
63	import org.openide.util.Utilities;	65	import org.openide.util.Utilities;
64	import org.openide.util.lookup.Lookups;	66	import org.openide.util.lookup.Lookups;
Lines 87-92 Link Here
87	private VCSAnnotator annotator;	89	private VCSAnnotator annotator;
88	private VCSVisibilityQuery visibilityQuery;	90	private VCSVisibilityQuery visibilityQuery;
89	private VCSInterceptor interceptor;	91	private VCSInterceptor interceptor;
		92	private CollocationQueryImplementation2 collocationQuery;
90		93
91	private DelegatingVCS(Map<?, ?> map) {	94	private DelegatingVCS(Map<?, ?> map) {
92	this.map = map;	95	this.map = map;
Lines 146-154 Link Here
146	}	149	}
147		150
148	@Override	151	@Override
149	public CollocationQueryImplementation getCollocationQueryImplementation() {	152	public CollocationQueryImplementation2 getCollocationQueryImplementation() {
150	return getDelegate().getCollocationQueryImplementation();	153	if(collocationQuery == null) {
		154	collocationQuery = new CollocationQueryImplementation2() {
		155	private CollocationQueryImplementation cqi = getDelegate().getCollocationQueryImplementation();
		156	@Override
		157	public boolean areCollocated(URI uri1, URI uri2) {
		158	return cqi != null && cqi.areCollocated(new File(uri1), new File(uri2));
151	}	159	}
		160	@Override
		161	public URI findRoot(URI uri) {
		162	File file = cqi != null ? cqi.findRoot(new File(uri)) : null;
		163	return file != null ? file.toURI() : null;
		164	}
		165	};
		166	}
		167	return collocationQuery;
		168	}
152		169
153	@Override	170	@Override
154	public VCSFileProxy getTopmostManagedAncestor(VCSFileProxy proxy) {	171	public VCSFileProxy getTopmostManagedAncestor(VCSFileProxy proxy) {

Line 0 Link Here

(-)versioning/test/unit/src/org/netbeans/modules/versioning/spi/VCSCollocationQueryTest.java (+158 lines)
		1	/*
		2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
		3	*
		4	* Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
		5	*
		6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
		7	* Other names may be trademarks of their respective owners.
		8	*
		9	* The contents of this file are subject to the terms of either the GNU
		10	* General Public License Version 2 only ("GPL") or the Common
		11	* Development and Distribution License("CDDL") (collectively, the
		12	* "License"). You may not use this file except in compliance with the
		13	* License. You can obtain a copy of the License at
		14	* http://www.netbeans.org/cddl-gplv2.html
		15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
		16	* specific language governing permissions and limitations under the
		17	* License. When distributing the software, include this License Header
		18	* Notice in each file and include the License file at
		19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
		20	* particular file as subject to the "Classpath" exception as provided
		21	* by Oracle in the GPL Version 2 section of the License file that
		22	* accompanied this code. If applicable, add the following below the
		23	* License Header, with the fields enclosed by brackets [] replaced by
		24	* your own identifying information:
		25	* "Portions Copyrighted [year] [name of copyright owner]"
		26	*
		27	* Contributor(s):
		28	*
		29	* The Original Software is NetBeans. The Initial Developer of the Original
		30	* Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
		31	* Microsystems, Inc. All Rights Reserved.
		32	*
		33	* If you wish your version of this file to be governed by only the CDDL
		34	* or only the GPL Version 2, indicate your decision by adding
		35	* "[Contributor] elects to include this software in this distribution
		36	* under the [CDDL or GPL Version 2] license." If you do not indicate a
		37	* single choice of license, a recipient has the option to distribute
		38	* your version of this file under either the CDDL, the GPL Version 2 or
		39	* to extend the choice of license to its licensees as provided above.
		40	* However, if you add GPL Version 2 code and therefore, elected the GPL
		41	* Version 2 license, then the option applies only if the new code is
		42	* made subject to such option by the copyright holder.
		43	*/
		44	package org.netbeans.modules.versioning.spi;
		45
		46	import java.io.IOException;
		47	import org.openide.filesystems.FileStateInvalidException;
		48
		49	import java.io.File;
		50	import org.netbeans.api.queries.CollocationQuery;
		51	import org.netbeans.junit.NbTestCase;
		52	import org.netbeans.modules.versioning.spi.testvcs.TestVCS;
		53	import org.netbeans.modules.versioning.spi.testvcs.TestVCSCollocationQuery;
		54	import org.openide.util.test.MockLookup;
		55
		56	/**
		57	* Versioning SPI unit tests of VCSVisibilityQuery.
		58	*
		59	* @author Tomas Stupka
		60	*/
		61	public class VCSCollocationQueryTest extends NbTestCase {
		62
		63
		64	public VCSCollocationQueryTest(String testName) {
65	super(testName);
66	}
67
68	protected void setUp() throws Exception {
69	MockLookup.setLayersAndInstances();
70	File userdir = new File(getWorkDir() + "userdir");
71	userdir.mkdirs();
72	System.setProperty("netbeans.user", userdir.getAbsolutePath());
73	super.setUp();
74	}
75
76	public void testFindRootExisting() throws FileStateInvalidException, IOException, Exception {
77	File folder = new File(getWorkDir(), TestVCS.VERSIONED_FOLDER_SUFFIX);
78	folder.mkdirs();
79	File file = new File(folder, "somefile");
80	file.createNewFile();
81
82	assertRoot(folder, file);
83	}
84
85	public void testFindRootNotExisting() throws FileStateInvalidException, IOException, Exception {
86	File folder = new File(getWorkDir(), TestVCS.VERSIONED_FOLDER_SUFFIX);
87	folder.mkdirs();
88	File file = new File(folder, "somefile");
89	assertRoot(folder, file);
90	}
91
92	public void testFindRootBogusFile() throws FileStateInvalidException, IOException, Exception {
93	assertNull(CollocationQuery.findRoot(new File("/a/b/c")));
94	}
95
96	private void assertRoot(File root, File file) {
97	assertEquals(root, CollocationQuery.findRoot(file));
98	}
99
100	public void testAreCollocatedExisting() throws FileStateInvalidException, IOException, Exception {
101	File folder = new File(getWorkDir(), TestVCS.VERSIONED_FOLDER_SUFFIX);
102	folder.mkdirs();
103
104	File file1 = new File(folder, "file2" + TestVCSCollocationQuery.COLLOCATED_FILENAME_SUFFIX);
105	file1.createNewFile();
106	File file2 = new File(folder, "file1" + TestVCSCollocationQuery.COLLOCATED_FILENAME_SUFFIX);
107	file2.createNewFile();
108
109	assertCollocated(true, file1, file2);
110	}
111
112	public void testAreCollocatedNotExisting() throws FileStateInvalidException, IOException, Exception {
113	File folder = new File(getWorkDir(), TestVCS.VERSIONED_FOLDER_SUFFIX);
114	folder.mkdirs();
115
116	File file1 = new File(folder, "file2" + TestVCSCollocationQuery.COLLOCATED_FILENAME_SUFFIX);
117	file1.createNewFile();
118	File file2 = new File(folder, "file1" + TestVCSCollocationQuery.COLLOCATED_FILENAME_SUFFIX);
119	file2.createNewFile();
120
121	assertCollocated(true, file1, file2);
122	}
123
124
125	public void testNotCollocatedExisting() throws FileStateInvalidException, IOException, Exception {
126	File folder = new File(getWorkDir(), TestVCS.VERSIONED_FOLDER_SUFFIX);
127	folder.mkdirs();
128
129	File file1 = new File(folder, "file1");
130	file1.createNewFile();
131	File file2 = new File(folder, "file2");
132	file2.createNewFile();
133
134	assertCollocated(false, file1, file2);
135	}
136
137	public void testNotCollocatedNotExisting() throws FileStateInvalidException, IOException, Exception {
138	File folder = new File(getWorkDir(), TestVCS.VERSIONED_FOLDER_SUFFIX);
139	folder.mkdirs();
140
141	File file1 = new File(folder, "file1");
142	file1.createNewFile();
143	File file2 = new File(folder, "file2");
144	file2.createNewFile();
145
146	assertCollocated(false, file1, file2);
147	}
148
149	void assertCollocated(boolean expected, File file1, File file2) {
150	if(expected) {
151	assertTrue(CollocationQuery.areCollocated(file1, file2));
152	} else {
153	assertFalse(CollocationQuery.areCollocated(file1, file2));
154	}
155	}
156
157
158	}