litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-1562 Date dump

Browse source
This commit is contained in:
ryounes 2011-04-08 21:23:32 +00:00
parent 43ba41711b
commit 68385d6d84
2 changed files with 82 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
webapp/src/freemarker/ext/dump/BaseDumpDirective.java
View file

@ -123,7 +123,24 @@ public abstract class BaseDumpDirective implements TemplateDirectiveModel {
private Map<String, Object> getTemplateModelData(TemplateDateModel model) throws TemplateModelException {
Map<String, Object> map = new HashMap<String, Object>();
map.put("type", "Date");
map.put("dateType", model.getDateType());
int dateType = model.getDateType();
String type;
switch (dateType) {
case TemplateDateModel.DATE:
type = "Date";
break;
case TemplateDateModel.DATETIME:
type = "DateTime";
break;
case TemplateDateModel.TIME:
type = "Time";
break;
default:
type = "Unknown";
}
map.put("dateType", type);
map.put("value", model.getAsDate());
return map;
}

74
webapp/test/freemarker/ext/dump/DumpDirectiveTest.java
View file

@ -8,7 +8,10 @@ import static junit.framework.Assert.fail;
import java.io.IOException;
import java.io.StringReader;
import java.io.StringWriter;
import java.sql.Time;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -93,23 +96,74 @@ public class DumpDirectiveTest {
test(varName, dataModel, expected);
}
// RY Test different datetime types
@Test
public void dumpDate() {
public void dumpSimpleDate() {
String varName = "tabCount";
int value = 7;
String varName = "now";
Date now = new Date();
Map<String, Object> dataModel = new HashMap<String, Object>();
dataModel.put(varName, value);
dataModel.put(varName, now);
Map<String, Object> expected = new HashMap<String, Object>();
expected.put("name", varName);
expected.put("type", "Number");
expected.put("value", value);
expected.put("type", "Date");
expected.put("dateType", "Unknown");
expected.put("value", now);
test(varName, dataModel, expected);
}
@Test
public void dumpDateTime() {
String varName = "timestamp";
Timestamp ts = new Timestamp(1302297332043L);
Map<String, Object> dataModel = new HashMap<String, Object>();
dataModel.put(varName, ts);
Map<String, Object> expected = new HashMap<String, Object>();
expected.put("name", varName);
expected.put("type", "Date");
expected.put("dateType", "DateTime");
expected.put("value", ts);
test(varName, dataModel, expected);
}
@Test
public void dumpSqlDate() {
String varName = "date";
java.sql.Date date = new java.sql.Date(1302297332043L);
Map<String, Object> dataModel = new HashMap<String, Object>();
dataModel.put(varName, date);
Map<String, Object> expected = new HashMap<String, Object>();
expected.put("name", varName);
expected.put("type", "Date");
expected.put("dateType", "Date");
expected.put("value", date);
test(varName, dataModel, expected);
}
@Test
public void dumpTime() {
String varName = "time";
Time time = new Time(1302297332043L);
Map<String, Object> dataModel = new HashMap<String, Object>();
dataModel.put(varName, time);
Map<String, Object> expected = new HashMap<String, Object>();
expected.put("name", varName);
expected.put("type", "Date");
expected.put("dateType", "Time");
expected.put("value", time);
test(varName, dataModel, expected);
}
// RY test method and directive types with and without help methods
@Test
@ -209,7 +263,7 @@ public class DumpDirectiveTest {
}
@Test
public void dumpScalarList() {
public void dumpStringList() {
String varName = "fruit";
Map<String, Object> dataModel = new HashMap<String, Object>();
@ -235,7 +289,7 @@ public class DumpDirectiveTest {
}
@Test
public void dumpScalarArray() {
public void dumpStringArray() {
String varName = "fruit";
Map<String, Object> dataModel = new HashMap<String, Object>();
String[] list = { "apples", "bananas", "oranges" };