exclude test when sparkr profile is not defined

Leemoonsoo · Leemoonsoo · commit 1a0195f77f08 · 2016-03-23T12:31:58.000-07:00
diff --git a/spark-dependencies/pom.xml b/spark-dependencies/pom.xml
@@ -798,6 +798,12 @@
 
     <profile>
       <id>sparkr</id>
+
+      <!-- see exclude-sparkr profile in spark -->
+      <properties>
+        <sparkr.activate>y</sparkr.activate>
+      </properties>
+
       <build>
         <plugins>
           <plugin>
diff --git a/spark/pom.xml b/spark/pom.xml
@@ -433,83 +433,15 @@
 
   <profiles>
     <profile>
-      <id>spark-1.1</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <configuration>
-              <excludes>
-                <exclude>**/SparkRInterpreter.java</exclude>
-              </excludes>
-              <testExcludes>
-                <testExclude>**/SparkRInterpreterTest.java</testExclude>
-              </testExcludes>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.scala-tools</groupId>
-            <artifactId>maven-scala-plugin</artifactId>
-            <configuration>
-              <excludes>
-                <exclude>**/ZeppelinR.scala</exclude>
-                <exclude>**/SparkRBackend.scala</exclude>
-              </excludes>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <excludes>
-                <exclude>**/SparkRInterpreterTest.java</exclude>
-              </excludes>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>spark-1.2</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <configuration>
-              <excludes>
-                <exclude>**/SparkRInterpreter.java</exclude>
-              </excludes>
-              <testExcludes>
-                <testExclude>**/SparkRInterpreterTest.java</testExclude>
-              </testExcludes>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.scala-tools</groupId>
-            <artifactId>maven-scala-plugin</artifactId>
-            <configuration>
-              <excludes>
-                <exclude>**/ZeppelinR.scala</exclude>
-                <exclude>**/SparkRBackend.scala</exclude>
-              </excludes>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <excludes>
-                <exclude>**/SparkRInterpreterTest.java</exclude>
-              </excludes>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>spark-1.3</id>
+      <id>exclude-sparkr</id>
+
+      <!-- see sparkr profile in spark-dependencies -->
+      <activation>
+        <property>
+          <name>!sparkr.activate</name>
+        </property>
+      </activation>
+
       <build>
         <plugins>
           <plugin>
@@ -521,6 +453,7 @@
               </excludes>
               <testExcludes>
                 <testExclude>**/SparkRInterpreterTest.java</testExclude>
+                <testExclude>**/ZeppelinRTest.java</testExclude>
               </testExcludes>
             </configuration>
           </plugin>
diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java
@@ -102,7 +102,7 @@ public void sparkRTest() throws IOException {
       note.run(p.getId());
       waitForFinish(p);
       assertEquals(Status.FINISHED, p.getStatus());
-      assertEquals("[1] 3\n", p.getResult().message());
+      assertEquals("[1] 3", p.getResult().message());
     }
     ZeppelinServer.notebook.removeNote(note.id());
   }

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public void sparkRTest() throws IOException {`
`102`	`102`	`note.run(p.getId());`
`103`	`103`	`waitForFinish(p);`
`104`	`104`	`assertEquals(Status.FINISHED, p.getStatus());`
`105`		`- assertEquals("[1] 3\n", p.getResult().message());`
	`105`	`+ assertEquals("[1] 3", p.getResult().message());`
`106`	`106`	`}`
`107`	`107`	`ZeppelinServer.notebook.removeNote(note.id());`
`108`	`108`	`}`