Attachment #76795 for bug #102711

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 102711
Collapse All | Expand All

Lines 125-130 Link Here

(-)a/junit/nbproject/project.xml (-1 / +2 lines)
125	<compile-dependency/>	125	<compile-dependency/>
126	<run-dependency>	126	<run-dependency>
127	<release-version>1</release-version>	127	<release-version>1</release-version>
		128	<specification-version>1.24</specification-version>
128	</run-dependency>	129	</run-dependency>
129	</dependency>	130	</dependency>
130	<dependency>	131	<dependency>
Lines 150-156 Link Here
150	<compile-dependency/>	151	<compile-dependency/>
151	<run-dependency>	152	<run-dependency>
152	<release-version>1</release-version>	153	<release-version>1</release-version>
153	<specification-version>1.19</specification-version>	154	<specification-version>1.24</specification-version>
154	</run-dependency>	155	</run-dependency>
155	</dependency>	156	</dependency>
156	<dependency>	157	<dependency>




import javax.swing.JPanel;
import javax.swing.JRadioButton;
import org.netbeans.api.java.classpath.ClassPath;
import org.netbeans.api.java.project.JavaProjectConstants;
import org.netbeans.api.java.project.classpath.ProjectClassPathModifier;
import org.netbeans.api.java.queries.UnitTestForSourceQuery;
import org.netbeans.api.java.source.ClasspathInfo;

