Skip to content

Commit b10ba53

Browse files
committed
Added Test for different Types
1 parent 7de2cb2 commit b10ba53

File tree

3 files changed

+93
-11
lines changed

3 files changed

+93
-11
lines changed

src/main/java/org/javawebstack/orm/Model.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.javawebstack.orm;
22

33
import org.javawebstack.injector.Injector;
4-
import org.javawebstack.orm.exception.ORMQueryException;
54
import org.javawebstack.orm.query.Query;
65

76
import java.lang.reflect.Field;
@@ -53,10 +52,11 @@ void updateOriginal() {
5352
public Map<String, Object> getFieldValues() {
5453
TableInfo info = Repo.get(getClass()).getInfo();
5554
Map<String, Object> values = new HashMap<>();
56-
for(String field : info.getFields()) {
55+
for (String field : info.getFields()) {
5756
try {
5857
values.put(field, info.getField(field).get(this));
59-
} catch (IllegalAccessException ignored) { }
58+
} catch (IllegalAccessException ignored) {
59+
}
6060
}
6161
return values;
6262
}
@@ -66,15 +66,15 @@ public Map<String, Object> getOriginalValues() {
6666
}
6767

6868
public <T> T getOriginalValue(String field) {
69-
if(internalOriginalValues.get(field) == null)
69+
if (internalOriginalValues.get(field) == null)
7070
return null;
7171
return (T) internalOriginalValues.get(field);
7272
}
7373

7474
public boolean isDirty(String... fields) {
7575
List<String> dirty = getDirtyFields();
76-
for(String f : fields) {
77-
if(dirty.contains(f))
76+
for (String f : fields) {
77+
if (dirty.contains(f))
7878
return true;
7979
}
8080
return false;
@@ -84,12 +84,12 @@ public List<String> getDirtyFields() {
8484
List<String> dirty = new ArrayList<>();
8585
Map<String, Object> original = getOriginalValues();
8686
Map<String, Object> current = getFieldValues();
87-
for(String key : current.keySet()) {
87+
for (String key : current.keySet()) {
8888
Object o = original.get(key);
8989
Object c = current.get(key);
90-
if(o == null && c == null)
90+
if (o == null && c == null)
9191
continue;
92-
if(o == null || !o.equals(c))
92+
if (o == null || !o.equals(c))
9393
dirty.add(key);
9494
}
9595
return dirty;

src/main/java/org/javawebstack/orm/wrapper/MySQL.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import org.javawebstack.orm.exception.ORMQueryException;
44

5-
import java.io.IOException;
65
import java.sql.Connection;
76
import java.sql.DriverManager;
87
import java.sql.SQLException;
@@ -37,7 +36,7 @@ public Connection getConnection() {
3736
if (c != null) {
3837
try {
3938
c.close();
40-
} catch (SQLException throwables) {
39+
} catch (SQLException ignored) {
4140
}
4241
}
4342
c = null;
Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
package org.javawebstack.orm.test;
2+
3+
import org.javawebstack.orm.Model;
4+
import org.javawebstack.orm.ORM;
5+
import org.javawebstack.orm.ORMConfig;
6+
import org.javawebstack.orm.Repo;
7+
import org.javawebstack.orm.annotation.Column;
8+
import org.javawebstack.orm.exception.ORMConfigurationException;
9+
import org.junit.jupiter.api.Test;
10+
11+
import static org.junit.jupiter.api.Assertions.*;
12+
13+
public class TypesTest extends ExampleTest {
14+
15+
@Test
16+
public void testFields() throws ORMConfigurationException {
17+
ORMConfig config = new ORMConfig()
18+
.setDefaultSize(255);
19+
ORM.register(ExampleModel.class, sql(), config);
20+
ORM.autoMigrate(true);
21+
22+
ExampleModel model = new ExampleModel();
23+
model.exampleString = "Hello ;)";
24+
model.exampleEnum = ExampleModel.Type.USER;
25+
model.exampleFloat = 1.33769F;
26+
model.exampleDouble = 123456789.1234567890D;
27+
28+
model.exampleLong = 999999999999999999L;
29+
model.exampleBoolean = true;
30+
model.save();
31+
32+
int id = model.id;
33+
34+
model = Repo.get(ExampleModel.class).get(id);
35+
36+
assertEquals(model.id, id);
37+
assertNull(model.exampleNull);
38+
assertTrue(model.exampleBoolean);
39+
assertEquals(model.exampleEnum, ExampleModel.Type.USER);
40+
assertEquals(model.exampleString, "Hello ;)");
41+
assertEquals(model.exampleFloat, 1.33769f);
42+
assertEquals(model.exampleDouble, 123456789.1234567890D);
43+
assertEquals(model.exampleLong, 999999999999999999L);
44+
45+
model.exampleNull = 132847193428d;
46+
model.save();
47+
model = Repo.get(ExampleModel.class).get(id);
48+
assertEquals(model.exampleDouble, 132847193428d);
49+
}
50+
51+
public static class ExampleModel extends Model {
52+
53+
@Column
54+
public int id;
55+
56+
@Column
57+
public String exampleString;
58+
59+
@Column
60+
public float exampleFloat;
61+
62+
@Column
63+
public double exampleDouble;
64+
65+
@Column
66+
public long exampleLong;
67+
68+
@Column
69+
public boolean exampleBoolean;
70+
71+
@Column
72+
public Type exampleEnum;
73+
74+
@Column
75+
public Double exampleNull;
76+
77+
public enum Type {
78+
ADMIN, USER, GUEST
79+
}
80+
81+
}
82+
83+
}

0 commit comments

Comments
 (0)