[hg] main-silver: #235684: Check if the source root is a folder....

  • From:
  • To:
  • Subject: [hg] main-silver: #235684: Check if the source root is a folder....
  • Date: Thu, 19 Sep 2013 05:31:17 -0700

changeset 538f613a8a9d in main-silver ((none))
details: http://hg.netbeans.org/main-silver/rev/538f613a8a9d
description:
        #235684: Check if the source root is a folder. Test included.

diffstat:

 
debugger.jpda/src/org/netbeans/modules/debugger/jpda/breakpoints/ClassBasedBreakpoint.java
               |   3 +
 
debugger.jpda/test/unit/src/org/netbeans/modules/debugger/jpda/breakpoints/ClassBasedBreakpointTest.java
 |  85 ++++++++++
 2 files changed, 88 insertions(+), 0 deletions(-)

diffs (103 lines):

diff --git 
a/debugger.jpda/src/org/netbeans/modules/debugger/jpda/breakpoints/ClassBasedBreakpoint.java
 
b/debugger.jpda/src/org/netbeans/modules/debugger/jpda/breakpoints/ClassBasedBreakpoint.java
--- 
a/debugger.jpda/src/org/netbeans/modules/debugger/jpda/breakpoints/ClassBasedBreakpoint.java
+++ 
b/debugger.jpda/src/org/netbeans/modules/debugger/jpda/breakpoints/ClassBasedBreakpoint.java
@@ -357,6 +357,9 @@
                 fo = fo.getFileObject(path);
             }
         }
+        if (fo != null && !fo.isFolder()) {
+            fo = null;
+        }
         return fo;
     }
 
diff --git 
a/debugger.jpda/test/unit/src/org/netbeans/modules/debugger/jpda/breakpoints/ClassBasedBreakpointTest.java
 
b/debugger.jpda/test/unit/src/org/netbeans/modules/debugger/jpda/breakpoints/ClassBasedBreakpointTest.java
new file mode 100644
--- /dev/null
+++ 
b/debugger.jpda/test/unit/src/org/netbeans/modules/debugger/jpda/breakpoints/ClassBasedBreakpointTest.java
@@ -0,0 +1,85 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2013 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 2013 Sun Microsystems, Inc.
+ */
+package org.netbeans.modules.debugger.jpda.breakpoints;
+
+import java.io.File;
+import java.io.IOException;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+/**
+ *
+ * @author Martin
+ */
+public class ClassBasedBreakpointTest {
+    
+    @Test
+    public void testClassExistsInSources() throws IOException {
+        // Non existing class:
+        String className = "org.foo.Foo";
+        String emptyJarPath = 
System.getProperty("java.io.tmpdir")+File.separator+"NoSuchJar.jar";
+        File emptyJar = new File(emptyJarPath);
+        emptyJar.createNewFile();
+        emptyJar.deleteOnExit();
+        String[] projectSourceRoots = new String[] {
+            System.getProperty("user.dir"),
+            emptyJarPath,
+        };
+        boolean exists = 
ClassBasedBreakpoint.classExistsInSources(className, projectSourceRoots);
+        assertFalse(exists);
+        
+        /*
+        String cp = System.getProperty("test.dir.src");
+        projectSourceRoots = new String[] {
+            System.getProperty("test.dir.src"),
+        };
+        className = ClassBasedBreakpointTest.class.getName();
+        *//*
+        projectSourceRoots = new String[] {
+            "/tmp/Foo.jar",
+        };
+        className = "org.test.Foo";
+        exists = ClassBasedBreakpoint.classExistsInSources(className, 
projectSourceRoots);
+        assertTrue(exists);
+        */
+    }
+}

[hg] main-silver: #235684: Check if the source root is a folder....

mentlicher 09/19/2013

Project Features

About this Project

Debugger was started in November 2009, is owned by tpavek, and has 29 members.
By use of this website, you agree to the NetBeans Policies and Terms of Use (revision 20131025.e7cbc9d). © 2013, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo
 
 
Close
loading
Please Confirm
Close