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

Jump to bottom

Set test resources directory to sbt default #171

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Set test resources directory to sbt default #171

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
4 changes: 4 additions & 0 deletions src/main/java/org/gradle/playframework/plugins/PlayApplicationPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,10 @@ private void configureJavaAndScalaSourceSet(Project project) {
mainScalaSourceDirectorySet.srcDir(getTwirlCompileTask(project).flatMap(task -> task.getOutputDirectory()));
mainScalaSourceDirectorySet.srcDir(getRoutesCompileTask(project).flatMap(task -> task.getOutputDirectory()));

SourceSet testSourceSet = PlayPluginHelper.getTestJavaSourceSet(project);
SourceDirectorySet testResourcesDirectorySet = testSourceSet.getResources();
testResourcesDirectorySet.setSrcDirs(Arrays.asList("test/resources"));

SourceDirectorySet testScalaSourceDirectorySet = PlayPluginHelper.getTestScalaSourceDirectorySet(project);
testScalaSourceDirectorySet.setSrcDirs(Arrays.asList("test"));
testScalaSourceDirectorySet.include("**/*.scala", "**/*.java");
Expand Down
55 changes: 55 additions & 0 deletions src/test/java/org/gradle/playframework/plugins/PluginResourceDirectoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
package org.gradle.playframework.plugins;

import org.gradle.api.Project;
import org.gradle.api.file.SourceDirectorySet;
import org.gradle.api.tasks.SourceSet;
import org.gradle.playframework.plugins.internal.PlayPluginHelper;
import org.gradle.testfixtures.ProjectBuilder;
import org.junit.Test;

import java.io.File;
import java.util.Collections;

import static org.junit.Assert.assertEquals;

public class PluginResourceDirectoryTests {
@Test
public void testResourcesDirectories() {
// given
Project project = ProjectBuilder
.builder()
.build();

// when
project.getPluginManager().apply(PlayPlugin.class);

SourceSet mainSourceSet = PlayPluginHelper.getMainJavaSourceSet(project);
SourceDirectorySet mainResourcesDirectorySet = mainSourceSet.getResources();

// then
assertEquals(
Collections.singleton(new File(project.getProjectDir(), "conf")),
mainResourcesDirectorySet.getSrcDirs()
);
}

@Test
public void testTestResourcesDirectories() {
// given
Project project = ProjectBuilder
.builder()
.build();

// when
project.getPluginManager().apply(PlayPlugin.class);

SourceSet testSourceSet = PlayPluginHelper.getTestJavaSourceSet(project);
SourceDirectorySet testResourcesDirectorySet = testSourceSet.getResources();

// then
assertEquals(
Collections.singleton(new File(project.getProjectDir(), "test/resources")),
testResourcesDirectorySet.getSrcDirs()
);
}
}