Merge pull request ReactiveX#132 from benjchristensen/language-tests-and-examples

Refactoring language tests and examples layout

Author: benjchristensen

language-adaptors/rxjava-clojure/build.gradle

@@ -1,4 +1,5 @@
 apply plugin: 'java'
+apply plugin: 'clojure'
 apply plugin: 'eclipse'
 apply plugin: 'idea'
 
@@ -7,8 +8,43 @@ dependencies {
     provided 'org.clojure:clojure:1.4.+'
     provided 'junit:junit:4.10'
     provided 'org.mockito:mockito-core:1.8.5'
+    
+    // clojure
+    testCompile 'clj-http:clj-http:0.6.4' // https://clojars.org/clj-http
 }
 
+/*
+ * Clojure
+ */
+aotCompile = true
+warnOnReflection = true
+
+buildscript {
+  repositories { maven { url "http://clojars.org/repo" } }
+  dependencies { classpath "clojuresque:clojuresque:1.5.4" }
+}
+
+repositories {
+  mavenCentral()
+  clojarsRepo()
+}
+
+/*
+ * Add Counterclockwise and include 'provided' dependencies
+ */
+eclipse {
+  project {
+    natures "ccw.nature"
+  }
+  classpath {
+    plusConfigurations += configurations.provided
+    downloadSources = true
+    downloadJavadoc = true
+  }
+}
+
+
+// setup Eclipse
 eclipse {
   classpath {
     //you can tweak the classpath of the Eclipse project by adding extra configurations:
@@ -18,3 +54,19 @@ eclipse {
     downloadJavadoc = true
   }
 }
+
+// include /src/examples folder
+sourceSets {
+    examples
+}
+
+// make 'examples' use the same classpath
+configurations {
+    examplesCompile.extendsFrom compile
+    examplesRuntime.extendsFrom runtime
+}
+
+// include 'examples' in build task
+build.dependsOn examplesClasses
+
+

rxjava-examples/src/main/clojure/rx/examples/clojure/rx_examples.clj renamed to language-adaptors/rxjava-clojure/src/examples/clojure/rx/lang/clojure/examples/rx_examples.clj

@@ -1,12 +1,10 @@
-(ns rx.examples.clojure.rx-examples
+(ns rx.lang.clojure.examples.rx-examples
   (import rx.Observable)
   (:require [clj-http.client :as http]))
 
 ; NOTE on naming conventions. I'm using camelCase names (against clojure convention)
 ; in this file as I'm purposefully keeping functions and methods across
 ; different language implementations in-sync for easy comparison.
-;
-; See rx.examples.groovy.RxExamples, rx.examples.java.RxExamples, etc.
 
 ; --------------------------------------------------
 ; Hello World!

language-adaptors/rxjava-clojure/src/test/clojure/rx/lang/clojure/observable_tests.clj

@@ -0,0 +1,5 @@
+(ns rx.lang.clojure.observable-tests
+  (import rx.Observable))
+
+;; still need to get this wired up in build.gradle to run as tests
+; (-> (rx.Observable/toObservable [\"one\" \"two\" \"three\"]) (.take 2) (.subscribe (fn [arg] (println arg))))

language-adaptors/rxjava-groovy/build.gradle

@@ -1,20 +1,36 @@
 apply plugin: 'java'
+apply plugin: 'groovy'
 apply plugin: 'eclipse'
 apply plugin: 'idea'
 
 dependencies {
     compile project(':rxjava-core')
-    provided 'org.codehaus.groovy:groovy-all:2.+'
+    groovy 'org.codehaus.groovy:groovy-all:2.+'
     provided 'junit:junit:4.10'
     provided 'org.mockito:mockito-core:1.8.5'
 }
 
-eclipse {
-  classpath {
-    //you can tweak the classpath of the Eclipse project by adding extra configurations:
-    plusConfigurations += configurations.provided
+// include /src/examples folder
+sourceSets {
+    examples
+}
+
+// make 'examples' use the same classpath
+configurations {
+    examplesCompile.extendsFrom compile
+    examplesRuntime.extendsFrom runtime
+}
+
+// include 'examples' in build task
+build.dependsOn examplesClasses
 
-    downloadSources = true
-    downloadJavadoc = true
-  }
+// setup Eclipse
+eclipse {
+    classpath {
+      //you can tweak the classpath of the Eclipse project by adding extra configurations:
+      plusConfigurations += configurations.provided
+  
+      downloadSources = true
+      downloadJavadoc = true
+    }
 }

rxjava-examples/src/main/groovy/rx/examples/groovy/RxExamples.groovy renamed to language-adaptors/rxjava-groovy/src/examples/groovy/rx/lang/groovy/examples/RxExamples.groovy

@@ -1,4 +1,19 @@
-package rx.examples.groovy;
+/**
+ * Copyright 2013 Netflix, Inc.
+ * 
+ * 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 rx.lang.groovy.examples;
 
 import rx.Observable;
 import rx.Observer;

rxjava-examples/src/main/groovy/rx/examples/groovy/VideoExample.groovy renamed to language-adaptors/rxjava-groovy/src/examples/groovy/rx/lang/groovy/examples/VideoExample.groovy

@@ -1,4 +1,19 @@
-package rx.examples.groovy;
+/**
+ * Copyright 2013 Netflix, Inc.
+ *
+ * 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 rx.lang.groovy.examples;
 
 import rx.Observable;
 import rx.Observer;