Skip to content

Commit

Permalink
Merge pull request #32 from xinzhao-actuate/master
Browse files Browse the repository at this point in the history 
Fix for Bug 447747 - Junit test fails in org.eclipse.birt.data.engine
  • Loading branch information
@greatyan
greatyan committed Nov 14, 2014
2 parents 5f33261 + 71ab5d8 commit 0f15309
Show file tree
Hide file tree
Showing 33 changed files with 1,945 additions and 1,636 deletions.
16 changes: 8 additions & 8 deletions ....birt.data.tests/test/org/eclipse/birt/data/engine/binding/golden/FeaturesTest.test16.txt
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
*****A new Report Start!*****
S:0 E:3 0 0 CHINA Beijing 2004-01-01 00:00:00.0 7000 Date:Thu Jan 01 2004 08:00:00 GMT+0800 (GMT)
S:3 E:2 1 1 CHINA Beijing 2004-06-05 00:00:00.0 400 Date:Sat Jun 05 2004 08:00:00 GMT+0800 (GMT)
S:2 E:3 2 2 CHINA Shanghai 2004-06-01 00:00:00.0 100 Date:Tue Jun 01 2004 08:00:00 GMT+0800 (GMT)
S:3 E:1 3 3 CHINA Shanghai 2004-01-01 00:00:00.0 100 Date:Thu Jan 01 2004 08:00:00 GMT+0800 (GMT)
S:1 E:3 4 4 US Chicago 2004-03-02 00:00:00.0 700 Date:Tue Mar 02 2004 08:00:00 GMT+0800 (GMT)
S:3 E:2 5 5 US Chicago 2004-05-05 00:00:00.0 400 Date:Wed May 05 2004 08:00:00 GMT+0800 (GMT)
S:2 E:3 6 6 US New York 2004-05-01 00:00:00.0 100 Date:Sat May 01 2004 08:00:00 GMT+0800 (GMT)
S:3 E:0 7 7 US New York 2004-06-01 00:00:00.0 100 Date:Tue Jun 01 2004 08:00:00 GMT+0800 (GMT)
S:0 E:3 0 0 CHINA Beijing 2004-01-01 00:00:00.0 7000 Date:Wed Dec 31 2003 16:00:00 GMT-0800 (GMT)
S:3 E:2 1 1 CHINA Beijing 2004-06-05 00:00:00.0 400 Date:Fri Jun 04 2004 17:00:00 GMT-0700 (GMT)
S:2 E:3 2 2 CHINA Shanghai 2004-06-01 00:00:00.0 100 Date:Mon May 31 2004 17:00:00 GMT-0700 (GMT)
S:3 E:1 3 3 CHINA Shanghai 2004-01-01 00:00:00.0 100 Date:Wed Dec 31 2003 16:00:00 GMT-0800 (GMT)
S:1 E:3 4 4 US Chicago 2004-03-02 00:00:00.0 700 Date:Mon Mar 01 2004 16:00:00 GMT-0800 (GMT)
S:3 E:2 5 5 US Chicago 2004-05-05 00:00:00.0 400 Date:Tue May 04 2004 17:00:00 GMT-0700 (GMT)
S:2 E:3 6 6 US New York 2004-05-01 00:00:00.0 100 Date:Fri Apr 30 2004 17:00:00 GMT-0700 (GMT)
S:3 E:0 7 7 US New York 2004-06-01 00:00:00.0 100 Date:Mon May 31 2004 17:00:00 GMT-0700 (GMT)

