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

Lighthouse#2273: Stop Fixtures attempting to set static (Map) fields #1281

Merged
merged 9 commits into from
Dec 25, 2018
Merged

Lighthouse#2273: Stop Fixtures attempting to set static (Map) fields #1281

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6732a3a
Lighthouse#2273: Stop Fixtures attempting to set static Map fields
tazmaniax Nov 15, 2018
05206b2
lighthouse#2273: Fix code formatting
tazmaniax Nov 15, 2018
2e9e66a
Add initial attempt at unit test
tazmaniax Nov 20, 2018
ea76588
lighthouse#2273: Added unit test
tazmaniax Nov 22, 2018
db0cf65
lighthouse#2273: Renamed java src file to ensure it's copied to classes
tazmaniax Nov 22, 2018
8f6be66
lighthouse#2273: Fix source formatting
tazmaniax Nov 22, 2018
818a3d4
lighthouse#2273: Fixed source file reference
tazmaniax Nov 22, 2018
0e40208
lighthouse#2273: Moved Model test class to models package under test-src
tazmaniax Nov 22, 2018
1cb225d
lighthouse#2273: Added asserts that the model was loaded correctly
tazmaniax Nov 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions framework/src/play/test/Fixtures.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import java.io.InputStream;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
Expand Down Expand Up @@ -265,11 +266,13 @@ public static void loadModels(boolean loadAsTemplate, String name) {

Model model = (Model) Binder.bind(rootParamNode, "object", cType, cType, annotations);
for (Field f : model.getClass().getFields()) {
if (f.getType().isAssignableFrom(Map.class)) {
f.set(model, objects.get(key).get(f.getName()));
}
if (f.getType().equals(byte[].class)) {
f.set(model, objects.get(key).get(f.getName()));
if (!Modifier.isStatic(f.getModifiers())) {
if (f.getType().isAssignableFrom(Map.class)) {
f.set(model, objects.get(key).get(f.getName()));
}
if (f.getType().equals(byte[].class)) {
f.set(model, objects.get(key).get(f.getName()));
}
}
}
model._save();
Expand Down