Hardcode portal-test dependency for all tests, will clean up the hard…

…code later.
shuyangzhou · Apr 18, 2021 · d60997b · d60997b
1 parent 1d13d0c
commit d60997b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/com/liferay/netbeansproject/container/Module.java b/src/com/liferay/netbeansproject/container/Module.java
@@ -522,6 +522,13 @@ private Module(
 		_portalModuleDependencies = portalModuleDependencies;
 		_checksum = checksum;
 		_jdkVersion = jdkVersion;
+
+		if ((_testUnitPath != null) || (_testIntegrationPath != null)) {
+			Path portalTest = _projectPath.resolve("portal-test");
+
+			_moduleDependencies.add(
+				new Dependency(portalTest, portalTest.resolve("src"), true));
+		}
 	}
 
 	private void _save() throws IOException {

diff --git a/src/com/liferay/netbeansproject/util/GradleUtil.java b/src/com/liferay/netbeansproject/util/GradleUtil.java
@@ -181,7 +181,7 @@ public static Set<Dependency> getModuleDependencies(
 		Path buildGradlePath = modulePath.resolve("build.gradle");
 
 		if (!Files.exists(buildGradlePath)) {
-			return Collections.emptySet();
+			return new HashSet<>();
 		}
 
 		Set<Dependency> moduleDependencies = new HashSet<>();