16 changes: 8 additions & 8 deletions ...ests/test/org/eclipse/birt/data/engine/executor/cache/golden/CacheFeaturesTest.test16.txt
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
*****A new Report Start!*****
S:0 E:3 0 0 CHINA Beijing 2004-01-01 00:00:00.0 7000 Date:Thu Jan 01 2004 08:00:00 GMT+0800 (GMT)
S:3 E:2 1 1 CHINA Beijing 2004-06-05 00:00:00.0 400 Date:Sat Jun 05 2004 08:00:00 GMT+0800 (GMT)
S:2 E:3 2 2 CHINA Shanghai 2004-06-01 00:00:00.0 100 Date:Tue Jun 01 2004 08:00:00 GMT+0800 (GMT)
S:3 E:1 3 3 CHINA Shanghai 2004-01-01 00:00:00.0 100 Date:Thu Jan 01 2004 08:00:00 GMT+0800 (GMT)
S:1 E:3 4 4 US Chicago 2004-03-02 00:00:00.0 700 Date:Tue Mar 02 2004 08:00:00 GMT+0800 (GMT)
S:3 E:2 5 5 US Chicago 2004-05-05 00:00:00.0 400 Date:Wed May 05 2004 08:00:00 GMT+0800 (GMT)
S:2 E:3 6 6 US New York 2004-05-01 00:00:00.0 100 Date:Sat May 01 2004 08:00:00 GMT+0800 (GMT)
S:3 E:0 7 7 US New York 2004-06-01 00:00:00.0 100 Date:Tue Jun 01 2004 08:00:00 GMT+0800 (GMT)
S:0 E:3 0 0 CHINA Beijing 2004-01-01 00:00:00.0 7000 Date:Wed Dec 31 2003 16:00:00 GMT-0800 (GMT)
S:3 E:2 1 1 CHINA Beijing 2004-06-05 00:00:00.0 400 Date:Fri Jun 04 2004 17:00:00 GMT-0700 (GMT)
S:2 E:3 2 2 CHINA Shanghai 2004-06-01 00:00:00.0 100 Date:Mon May 31 2004 17:00:00 GMT-0700 (GMT)
S:3 E:1 3 3 CHINA Shanghai 2004-01-01 00:00:00.0 100 Date:Wed Dec 31 2003 16:00:00 GMT-0800 (GMT)
S:1 E:3 4 4 US Chicago 2004-03-02 00:00:00.0 700 Date:Mon Mar 01 2004 16:00:00 GMT-0800 (GMT)
S:3 E:2 5 5 US Chicago 2004-05-05 00:00:00.0 400 Date:Tue May 04 2004 17:00:00 GMT-0700 (GMT)
S:2 E:3 6 6 US New York 2004-05-01 00:00:00.0 100 Date:Fri Apr 30 2004 17:00:00 GMT-0700 (GMT)
S:3 E:0 7 7 US New York 2004-06-01 00:00:00.0 100 Date:Mon May 31 2004 17:00:00 GMT-0700 (GMT)

