Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix unit test on single file being reported as integration test GH4587 #5912

Merged
merged 1 commit into from
May 3, 2023
Merged

Fix unit test on single file being reported as integration test GH4587 #5912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 4 additions & 7 deletions java/maven/src/org/netbeans/modules/maven/execute/DefaultReplaceTokenProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.netbeans.api.annotations.common.CheckForNull;
import org.netbeans.api.java.project.JavaProjectConstants;
import org.netbeans.api.java.queries.UnitTestForSourceQuery;
Expand Down Expand Up @@ -359,13 +360,9 @@ private boolean isIntegrationTestFile(FileObject file) {
}

private boolean isIntegrationTestTarget(Lookup lookup) {
final SingleMethod targetMethod = lookup.lookup(SingleMethod.class); //JavaDataObject
if (targetMethod != null) {
return isIntegrationTestFile(targetMethod.getFile());
}
final Collection<? extends FileObject> targetFiles = lookup.lookupAll(FileObject.class);
if (targetFiles != null) {
return targetFiles.stream().allMatch(file -> isIntegrationTestFile(file));
FileObject[] targetFiles = extractFileObjectsfromLookup(lookup);
if (targetFiles.length > 0) {
return Stream.of(targetFiles).allMatch(file -> isIntegrationTestFile(file));
}
return false;
}
Expand Down
26 changes: 26 additions & 0 deletions ...ven/test/unit/src/org/netbeans/modules/maven/execute/DefaultReplaceTokenProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.filesystems.test.TestFileUtils;
import org.openide.loaders.DataObject;
import org.openide.util.Lookup;
import org.openide.util.lookup.Lookups;

Expand Down Expand Up @@ -73,6 +74,31 @@ public void testTestSingle() throws Exception {
assertEquals(null, ActionProviderImpl.replacements(p, ActionProvider.COMMAND_RUN, Lookup.EMPTY).get(DefaultReplaceTokenProvider.CLASSNAME_EXT));

}

public void testTestNotIT_GH4587() throws Exception {
TestFileUtils.writeFile(d, "pom.xml", "<project><modelVersion>4.0.0</modelVersion>"
+ "<groupId>g</groupId><artifactId>a</artifactId><version>0</version></project>");
TestFileUtils.writeFile(d, "src/test/java/p1/FirstTest.java", "package p1; class FirstTest {}");
TestFileUtils.writeFile(d, "src/test/java/p1/FirstIT.java", "package p1; class FirstIT {}");
Project p = ProjectManager.getDefault().findProject(d);
DefaultReplaceTokenProvider instance = new DefaultReplaceTokenProvider(p);
FileObject file = d.getFileObject("src/test/java/p1/FirstTest.java");
String converted = instance.convert(ActionProvider.COMMAND_TEST_SINGLE, Lookups.singleton(file));
assertNull(converted);
converted = instance.convert(ActionProvider.COMMAND_DEBUG_TEST_SINGLE, Lookups.singleton(file));
assertNull(converted);
DataObject dob = DataObject.find(file);
converted = instance.convert(ActionProvider.COMMAND_TEST_SINGLE, Lookups.singleton(dob));
assertNull(converted);
converted = instance.convert(ActionProvider.COMMAND_DEBUG_TEST_SINGLE, Lookups.singleton(dob));
assertNull(converted);
file = d.getFileObject("src/test/java/p1/FirstIT.java");
converted = instance.convert(ActionProvider.COMMAND_TEST_SINGLE, Lookups.singleton(file));
assertEquals(ActionProviderImpl.COMMAND_INTEGRATION_TEST_SINGLE, converted);
dob = DataObject.find(file);
converted = instance.convert(ActionProvider.COMMAND_TEST_SINGLE, Lookups.singleton(dob));
assertEquals(ActionProviderImpl.COMMAND_INTEGRATION_TEST_SINGLE, converted);
}

public void testNgSingle() throws Exception {
TestFileUtils.writeFile(d, "pom.xml", "<project><modelVersion>4.0.0</modelVersion>"
Expand Down