import org.netbeans.api.project.ProjectManager;
import org.netbeans.api.project.ProjectUtils;
import org.netbeans.api.project.SourceGroup;
import org.netbeans.api.project.SourceGroupModifier;
import org.netbeans.api.project.Sources;
import org.netbeans.api.project.libraries.Library;
import org.netbeans.api.project.libraries.LibraryManager;


        boolean storeSettings;
        try {
            try {
                storeSettings = readProjectSettingsJUnitVer(project);
            } catch (IllegalStateException ex) {
                if (SourceGroupModifier.createSourceGroup(project, JavaProjectConstants.SOURCES_TYPE_JAVA, JavaProjectConstants.SOURCES_HINT_TEST) != null) {
                    //repeat if the folder/Sourcegroup was created.
                    storeSettings = readProjectSettingsJUnitVer(project);
                } else {
                    throw ex;
                }
            }
            if (!storeSettings) {
                LOG_JUNIT_VER.finest(
                " - will not be able to store JUnit version settings"); //NOI18N

Lines 78-84 Link Here

(-)a/junit/src/org/netbeans/modules/junit/JUnitCfgOfCreate.java (+13 lines)
78	import javax.swing.plaf.UIResource;	78	import javax.swing.plaf.UIResource;
79	import javax.swing.text.JTextComponent;	79	import javax.swing.text.JTextComponent;
80	import org.netbeans.api.java.classpath.ClassPath;	80	import org.netbeans.api.java.classpath.ClassPath;
		81	import org.netbeans.api.java.project.JavaProjectConstants;
		82	import org.netbeans.api.project.FileOwnerQuery;
		83	import org.netbeans.api.project.Project;
81	import org.netbeans.api.project.SourceGroup;	84	import org.netbeans.api.project.SourceGroup;
		85	import org.netbeans.api.project.SourceGroupModifier;
82	import org.openide.DialogDescriptor;	86	import org.openide.DialogDescriptor;
83	import org.openide.DialogDisplayer;	87	import org.openide.DialogDisplayer;
84	import org.openide.awt.Mnemonics;	88	import org.openide.awt.Mnemonics;
Lines 879-884 Link Here
879	*/	883	*/
880	private void setupLocationChooser(FileObject refFileObject) {	884	private void setupLocationChooser(FileObject refFileObject) {
881	Object[] targetFolders = TestUtil.getTestTargets(refFileObject);	885	Object[] targetFolders = TestUtil.getTestTargets(refFileObject);
		886	if (targetFolders.length == 0) {
		887	Project owner = FileOwnerQuery.getOwner(refFileObject);
		888	if (owner != null) {
		889	if (SourceGroupModifier.createSourceGroup(owner, JavaProjectConstants.SOURCES_TYPE_JAVA, JavaProjectConstants.SOURCES_HINT_TEST) != null) {
		890	targetFolders = TestUtil.getTestTargets(refFileObject);
		891	}
		892	}
		893	}
		894
882	if (targetFolders.length != 0) {	895	if (targetFolders.length != 0) {
883	hasTargetFolders = true;	896	hasTargetFolders = true;
884	cboxLocation.setModel(new DefaultComboBoxModel(targetFolders));	897	cboxLocation.setModel(new DefaultComboBoxModel(targetFolders));

Lines 51-58 Link Here

(-)a/junit/src/org/netbeans/modules/junit/wizards/EmptyTestCaseWizardIterator.java (+7 lines)
51	import java.util.Set;	51	import java.util.Set;
52	import javax.swing.event.ChangeEvent;	52	import javax.swing.event.ChangeEvent;
53	import javax.swing.event.ChangeListener;	53	import javax.swing.event.ChangeListener;
		54	import org.netbeans.api.java.project.JavaProjectConstants;
54	import org.netbeans.api.project.Project;	55	import org.netbeans.api.project.Project;
55	import org.netbeans.api.project.SourceGroup;	56	import org.netbeans.api.project.SourceGroup;
		57	import org.netbeans.api.project.SourceGroupModifier;
56	import org.netbeans.modules.junit.GuiUtils;	58	import org.netbeans.modules.junit.GuiUtils;
57	import org.netbeans.modules.junit.JUnitPluginTrampoline;	59	import org.netbeans.modules.junit.JUnitPluginTrampoline;
58	import org.netbeans.modules.junit.JUnitSettings;	60	import org.netbeans.modules.junit.JUnitSettings;
Lines 182-187 Link Here
182	if (targetPanel == null \|\| project != lastSelectedProject) {	184	if (targetPanel == null \|\| project != lastSelectedProject) {
183	Collection<SourceGroup> sourceGroups = Utils.getTestTargets(project, true);	185	Collection<SourceGroup> sourceGroups = Utils.getTestTargets(project, true);
184	if (sourceGroups.isEmpty()) {	186	if (sourceGroups.isEmpty()) {
		187	if (SourceGroupModifier.createSourceGroup(project, JavaProjectConstants.SOURCES_TYPE_JAVA, JavaProjectConstants.SOURCES_HINT_TEST) != null) {
		188	sourceGroups = Utils.getTestTargets(project, true);
		189	}
		190	}
		191	if (sourceGroups.isEmpty()) {
185	targetPanel = new StepProblemMessage(	192	targetPanel = new StepProblemMessage(
186	project,	193	project,
187	NbBundle.getMessage(EmptyTestCaseWizardIterator.class,	194	NbBundle.getMessage(EmptyTestCaseWizardIterator.class,




import java.util.Set;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import org.netbeans.api.java.project.JavaProjectConstants;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.SourceGroupModifier;
import org.netbeans.modules.junit.GuiUtils;
import org.netbeans.modules.junit.JUnitPluginTrampoline;
import org.netbeans.modules.junit.JUnitSettings;

    private WizardDescriptor.Panel<WizardDescriptor> getClassChooserPanel() {
        final Project project = Templates.getProject(wizard);
        if (classChooserPanel == null || project != lastSelectedProject) {
            SourceGroupModifier.createSourceGroup(project, JavaProjectConstants.SOURCES_TYPE_JAVA, JavaProjectConstants.SOURCES_HINT_TEST);
            final Utils utils = new Utils(project);
            if (utils.getSourcesToTestsMap(true).isEmpty()) {
                classChooserPanel = new StepProblemMessage(

Lines 50-57 Link Here

(-)a/junit/src/org/netbeans/modules/junit/wizards/TestSuiteWizardIterator.java (+8 lines)
50	import java.util.Set;	50	import java.util.Set;
51	import javax.swing.event.ChangeEvent;	51	import javax.swing.event.ChangeEvent;
52	import javax.swing.event.ChangeListener;	52	import javax.swing.event.ChangeListener;
		53	import org.netbeans.api.java.project.JavaProjectConstants;
53	import org.netbeans.api.project.Project;	54	import org.netbeans.api.project.Project;
54	import org.netbeans.api.project.SourceGroup;	55	import org.netbeans.api.project.SourceGroup;
		56	import org.netbeans.api.project.SourceGroupModifier;
55	import org.netbeans.modules.junit.DefaultPlugin;	57	import org.netbeans.modules.junit.DefaultPlugin;
56	import org.netbeans.modules.junit.GuiUtils;	58	import org.netbeans.modules.junit.GuiUtils;
57	import org.netbeans.modules.junit.JUnitSettings;	59	import org.netbeans.modules.junit.JUnitSettings;
Lines 192-197 Link Here
192	} else {	194	} else {
193	Collection<SourceGroup> sourceGroups = Utils.getTestTargets(project, true);	195	Collection<SourceGroup> sourceGroups = Utils.getTestTargets(project, true);
194	if (sourceGroups.isEmpty()) {	196	if (sourceGroups.isEmpty()) {
		197	if (SourceGroupModifier.createSourceGroup(project, JavaProjectConstants.SOURCES_TYPE_JAVA, JavaProjectConstants.SOURCES_HINT_TEST) != null) {
		198	sourceGroups = Utils.getTestTargets(project, true);
		199	}
		200	}
		201
		202	if (sourceGroups.isEmpty()) {
195	targetPanel = new StepProblemMessage(	203	targetPanel = new StepProblemMessage(
196	project,	204	project,
197	NbBundle.getMessage(TestSuiteWizardIterator.class,	205	NbBundle.getMessage(TestSuiteWizardIterator.class,

Return to bug 102711

Lines 67-72 Link Here

(-)a/junit/src/org/netbeans/modules/junit/DefaultPlugin.java (-1 / +12 lines)
67	import javax.swing.JPanel;	67	import javax.swing.JPanel;
68	import javax.swing.JRadioButton;	68	import javax.swing.JRadioButton;
69	import org.netbeans.api.java.classpath.ClassPath;	69	import org.netbeans.api.java.classpath.ClassPath;
		70	import org.netbeans.api.java.project.JavaProjectConstants;
70	import org.netbeans.api.java.project.classpath.ProjectClassPathModifier;	71	import org.netbeans.api.java.project.classpath.ProjectClassPathModifier;
71	import org.netbeans.api.java.queries.UnitTestForSourceQuery;	72	import org.netbeans.api.java.queries.UnitTestForSourceQuery;
72	import org.netbeans.api.java.source.ClasspathInfo;	73	import org.netbeans.api.java.source.ClasspathInfo;
Lines 78-83 Link Here
78	import org.netbeans.api.project.ProjectManager;	79	import org.netbeans.api.project.ProjectManager;
79	import org.netbeans.api.project.ProjectUtils;	80	import org.netbeans.api.project.ProjectUtils;
80	import org.netbeans.api.project.SourceGroup;	81	import org.netbeans.api.project.SourceGroup;
		82	import org.netbeans.api.project.SourceGroupModifier;
81	import org.netbeans.api.project.Sources;	83	import org.netbeans.api.project.Sources;
82	import org.netbeans.api.project.libraries.Library;	84	import org.netbeans.api.project.libraries.Library;
83	import org.netbeans.api.project.libraries.LibraryManager;	85	import org.netbeans.api.project.libraries.LibraryManager;
Lines 1024-1030 Link Here
1024		1026
1025	boolean storeSettings;	1027	boolean storeSettings;
1026	try {	1028	try {
1027	storeSettings = readProjectSettingsJUnitVer(project);	1029	try {
		1030	storeSettings = readProjectSettingsJUnitVer(project);
		1031	} catch (IllegalStateException ex) {
		1032	if (SourceGroupModifier.createSourceGroup(project, JavaProjectConstants.SOURCES_TYPE_JAVA, JavaProjectConstants.SOURCES_HINT_TEST) != null) {
		1033	//repeat if the folder/Sourcegroup was created.
		1034	storeSettings = readProjectSettingsJUnitVer(project);
		1035	} else {
		1036	throw ex;
		1037	}
		1038	}
1028	if (!storeSettings) {	1039	if (!storeSettings) {
1029	LOG_JUNIT_VER.finest(	1040	LOG_JUNIT_VER.finest(
1030	" - will not be able to store JUnit version settings"); //NOI18N	1041	" - will not be able to store JUnit version settings"); //NOI18N