You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ke...@apache.org on 2011/04/10 22:01:25 UTC
svn commit: r1090882 - in /incubator/isis/trunk:
applib/src/main/java/org/apache/isis/applib/value/
applib/src/test/java/org/apache/isis/applib/value/
core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/time/
core/progmodel/src/tes...
Author: kevin
Date: Sun Apr 10 20:01:25 2011
New Revision: 1090882
URL: http://svn.apache.org/viewvc?rev=1090882&view=rev
Log:
Updated the tests.
A lot of work would be required to convert the ValueSemanticsProviders from java.util.Date to jodatime.DateTime
Modified:
incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/value/Time.java
incubator/isis/trunk/applib/src/test/java/org/apache/isis/applib/value/TimeTest.java
incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/time/TimeValueSemanticsProviderAbstract.java
incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/TimeValueSemanticsProviderTest.java
Modified: incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/value/Time.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/value/Time.java?rev=1090882&r1=1090881&r2=1090882&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/value/Time.java (original)
+++ incubator/isis/trunk/applib/src/main/java/org/apache/isis/applib/value/Time.java Sun Apr 10 20:01:25 2011
@@ -57,11 +57,11 @@ public class Time extends Magnitude<Time
*/
public Time() {
DateTime dateTime = Clock.getTimeAsDateTime();
- time = dateTime.withDate(1971, 1, 1);
+ time = dateTime.withDate(1970, 1, 1); // Epoch is 1970-01-01
}
private DateTime newDateTime(final int hourOfDay, final int minuteOfHour, final int secondsOfMinute) {
- return new DateTime(1971, 1, 1, hourOfDay, minuteOfHour, secondsOfMinute, 0, Defaults.getApplibTimeZone());
+ return new DateTime(1970, 1, 1, hourOfDay, minuteOfHour, secondsOfMinute, 0, Defaults.getApplibTimeZone());
}
/**
@@ -191,12 +191,6 @@ public class Time extends Magnitude<Time
return (time == null) ? "" : DateTimeFormat.shortTime().print(time);
}
- @Override
- public String toString() {
- // return String.format("%02d:%02d:%02d", getHour(), getMinute(), getSecond());
- return String.format("%02d:%02d", getHour(), getMinute());
- }
-
public boolean sameHourAs(final Time time) {
return getHour() == time.getHour();
}
@@ -249,4 +243,10 @@ public class Time extends Magnitude<Time
return time1;
}
+ @Override
+ public String toString() {
+ return String.format("%02d:%02d:%02d", getHour(), getMinute(), getSecond());
+ // return String.format("%02d:%02d", getHour(), getMinute());
+ }
+
}
Modified: incubator/isis/trunk/applib/src/test/java/org/apache/isis/applib/value/TimeTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/applib/src/test/java/org/apache/isis/applib/value/TimeTest.java?rev=1090882&r1=1090881&r2=1090882&view=diff
==============================================================================
--- incubator/isis/trunk/applib/src/test/java/org/apache/isis/applib/value/TimeTest.java (original)
+++ incubator/isis/trunk/applib/src/test/java/org/apache/isis/applib/value/TimeTest.java Sun Apr 10 20:01:25 2011
@@ -121,7 +121,7 @@ public class TimeTest {
@Test
public void testToString() {
- assertEquals("13:14", time.toString());
+ assertEquals("13:14:00", time.toString());
}
}
Modified: incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/time/TimeValueSemanticsProviderAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/time/TimeValueSemanticsProviderAbstract.java?rev=1090882&r1=1090881&r2=1090882&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/time/TimeValueSemanticsProviderAbstract.java (original)
+++ incubator/isis/trunk/core/progmodel/src/main/java/org/apache/isis/core/progmodel/facets/value/time/TimeValueSemanticsProviderAbstract.java Sun Apr 10 20:01:25 2011
@@ -17,7 +17,6 @@
* under the License.
*/
-
package org.apache.isis.core.progmodel.facets.value.time;
import java.text.DateFormat;
@@ -30,7 +29,6 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.progmodel.facets.object.value.ValueSemanticsProviderContext;
import org.apache.isis.core.progmodel.facets.value.ValueSemanticsProviderAbstractTemporal;
-
public abstract class TimeValueSemanticsProviderAbstract<T> extends ValueSemanticsProviderAbstractTemporal<T> {
private static final Object DEFAULT_VALUE = null; // no default
@@ -50,13 +48,10 @@ public abstract class TimeValueSemantics
}
@SuppressWarnings("unchecked")
- public TimeValueSemanticsProviderAbstract(
- final FacetHolder holder,
- final Class<T> adaptedClass,
- final IsisConfiguration configuration,
- final ValueSemanticsProviderContext context) {
- super("time", holder, adaptedClass, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, (T) DEFAULT_VALUE, configuration,
- context);
+ public TimeValueSemanticsProviderAbstract(final FacetHolder holder, final Class<T> adaptedClass,
+ final IsisConfiguration configuration, final ValueSemanticsProviderContext context) {
+ super("time", holder, adaptedClass, TYPICAL_LENGTH, IMMUTABLE, EQUAL_BY_CONTENT, (T) DEFAULT_VALUE,
+ configuration, context);
final String formatRequired = configuration.getString(ConfigurationConstants.ROOT + "value.format.time");
if (formatRequired == null) {
@@ -81,7 +76,7 @@ public abstract class TimeValueSemantics
@Override
protected void clearFields(final Calendar cal) {
- cal.set(Calendar.YEAR, 1971);
+ cal.set(Calendar.YEAR, 1970);
cal.set(Calendar.MONTH, 0);
cal.set(Calendar.DAY_OF_MONTH, 1);
}
Modified: incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/TimeValueSemanticsProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/TimeValueSemanticsProviderTest.java?rev=1090882&r1=1090881&r2=1090882&view=diff
==============================================================================
--- incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/TimeValueSemanticsProviderTest.java (original)
+++ incubator/isis/trunk/core/progmodel/src/test/java/org/apache/isis/core/progmodel/facets/value/TimeValueSemanticsProviderTest.java Sun Apr 10 20:01:25 2011
@@ -25,6 +25,7 @@ import static org.junit.Assert.fail;
import org.jmock.Expectations;
import org.jmock.integration.junit4.JMock;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -63,45 +64,55 @@ public class TimeValueSemanticsProviderT
}
@Test
+ public void testParseEntryOfHoursMinutesText() throws Exception {
+ final Object parsed = adapter.parseTextEntry(null, "8:30");
+ assertEquals(new Time(8, 30), parsed);
+ }
+
+ @Test
+ @Ignore
+ public void testParseEntryOfHoursMinutesSecondsText() throws Exception {
+ final Object parsed = adapter.parseTextEntry(null, "8:30:45"); // I can't get the text parser to parse HH:mm:ss
+ // before HH:mm!!
+ Time expected = new Time(8, 30, 45);
+ assertEquals(expected, parsed);
+ }
+
+ @Test
public void testParseEntryOfHoursAfterTime() throws Exception {
- // TimeValueSemanticsProvider adapter = new TimeValueSemanticsProvider(new Time(15, 10));
final Object parsed = adapter.parseTextEntry(time, "+5H");
assertEquals(new Time(13, 13), parsed);
}
@Test
public void testParseEntryOfHoursAfterNow() throws Exception {
- // TimeValueSemanticsProvider adapter = new TimeValueSemanticsProvider();
final Object parsed = adapter.parseTextEntry(null, "+5H");
assertEquals(new Time(2, 30, 25), parsed);
}
@Test
public void testParseEntryOfHoursBeforeTime() throws Exception {
- // TimeValueSemanticsProvider adapter = new TimeValueSemanticsProvider(new Time(12, 4));
final Object parsed = adapter.parseTextEntry(time, "-7H");
assertEquals(new Time(1, 13), parsed);
}
@Test
public void testParseEntryOfHoursBeforeToNow() throws Exception {
- // TimeValueSemanticsProvider adapter = new TimeValueSemanticsProvider();
final Object parsed = adapter.parseTextEntry(null, "-5H");
assertEquals(new Time(16, 30, 25), parsed);
}
@Test
public void testParseEntryOfKeywordNow() throws Exception {
- // TimeValueSemanticsProvider adapter = new TimeValueSemanticsProvider();
final Object parsed = adapter.parseTextEntry(time, "now");
assertEquals(new Time(), parsed);
}
@Test
public void testRestoreTime() throws Exception {
- // TimeValueSemanticsProvider adapter = new TimeValueSemanticsProvider();
+ Time expected = new Time(21, 30);
final Object parsed = adapter.fromEncodedString("213000000");
- assertEquals(new Time(21, 30), parsed);
+ assertEquals(expected, parsed);
}
@Test