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

Changes needed for the move to Clojure 1.3 #2

Merged
merged 1 commit into from
Mar 27, 2012
Merged

Changes needed for the move to Clojure 1.3 #2

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions sherpa-clojure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<dependency>
<groupId>org.clojure</groupId>
<artifactId>clojure</artifactId>
<version>1.2.1</version>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
Expand All @@ -85,7 +85,7 @@
<dependency>
<groupId>swank-clojure</groupId>
<artifactId>swank-clojure</artifactId>
<version>1.2.1</version>
<version>1.4.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
10 changes: 5 additions & 5 deletions sherpa-clojure/src/test/clojure/sherpa/dummy_server.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
(log/info "Server sending empty response for 0 rows.")
{:sherpa-type "QueryResponse"
:queryId queryId
:startRow 1
:startRow (Integer. 1)
:data []
:more false})

Expand All @@ -66,8 +66,8 @@
"Implement a dummy Sherpa server that returns a fixed result set of size rows."
[rows]
(reify SherpaListener
(query [server request] (query-call request))
(data [server request] (data-call request rows))
(cancel [server request] {:sherpa-type :CloseResponse :queryId (:queryId request)})
(close [server request] {:sherpa-type :CloseResponse :queryId (:queryId request)})))
(query [server request] (query-call request))
(data [server request] (data-call request rows))
(cancel [server request] {:sherpa-type :CloseResponse :queryId (:queryId request)})
(close [server request] {:sherpa-type :CloseResponse :queryId (:queryId request)})))

6 changes: 5 additions & 1 deletion sherpa-clojure/src/test/clojure/sherpa/test_avro_utils.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
(ns sherpa.test-avro-utils
(:require [clojure.string :as str])
(:use [clojure.test]
[sherpa.avro-utils])
(:import [java.util Map Collection]
Expand Down Expand Up @@ -53,7 +54,10 @@
(testing "Convert Avro map"
(let [val (to-avro {:a "foo" :b 1 :c {:sherpa-type :e1 :symbol :b}} example-protocol)]
(is (instance? Map val))
(is (= "{\"c\" #<EnumSymbol b>, \"b\" 1, \"a\" \"foo\"}" (.toString val))))))
(is (= {"c" :enum-b
"b" 1
"a" "foo"}
(read-string (str/replace (.toString val) "#<EnumSymbol b>" ":enum-b")))))))

(deftest test-to-avro-sequential
(testing "Convert to Avro list"
Expand Down