Skip to content

Commit

Permalink
Added failing tests for arrays and primitives
Browse files Browse the repository at this point in the history
  • Loading branch information
bendlas committed Sep 30, 2011
1 parent c574ae7 commit 0a754fc
Show file tree
Hide file tree
Showing 2 changed files with 156 additions and 1 deletion.
24 changes: 23 additions & 1 deletion src/test/clojure/clojure/java/test_data.clj
Expand Up @@ -10,7 +10,7 @@
(:use clojure.java.data)
(:use [clojure.tools.logging :only (log* info)])
(:use clojure.test)
(:import (clojure.java.data.test Person Address State)))
(:import (clojure.java.data.test Person Address State Primitive)))

(deftest clojure-to-java
(let [person (to-java Person {:name "Bob"
Expand Down Expand Up @@ -58,3 +58,25 @@
(is (= 30 (:age person)))
(is (= "123 Main St" (:line1 (:address person))))
(is (= "TX" (:state (:address person))))))

(deftest primitives
(let [datum {:boolMember true
:boolArray [true false]
:charMember \H
:charArray (map identity "Hello World")
:byteMember 127
:byteArray [1 2 3]
:shortMember 15000
:shortArray [13000 14000 15000]
:intMember 18000
:intArray [1 2 3]
:longMember 60000000
:longArray [1 2 3]
:floatMember 1.5
:floatArray [1.5 2.5 3.5]
:doubleMember 1.5
:doubleArray [1.5 2.0 2.5]
:nestedIntArray [[1 2] [3] [4 5 6] []]
:stringArray ["Argument" "Vector"]}]
(is (= datum
(from-java (to-java Primitive datum))))))
133 changes: 133 additions & 0 deletions src/test/java/clojure/java/data/test/Primitive.java
@@ -0,0 +1,133 @@
package clojure.java.data.test;

public class Primitive {
private boolean boolMember;
private boolean[] boolArray;
private char charMember;
private char[] charArray;

private byte byteMember;
private byte[] byteArray;
private short shortMember;
private short[] shortArray;
private int intMember;
private int[] intArray;
private long longMember;
private long[] longArray;
private float floatMember;
private float[] floatArray;
private double doubleMember;
private double[] doubleArray;

private int[][] nestedIntArray;
private String[] stringArray;

public boolean isBoolMember() {
return boolMember;
}
public void setBoolMember(boolean boolMember) {
this.boolMember = boolMember;
}
public boolean[] getBoolArray() {
return boolArray;
}
public void setBoolArray(boolean[] boolArray) {
this.boolArray = boolArray;
}
public char getCharMember() {
return charMember;
}
public void setCharMember(char charMember) {
this.charMember = charMember;
}
public char[] getCharArray() {
return charArray;
}
public void setCharArray(char[] charArray) {
this.charArray = charArray;
}
public byte getByteMember() {
return byteMember;
}
public void setByteMember(byte byteMember) {
this.byteMember = byteMember;
}
public byte[] getByteArray() {
return byteArray;
}
public void setByteArray(byte[] byteArray) {
this.byteArray = byteArray;
}
public short getShortMember() {
return shortMember;
}
public void setShortMember(short shortMember) {
this.shortMember = shortMember;
}
public short[] getShortArray() {
return shortArray;
}
public void setShortArray(short[] shortArray) {
this.shortArray = shortArray;
}
public int getIntMember() {
return intMember;
}
public void setIntMember(int intMember) {
this.intMember = intMember;
}
public int[] getIntArray() {
return intArray;
}
public void setIntArray(int[] intArray) {
this.intArray = intArray;
}
public long getLongMember() {
return longMember;
}
public void setLongMember(long longMember) {
this.longMember = longMember;
}
public long[] getLongArray() {
return longArray;
}
public void setLongArray(long[] longArray) {
this.longArray = longArray;
}
public float getFloatMember() {
return floatMember;
}
public void setFloatMember(float floatMember) {
this.floatMember = floatMember;
}
public float[] getFloatArray() {
return floatArray;
}
public void setFloatArray(float[] floatArray) {
this.floatArray = floatArray;
}
public double getDoubleMember() {
return doubleMember;
}
public void setDoubleMember(double doubleMember) {
this.doubleMember = doubleMember;
}
public double[] getDoubleArray() {
return doubleArray;
}
public void setDoubleArray(double[] doubleArray) {
this.doubleArray = doubleArray;
}
public int[][] getNestedIntArray() {
return nestedIntArray;
}
public void setNestedIntArray(int[][] nestedIntArray) {
this.nestedIntArray = nestedIntArray;
}
public String[] getStringArray() {
return stringArray;
}
public void setStringArray(String[] stringArray) {
this.stringArray = stringArray;
}
}

0 comments on commit 0a754fc

Please sign in to comment.