Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -761,6 +761,9 @@ jobs:
- name: ide/projectuiapi.base
run: ant $OPTS -f ide/projectuiapi.base test

- name: ide/projectui
run: ant $OPTS -f ide/projectui test

- name: ide/refactoring.api
run: ant $OPTS -f ide/refactoring.api test

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,16 @@
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.swing.SwingUtilities;
import javax.swing.text.BadLocationException;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.junit.MockServices;
import org.netbeans.junit.NbTestCase;
import org.netbeans.junit.NbTestSuite;
import org.netbeans.junit.RandomlyFails;
import org.netbeans.modules.project.ui.actions.TestSupport;
import org.netbeans.spi.project.AuxiliaryConfiguration;
import org.openide.cookies.EditorCookie;
Expand All @@ -49,7 +45,6 @@
import org.openide.text.CloneableEditorSupport;
import org.openide.util.Lookup;
import org.openide.util.lookup.Lookups;
import org.openide.util.test.RestrictThreadCreation;
import org.openide.windows.CloneableTopComponent;
import org.openide.windows.TopComponent;
import org.openide.windows.WindowManager;
Expand Down Expand Up @@ -135,16 +130,6 @@ protected void setUp () throws Exception {
(tc1_1_navigator = new SimpleTopComponent2 (do1_1_open, NAVIGATOR_MODE)).open ();

ExitDialog.SAVE_ALL_UNCONDITIONALLY = true;

RestrictThreadCreation.permitStandard();
RestrictThreadCreation.permit(OpenProjectList.class.getName() + "$LoadOpenProjects.waitFinished",
OpenProjectList.class.getName() + "$LoadOpenProjects.resultChanged",
"org.openide.text.CloneableEditorSupport.prepareDocument",
"org.openide.text.CloneableEditor.initialize",
"org.openide.util.lookup.MetaInfServicesLookup.beforeLookup",
"org.netbeans.modules.project.ui.OpenProjectList.close",
"org.netbeans.modules.project.ui.OpenProjectList.doOpenProject");
RestrictThreadCreation.forbidNewThreads(false);
Comment thread
jtulach marked this conversation as resolved.
}

@SuppressWarnings("deprecation")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.api.project.ui.OpenProjects;
Expand Down Expand Up @@ -122,9 +123,10 @@ public void close() throws SecurityException {
}
H h = new H();
h.setLevel(Level.ALL);
OpenProjectList.LOGGER.addHandler(h);
OpenProjectList.LOGGER.setUseParentHandlers(false);
OpenProjectList.LOGGER.setLevel(Level.ALL);
Logger projectsRootNodeLOG = Logger.getLogger("org.netbeans.modules.project.ui.ProjectsRootNode");
projectsRootNodeLOG.addHandler(h);
projectsRootNodeLOG.setUseParentHandlers(false);
projectsRootNodeLOG.setLevel(Level.ALL);

assertEquals("30 children", 30, logicalView.getChildren().getNodesCount(true));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.netbeans.junit.NbTestCase;
import org.netbeans.junit.RandomlyFails;
import org.netbeans.modules.project.ui.actions.TestSupport;
import org.netbeans.modules.projectapi.nb.TimedWeakReference;
import org.netbeans.spi.project.ui.LogicalViewProvider;
import org.netbeans.spi.project.ui.ProjectOpenedHook;
import org.openide.filesystems.FileObject;
Expand Down Expand Up @@ -67,6 +68,8 @@ Lookup createLookup(TestSupport.TestProject project, Object instance) {
@Override
protected void setUp() throws Exception {
clearWorkDir();

TimedWeakReference.TIMEOUT = 1;

MockServices.setServices(TestSupport.TestProjectFactory.class);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ public void testReplaceProjectSingleNonRootNode() throws Exception { // #197864
}
};
ProjectsRootNode.checkNoLazyNode(ch);
Node[] ns = ch.getNodes(true);
Node[] ns = ch.getNodes(false);
Comment thread
jtulach marked this conversation as resolved.
assertEquals(1, ns.length);
assertEquals("p - Testing", ns[0].getDisplayName());
}
Expand Down