Skip to content

Commit

Permalink
fix: detect project folder for gradle kotlin projects (#19614) (#19615)
Browse files Browse the repository at this point in the history
Fixes #18682

Co-authored-by: Marco Collovati <[email protected]>
  • Loading branch information
vaadin-bot and mcollovati authored Jun 20, 2024
1 parent 61459f5 commit f643181
Show file tree
Hide file tree
Showing 2 changed files with 105 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -230,9 +230,9 @@ default File getProjectFolder() {
*/
String baseDirCandidate = System.getProperty("user.dir", ".");
Path path = Paths.get(baseDirCandidate);
if (path.toFile().isDirectory()
&& (path.resolve("pom.xml").toFile().exists()
|| path.resolve("build.gradle").toFile().exists())) {
if (path.toFile().isDirectory() && (path.resolve("pom.xml").toFile()
.exists() || path.resolve("build.gradle").toFile().exists()
|| path.resolve("build.gradle.kts").toFile().exists())) {
return path.toAbsolutePath().toFile();
} else {
throw new IllegalStateException(String.format(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
/*
* Copyright 2000-2024 Vaadin Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/

package com.vaadin.flow.server;

import java.io.File;
import java.io.IOException;

import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;

public class AbstractConfigurationTest {

@Rule
public TemporaryFolder temporaryFolder = new TemporaryFolder();

AbstractConfiguration configuration = new AbstractConfiguration() {
@Override
public boolean isProductionMode() {
return false;
}

@Override
public String getStringProperty(String name, String defaultValue) {
return null;
}

@Override
public boolean getBooleanProperty(String name, boolean defaultValue) {
return false;
}
};

@Test
public void getProjectFolder_mavenProject_detected() throws IOException {
assertProjectFolderDetected("pom.xml");
}

@Test
public void getProjectFolder_gradleProject_detected() throws IOException {
assertProjectFolderDetected("build.gradle");
}

@Test
public void getProjectFolder_gradleKotlinProject_detected()
throws IOException {
assertProjectFolderDetected("build.gradle.kts");
}

@Test
public void getProjectFolder_unknownProject_throws() throws IOException {
withTemporaryUserDir(() -> {
IllegalStateException exception = Assert.assertThrows(
IllegalStateException.class,
configuration::getProjectFolder);
Assert.assertTrue(exception.getMessage().contains(
"Failed to determine project directory for dev mode"));
Assert.assertTrue(exception.getMessage()
.contains(temporaryFolder.getRoot().getAbsolutePath()));
});
}

private void assertProjectFolderDetected(String projectFile)
throws IOException {
temporaryFolder.newFile(projectFile);
withTemporaryUserDir(() -> {
File projectFolder = configuration.getProjectFolder();
Assert.assertEquals(temporaryFolder.getRoot(), projectFolder);
});
}

private void withTemporaryUserDir(Runnable test) throws IOException {
String userDir = System.getProperty("user.dir");
try {
System.setProperty("user.dir",
temporaryFolder.getRoot().getAbsolutePath());
test.run();
} finally {
if (userDir != null) {
System.setProperty("user.dir", userDir);
} else {
System.clearProperty("user.dir");
}
}
}

}

0 comments on commit f643181

Please sign in to comment.