Real tests; fix macro-expansion bug.

src/shady/defclass.clj

@@ -3,11 +3,6 @@
 producing `gen-class`-backed JVM interop classes."
   (:use [shady.gen-class :only [generate-class]]))
 
-(defmacro ^:private prog1
-  "Evaluates the result of expr, then evaluates the forms in body (presumably
-for side-effects), then returns the result of expr."
-  [expr & body] `(let [value# ~expr] ~@body value#))
-
 (defn- class-name
   [sym] (.getName ^Class (resolve sym)))
 
@@ -112,6 +107,7 @@ provide an initialization function."
                :methods methods
                :prefix prefix)]
     (generate-class opts)
-    `(prog1 (import ~(symbol pqname))
+    `(let [result# (import ~(symbol pqname))]
        ~@(map (partial defn-bodies prefix fields state init-name)
-              (apply concat (vals specs))))))
+              (apply concat (vals specs)))
+       result#)))

test/shady/defclass_test.clj

@@ -0,0 +1,68 @@
+(ns shady.defclass-test
+  (:use [clojure.test])
+  (:use [shady.defclass :only [defclass]]))
+
+(defclass Definition []
+  (exampleMethod [this] :example))
+
+(deftest test-definition
+   (testing "defclass can define classes"
+     (is (= :example (.exampleMethod (Definition.))))))
+
+
+(defclass Redefinition []
+  (exampleMethod [this] :first))
+
+(defclass Redefinition []
+  (exampleMethod [this] :second))
+
+(deftest test-redefinition
+  (testing "defclass can re-define classes"
+    (is (= :second (.exampleMethod (Redefinition.))))))
+
+
+(defclass ExtendBase []
+  (exampleMethod [this] :base))
+
+(defclass ExtendSubclass []
+  :extends ExtendBase
+  ExtendBase
+  (exampleMethod [this] :subclass))
+
+(deftest test-extend
+  (testing "defclass can extend a superclass"
+    (is (= :base (.exampleMethod (ExtendBase.))))
+    (is (= :subclass (.exampleMethod (ExtendSubclass.))))
+    (is (instance? ExtendBase (ExtendSubclass.)))))
+
+
+(defclass InitDefault []
+  :state datum
+  :constructors {[Object] []}
+  (-init [datum] [[] datum]))
+
+(defclass InitCustom []
+  :state datum
+  :constructors {[Object] []}
+  :init -init-datum
+  (-init-datum [datum] [[] datum]))
+
+(deftest test-init
+  (testing "defclass can use an initializer function"
+    (is (= :default (.datum (InitDefault. :default))) "with the default name")
+    (is (= :custom (.datum (InitDefault. :custom))) "with a custom name")))
+
+
+(defclass Fields [field-a field-b]
+  :state state
+  :constructors {[Object Object] []}
+  (-init [field-a field-b] [[] [field-a field-b]])
+  (fieldA [this] field-a)
+  (fieldB [this] field-b))
+
+(deftest test-init
+  (testing "Field values are locally accessible in methods"
+    (let [obj (Fields. :left :right)]
+      (is (= :left (.fieldA obj)))
+      (is (= :right (.fieldB obj))))))
+