seme more coverage and work on frege doc task.

TODO fix fregedoc task for mixed java + frege sources

2 files changed, 41 insertions, 6 deletions

diff --git a/src/integTest/groovy/frege/gradle/integtest/fixtures/AbstractFregeIntegrationSpec.groovy b/src/integTest/groovy/frege/gradle/integtest/fixtures/AbstractFregeIntegrationSpec.groovy
index 6bcd339..7415ef1 100644
--- a/src/integTest/groovy/frege/gradle/integtest/fixtures/AbstractFregeIntegrationSpec.groovy
+++ b/src/integTest/groovy/frege/gradle/integtest/fixtures/AbstractFregeIntegrationSpec.groovy
@@ -17,8 +17,7 @@ class AbstractFregeIntegrationSpec extends Specification {
     def setup() {
         buildFile = testProjectDir.newFile('build.gradle')
 
-
-        testProjectDir.newFolder("src", "main", "java", "org", "frege")
+        testProjectDir.newFolder("src", "main", "java", "org", "frege", "java")
         testProjectDir.newFolder("src", "main", "frege", "org", "frege")
 
         def pluginClasspathResource = getClass().classLoader.findResource("plugin-classpath.txt")
diff --git a/src/integTest/groovy/frege/gradle/plugins/FregePluginIntegTest.groovy b/src/integTest/groovy/frege/gradle/plugins/FregePluginIntegTest.groovy
index 7272113..c394e48 100644
--- a/src/integTest/groovy/frege/gradle/plugins/FregePluginIntegTest.groovy
+++ b/src/integTest/groovy/frege/gradle/plugins/FregePluginIntegTest.groovy
@@ -2,6 +2,7 @@ package frege.gradle.plugins
 
 import frege.gradle.integtest.fixtures.AbstractFregeIntegrationSpec
 import org.gradle.testkit.runner.BuildResult
+import spock.lang.Ignore
 import spock.lang.Unroll
 import static org.gradle.testkit.runner.TaskOutcome.*
 
@@ -94,6 +95,41 @@ class FregePluginIntegTest extends AbstractFregeIntegrationSpec {
         result.output.contains("hello from java")
     }
 
+    def "can run frege doc on frege module"() {
+        given:
+        buildFile << """
+        dependencies {
+            compile "org.frege-lang:frege:$DEFAULT_FREGE_VERSION"
+        }
+        """
+
+        and:
+        fregeModule()
+        when:
+        BuildResult result = run("fregeDoc")
+        then:
+        result.task(":fregeDoc").outcome == SUCCESS
+    }
+
+
+    @Ignore
+    def "frege doc works with mixed sources"() {
+        given:
+        buildFile << """
+        dependencies {
+            compile "org.frege-lang:frege:$DEFAULT_FREGE_VERSION"
+        }
+        """
+
+        and:
+        javaCode()
+        fregeCallingJava()
+        when:
+        BuildResult result = run("fregeDoc")
+        then:
+        result.task(":fregeDoc").outcome == SUCCESS
+    }
+
 
     def "supports additional source sets"() {
         given:
@@ -131,8 +167,8 @@ class FregePluginIntegTest extends AbstractFregeIntegrationSpec {
         fregeSourceFile << """
         module org.frege.HelloFrege where
 
-        data StaticHello = pure native org.frege.StaticHello where
-            pure native helloJava org.frege.StaticHello.helloJava:: () -> String
+        data StaticHello = pure native org.frege.java.StaticHello where
+            pure native helloJava org.frege.java.StaticHello.helloJava:: () -> String
 
 
         main _ = do
@@ -142,10 +178,10 @@ class FregePluginIntegTest extends AbstractFregeIntegrationSpec {
     }
 
     def javaCode(String sourceRoot = "java") {
-        def javaSourceFile = testProjectDir.newFile("src/main/$sourceRoot/org/frege/StaticHello.java")
+        def javaSourceFile = testProjectDir.newFile("src/main/$sourceRoot/org/frege/java/StaticHello.java")
 
         javaSourceFile << """
-        package org.frege;
+        package org.frege.java;
 
         public class StaticHello {
             public static String helloJava() {