Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Christian Willms
hfc
Commits
f84f9243
Commit
f84f9243
authored
Jul 19, 2018
by
Bernd Kiefer
Browse files
Fix XsdDateTime Date constructor and add one for long
parent
1d6dd5b1
Changes
2
Show whitespace changes
Inline
Side-by-side
src/main/java/de/dfki/lt/hfc/types/XsdDateTime.java
View file @
f84f9243
...
...
@@ -54,14 +54,18 @@ public final class XsdDateTime extends XsdAnySimpleType {
public
XsdDateTime
(
Date
d
)
{
this
.
year
=
d
.
getYear
();
this
.
month
=
d
.
getMonth
();
this
.
day
=
d
.
getDa
y
();
this
.
year
=
d
.
getYear
()
+
1900
;
this
.
month
=
d
.
getMonth
()
+
1
;
this
.
day
=
d
.
getDa
te
();
this
.
hour
=
d
.
getHours
();
this
.
minute
=
d
.
getMinutes
();
this
.
second
=
d
.
getSeconds
();
}
public
XsdDateTime
(
long
msSinceEpoch
)
{
this
(
new
Date
(
msSinceEpoch
));
}
/**
*
*/
...
...
src/test/java/de/dfki/lt/hfc/XsdSimpleTypesTest.java
View file @
f84f9243
...
...
@@ -4,6 +4,9 @@ import static org.junit.Assert.*;
import
java.net.URI
;
import
java.net.URISyntaxException
;
import
java.util.Calendar
;
import
java.util.Date
;
import
java.util.GregorianCalendar
;
import
org.junit.Test
;
...
...
@@ -95,6 +98,24 @@ public class XsdSimpleTypesTest {
assertEquals
(
"\"-2009-01-12T01:00:03.456\"^^<xsd:dateTime>"
,
xt
.
toString
(
true
));
assertEquals
(
"-2009-01-12T01:00:03.456"
,
xt
.
toName
());
assertEquals
(
"\"-2009-01-12T01:00:03.456\"^^<http://www.w3.org/2001/XMLSchema#dateTime>"
,
xt
.
toString
(
false
));
// Month starts at zero, day at one!
Date
d
=
new
Date
(
2001
-
1900
,
8
,
11
,
11
,
30
,
00
);
assertEquals
(
"\"2001-09-11T11:30:00.0\"^^<xsd:dateTime>"
,
new
XsdDateTime
(
d
).
toString
(
true
));
assertEquals
(
"\"2001-09-11T11:30:00.0\"^^<xsd:dateTime>"
,
new
XsdDateTime
(
d
.
getTime
()).
toString
(
true
));
Calendar
rightNow
=
new
GregorianCalendar
();
rightNow
.
set
(
Calendar
.
YEAR
,
2001
);
rightNow
.
set
(
Calendar
.
MONTH
,
Calendar
.
SEPTEMBER
);
rightNow
.
set
(
Calendar
.
DAY_OF_MONTH
,
11
);
rightNow
.
set
(
Calendar
.
HOUR_OF_DAY
,
11
);
rightNow
.
set
(
Calendar
.
MINUTE
,
30
);
rightNow
.
set
(
Calendar
.
SECOND
,
00
);
assertEquals
(
"\"2001-09-11T11:30:00.0\"^^<xsd:dateTime>"
,
new
XsdDateTime
(
rightNow
.
getTimeInMillis
()).
toString
(
true
));
}
@Test
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment