@@ -124,34 +124,34 @@ TEST_P(TimerTestsFixture, TimeShiftTest) {
124124
125125 ti.Initialize (&ctx, cyclus::SimInfo (5 ));
126126
127- int obs = ti.timeshift (-1 ,-1 );
127+ int obs = ti.CalcTimeDiff (-1 ,-1 );
128128 int exp = 0 ;
129129 EXPECT_EQ (exp, obs);
130130
131- obs = ti.timeshift (0 ,0 );
131+ obs = ti.CalcTimeDiff (0 ,0 );
132132 EXPECT_EQ (exp, obs);
133133
134- obs = ti.timeshift (2010 , 2 );
134+ obs = ti.CalcTimeDiff (2010 , 2 );
135135 exp = 1 ;
136136 EXPECT_EQ (exp, obs);
137137
138- obs = ti.timeshift (2011 ,1 );
138+ obs = ti.CalcTimeDiff (2011 ,1 );
139139 exp = 12 ;
140140 EXPECT_EQ (exp, obs);
141141
142- obs = ti.timeshift (2011 ,5 );
142+ obs = ti.CalcTimeDiff (2011 ,5 );
143143 exp = 16 ;
144144 EXPECT_EQ (exp, obs);
145145
146- obs = ti.timeshift (2009 ,1 );
146+ obs = ti.CalcTimeDiff (2009 ,1 );
147147 exp = -12 ;
148148 EXPECT_EQ (exp, obs);
149149
150- obs = ti.timeshift (2009 ,11 );
150+ obs = ti.CalcTimeDiff (2009 ,11 );
151151 exp = -2 ;
152152 EXPECT_EQ (exp, obs);
153153
154- obs = ti.timeshift (2008 ,6 );
154+ obs = ti.CalcTimeDiff (2008 ,6 );
155155 exp = -19 ;
156156 EXPECT_EQ (exp, obs);
157157
0 commit comments