2 changes: 1 addition & 1 deletion ...se/birt/data/engine/olap/data/impl/aggregation/function/PreviousNPeriodsFunctionTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public void testFunctions6( ) throws IOException
public void testFunctions7( ) throws IOException
{
int[] values = new int[]{
2002, 8, 3
2002, 8, 4
};
String[] levels = new String[]{
TimeMember.TIME_LEVEL_TYPE_YEAR,
Expand Down
32 changes: 29 additions & 3 deletions ...s/test/org/eclipse/birt/data/engine/olap/data/impl/aggregation/function/TrailingTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ public void testTrailing17( ) throws IOException
public void testTrailing18( ) throws IOException
{
int[] values = new int[]{
2011, 1, 0, 52
2011, 1, 1, 1
};
String[] types = new String[]{
TimeMember.TIME_LEVEL_TYPE_YEAR,
Expand Down Expand Up @@ -418,7 +418,7 @@ public void testTrailing19( ) throws IOException
public void testTrailing20( ) throws IOException
{
int[] values = new int[]{
2010, 12, 5, 52
2010, 12, 5, 1
};
String[] types = new String[]{
TimeMember.TIME_LEVEL_TYPE_YEAR,
Expand All @@ -439,7 +439,7 @@ public void testTrailing20( ) throws IOException
public void testTrailing21( ) throws IOException
{
int[] values = new int[]{
2004, 1, 1, 53
2004, 1, 1, 1
};
String[] types = new String[]{
TimeMember.TIME_LEVEL_TYPE_YEAR,
Expand All @@ -457,6 +457,32 @@ public void testTrailing21( ) throws IOException
checkOutputFile( );
}


/**
* Test for week of year, no any month/quarter output level.
* In this case, weeks across year will be printed out, weeks
* across month will not be printed out.
* @throws IOException
*/
public void testTrailing22( ) throws IOException
{
int[] values = new int[]{
2004, 1
};
String[] types = new String[]{
TimeMember.TIME_LEVEL_TYPE_YEAR,
TimeMember.TIME_LEVEL_TYPE_WEEK_OF_YEAR,
};
TimeMember timeMember = new TimeMember( values, types );

IPeriodsFunction periodsFunction = TimeFunctionFactory.createTrailingFunction( TimeMember.TIME_LEVEL_TYPE_YEAR,
1 );

List<TimeMember> timeMembers = periodsFunction.getResult( timeMember );
printMembers( timeMembers );
checkOutputFile( );
}

private void printMembers( List<TimeMember> timeMembers )
{
String[] levelTypes;
Expand Down
2 changes: 0 additions & 2 deletions .../birt/data/engine/olap/data/impl/aggregation/function/golden/MonthToDateTest.testMTD3.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
year quarter month week-of-month
2011 3 9 0
year quarter month week-of-month
2011 3 9 1
year quarter month week-of-month
2011 3 9 2
Expand Down
2 changes: 0 additions & 2 deletions .../birt/data/engine/olap/data/impl/aggregation/function/golden/MonthToDateTest.testMTD4.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
year quarter month week-of-month
2002 1 2 0
year quarter month week-of-month
2002 1 2 1
year quarter month week-of-month
2002 1 2 2
Expand Down
44 changes: 22 additions & 22 deletions .../birt/data/engine/olap/data/impl/aggregation/function/golden/MonthToDateTest.testMTD6.txt
View file
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
year quarter month week-of-month week-of-year day-of-week day-of-month day-of-year
2011 3 9 0 35 5 1 244
2011 3 9 1 36 5 1 244
year quarter month week-of-month week-of-year day-of-week day-of-month day-of-year
2011 3 9 0 35 6 2 245
2011 3 9 1 36 6 2 245
year quarter month week-of-month week-of-year day-of-week day-of-month day-of-year
2011 3 9 0 35 7 3 246
2011 3 9 1 36 7 3 246
year quarter month week-of-month week-of-year day-of-week day-of-month day-of-year
2011 3 9 1 36 1 4 247
2011 3 9 2 37 1 4 247
year quarter month week-of-month week-of-year day-of-week day-of-month day-of-year
2011 3 9 1 36 2 5 248
2011 3 9 2 37 2 5 248
year quarter month week-of-month week-of-year day-of-week day-of-month day-of-year
2011 3 9 1 36 3 6 249
2011 3 9 2 37 3 6 249
year quarter month week-of-month week-of-year day-of-week day-of-month day-of-year
2011 3 9 1 36 4 7 250
2011 3 9 2 37 4 7 250
year quarter month week-of-month week-of-year day-of-week day-of-month day-of-year
2011 3 9 1 36 5 8 251
2011 3 9 2 37 5 8 251
year quarter month week-of-month week-of-year day-of-week day-of-month day-of-year
2011 3 9 1 36 6 9 252
2011 3 9 2 37 6 9 252
year quarter month week-of-month week-of-year day-of-week day-of-month day-of-year
2011 3 9 1 36 7 10 253
2011 3 9 2 37 7 10 253
year quarter month week-of-month week-of-year day-of-week day-of-month day-of-year
2011 3 9 2 37 1 11 254
2011 3 9 3 38 1 11 254
year quarter month week-of-month week-of-year day-of-week day-of-month day-of-year
2011 3 9 2 37 2 12 255
2011 3 9 3 38 2 12 255
year quarter month week-of-month week-of-year day-of-week day-of-month day-of-year
2011 3 9 2 37 3 13 256
2011 3 9 3 38 3 13 256
year quarter month week-of-month week-of-year day-of-week day-of-month day-of-year
2011 3 9 2 37 4 14 257
2011 3 9 3 38 4 14 257
year quarter month week-of-month week-of-year day-of-week day-of-month day-of-year
2011 3 9 2 37 5 15 258
2011 3 9 3 38 5 15 258
year quarter month week-of-month week-of-year day-of-week day-of-month day-of-year
2011 3 9 2 37 6 16 259
2011 3 9 3 38 6 16 259
year quarter month week-of-month week-of-year day-of-week day-of-month day-of-year
2011 3 9 2 37 7 17 260
2011 3 9 3 38 7 17 260
year quarter month week-of-month week-of-year day-of-week day-of-month day-of-year
2011 3 9 3 38 1 18 261
2011 3 9 4 39 1 18 261
year quarter month week-of-month week-of-year day-of-week day-of-month day-of-year
2011 3 9 3 38 2 19 262
2011 3 9 4 39 2 19 262
year quarter month week-of-month week-of-year day-of-week day-of-month day-of-year
2011 3 9 3 38 3 20 263
2011 3 9 4 39 3 20 263
year quarter month week-of-month week-of-year day-of-week day-of-month day-of-year
2011 3 9 3 38 4 21 264
2011 3 9 4 39 4 21 264
year quarter month week-of-month week-of-year day-of-week day-of-month day-of-year
2011 3 9 3 38 5 22 265
2011 3 9 4 39 5 22 265
4 changes: 2 additions & 2 deletions .../birt/data/engine/olap/data/impl/aggregation/function/golden/MonthToDateTest.testMTD9.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
year quarter month week-of-month
2011 4 10 0
year quarter month week-of-month
2011 4 10 1
year quarter month week-of-month
2011 4 10 2
Expand All @@ -10,3 +8,5 @@ year quarter month week-of-month
2011 4 10 4
year quarter month week-of-month
2011 4 10 5
year quarter month week-of-month
2011 4 10 6
1 change: 0 additions & 1 deletion ...e/olap/data/impl/aggregation/function/golden/QuarterToDateFunctionTest.testFunctions4.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
2002 3 7 3
2002 3 7 4
2002 3 7 5
2002 3 8 0
2002 3 8 1
2002 3 8 2
2002 3 8 3
2 changes: 1 addition & 1 deletion ...e/olap/data/impl/aggregation/function/golden/QuarterToDateFunctionTest.testFunctions5.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
2002 3 7 3
2002 3 7 4
2002 3 7 5
2002 3 8 0
2002 3 8 1
2002 3 8 2
2002 3 8 3
2002 3 8 4
2002 3 8 5
2002 3 9 1
2002 3 9 2
2002 3 9 3
Expand Down
Loading

0 comments on commit 0f15309

Please sign in to comment.