Kaydet (Commit) 5b0ac814 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Fix uses of Java == on css.uno.Date/Time

...introduced with 8ee69b0b "fdo#67235 adapt
form control code to time nanosecond API change, step 3."

Change-Id: Ifdd449715ce0be602b7bc2d304d503385195eb66
üst c2c664a7
...@@ -68,8 +68,8 @@ public class _XDateField extends MultiMethodTest { ...@@ -68,8 +68,8 @@ public class _XDateField extends MultiMethodTest {
boolean result = true ; boolean result = true ;
oObj.setDate(new Date((short)1, (short)1, (short)1900)) ; oObj.setDate(new Date((short)1, (short)1, (short)1900)) ;
Date date = oObj.getDate();
result = oObj.getDate() == new Date((short)1, (short)1, (short)1900); ; result = date.Day == 1 && date.Month == 1 && date.Year == 1900;
if (! result ) { if (! result ) {
System.out.println("getDate: " + oObj.getDate() + " , expected 1900-01-01"); System.out.println("getDate: " + oObj.getDate() + " , expected 1900-01-01");
...@@ -102,8 +102,8 @@ public class _XDateField extends MultiMethodTest { ...@@ -102,8 +102,8 @@ public class _XDateField extends MultiMethodTest {
boolean result = true ; boolean result = true ;
oObj.setMin(new Date((short)5, (short)2, (short)1963)); oObj.setMin(new Date((short)5, (short)2, (short)1963));
Date date = oObj.getMin();
result = oObj.getMin() == new Date((short)5, (short)2, (short)1963); result = date.Day == 5 && date.Month == 2 && date.Year == 1963;
tRes.tested("setMin()", result) ; tRes.tested("setMin()", result) ;
} }
...@@ -132,8 +132,8 @@ public class _XDateField extends MultiMethodTest { ...@@ -132,8 +132,8 @@ public class _XDateField extends MultiMethodTest {
boolean result = true ; boolean result = true ;
oObj.setMax(new Date((short)18, (short)9, (short)2117)) ; oObj.setMax(new Date((short)18, (short)9, (short)2117)) ;
Date date = oObj.getMax();
result = oObj.getMax() == new Date((short)18, (short)9, (short)2117) ; result = date.Day == 18 && date.Month == 9 && date.Year == 2117;
tRes.tested("setMax()", result) ; tRes.tested("setMax()", result) ;
} }
...@@ -162,8 +162,8 @@ public class _XDateField extends MultiMethodTest { ...@@ -162,8 +162,8 @@ public class _XDateField extends MultiMethodTest {
boolean result = true ; boolean result = true ;
oObj.setFirst(new Date((short)7, (short)12, (short)1972)) ; oObj.setFirst(new Date((short)7, (short)12, (short)1972)) ;
Date date = oObj.getFirst();
result = oObj.getFirst() == new Date((short)7, (short)12, (short)1972) ; result = date.Day == 7 && date.Month == 12 && date.Year == 1972;
if (!result) { if (!result) {
log.println("Set to " + 5118 + " but returned " + oObj.getFirst()) ; log.println("Set to " + 5118 + " but returned " + oObj.getFirst()) ;
...@@ -198,8 +198,8 @@ public class _XDateField extends MultiMethodTest { ...@@ -198,8 +198,8 @@ public class _XDateField extends MultiMethodTest {
boolean result = true ; boolean result = true ;
oObj.setLast(new Date((short)23, (short)8, (short)2053)) ; oObj.setLast(new Date((short)23, (short)8, (short)2053)) ;
Date date = oObj.getLast();
result = oObj.getLast() == new Date((short)23, (short)8, (short)2053) ; result = date.Day == 23 && date.Month == 8 && date.Year == 2053;
if (!result) { if (!result) {
log.println("Set to 2053-08-23 but returned " + oObj.getLast()) ; log.println("Set to 2053-08-23 but returned " + oObj.getLast()) ;
......
...@@ -64,8 +64,8 @@ public class _XTimeField extends MultiMethodTest { ...@@ -64,8 +64,8 @@ public class _XTimeField extends MultiMethodTest {
boolean result = true ; boolean result = true ;
oObj.setTime(new Time(0, (short)0, (short)15, (short)11, false)); oObj.setTime(new Time(0, (short)0, (short)15, (short)11, false));
Time time = oObj.getTime();
result = oObj.getTime() == new Time(0, (short)0, (short)15, (short)11, false) ; result = time.NanoSeconds == 0 && time.Seconds == 0 && time.Minutes == 15 && time.Hours == 11 && !time.IsUTC;
if (! result ) { if (! result ) {
System.out.println("Getting " + oObj.getTime() + " expected 11:15"); System.out.println("Getting " + oObj.getTime() + " expected 11:15");
...@@ -98,8 +98,8 @@ public class _XTimeField extends MultiMethodTest { ...@@ -98,8 +98,8 @@ public class _XTimeField extends MultiMethodTest {
boolean result = true ; boolean result = true ;
oObj.setMin(new Time(0, (short)14, (short)18, (short)6, false)); oObj.setMin(new Time(0, (short)14, (short)18, (short)6, false));
Time time = oObj.getMin();
result = oObj.getMin() == new Time(0, (short)14, (short)18, (short)6, false) ; result = time.NanoSeconds == 0 && time.Seconds == 14 && time.Minutes == 18 && time.Hours == 6 && !time.IsUTC;
tRes.tested("setMin()", result) ; tRes.tested("setMin()", result) ;
} }
...@@ -128,8 +128,8 @@ public class _XTimeField extends MultiMethodTest { ...@@ -128,8 +128,8 @@ public class _XTimeField extends MultiMethodTest {
boolean result = true ; boolean result = true ;
oObj.setMax(new Time(855447, (short)31, (short)23, (short)22, false)) ; oObj.setMax(new Time(855447, (short)31, (short)23, (short)22, false)) ;
Time time = oObj.getMax();
result = oObj.getMax() == new Time(855447, (short)31, (short)23, (short)22, false) ; result = time.NanoSeconds == 855447 && time.Seconds == 31 && time.Minutes == 23 && time.Hours == 22 && !time.IsUTC;
tRes.tested("setMax()", result) ; tRes.tested("setMax()", result) ;
} }
...@@ -158,8 +158,8 @@ public class _XTimeField extends MultiMethodTest { ...@@ -158,8 +158,8 @@ public class _XTimeField extends MultiMethodTest {
boolean result = true ; boolean result = true ;
oObj.setFirst(new Time(0, (short)0, (short)30, (short)7, false)) ; oObj.setFirst(new Time(0, (short)0, (short)30, (short)7, false)) ;
Time time = oObj.getFirst();
result = oObj.getFirst() == new Time(0, (short)0, (short)30, (short)7, false); result = time.NanoSeconds == 0 && time.Seconds == 0 && time.Minutes == 30 && time.Hours == 7 && !time.IsUTC;
if (!result) { if (!result) {
log.println("Set to 07:30 but returned " + oObj.getFirst()) ; log.println("Set to 07:30 but returned " + oObj.getFirst()) ;
...@@ -194,8 +194,8 @@ public class _XTimeField extends MultiMethodTest { ...@@ -194,8 +194,8 @@ public class _XTimeField extends MultiMethodTest {
boolean result = true ; boolean result = true ;
oObj.setLast(new Time(500000, (short)31, (short)30, (short)18, false)) ; oObj.setLast(new Time(500000, (short)31, (short)30, (short)18, false)) ;
Time time = oObj.getLast();
result = oObj.getLast() == new Time(500000, (short)31, (short)30, (short)18, false); result = time.NanoSeconds == 500000 && time.Seconds == 31 && time.Minutes == 30 && time.Hours == 18 && !time.IsUTC;
if (!result) { if (!result) {
log.println("Set to 18:30:31.5 but returned " + oObj.getLast()) ; log.println("Set to 18:30:31.5 but returned " + oObj.getLast()) ;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment