You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sw...@apache.org on 2016/04/18 14:31:22 UTC
[1/3] git commit: updated refs/heads/master to 749b716
Repository: cloudstack
Updated Branches:
refs/heads/master 0dcaf197b -> 749b71601
Fixed Profiler's unit tests bugs.
Problem:
The TestProfiler class was using Java Thread methods to test the
Profiler's functionality. That was causing the tests to fail sometimes
since the JVM's thread priority could be low on some OS.
Fix:
Using PowerMockito to mock the System calls, the threads could be
removed. This makes the tests considerably faster, OS independent and
still guarantees the correct implementation of the Profiler class.
The changes on the Profiler's class was only to shorten the class's line
size by not assigning the return value to a variable returning it
straight out.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8d6370b2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8d6370b2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8d6370b2
Branch: refs/heads/master
Commit: 8d6370b21fd527dc0046c0a1d67dce35dbf15681
Parents: de173bd
Author: Alexandre Limas Santana <al...@gmail.com>
Authored: Sat Mar 19 16:25:47 2016 -0300
Committer: Alexandre Limas Santana <al...@gmail.com>
Committed: Sat Mar 19 16:35:25 2016 -0300
----------------------------------------------------------------------
.../src/main/java/com/cloud/utils/Profiler.java | 6 +-
.../test/java/com/cloud/utils/TestProfiler.java | 93 +++++++++-----------
2 files changed, 46 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d6370b2/utils/src/main/java/com/cloud/utils/Profiler.java
----------------------------------------------------------------------
diff --git a/utils/src/main/java/com/cloud/utils/Profiler.java b/utils/src/main/java/com/cloud/utils/Profiler.java
index f8e44bd..b08e7c9 100644
--- a/utils/src/main/java/com/cloud/utils/Profiler.java
+++ b/utils/src/main/java/com/cloud/utils/Profiler.java
@@ -46,8 +46,7 @@ public class Profiler {
*/
public long getDuration() {
if (startTickNanoSeconds != null && stopTickNanoSeconds != null) {
- final long timeInNanoSeconds = stopTickNanoSeconds - startTickNanoSeconds;
- return timeInNanoSeconds;
+ return stopTickNanoSeconds - startTickNanoSeconds;
}
return -1;
@@ -61,8 +60,7 @@ public class Profiler {
*/
public long getDurationInMillis() {
if (startTickNanoSeconds != null && stopTickNanoSeconds != null) {
- final long timeInMillis = (stopTickNanoSeconds - startTickNanoSeconds) / (long)Math.pow(MILLIS_FACTOR, EXPONENT);
- return timeInMillis;
+ return (stopTickNanoSeconds - startTickNanoSeconds) / (long)Math.pow(MILLIS_FACTOR, EXPONENT);
}
return -1;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8d6370b2/utils/src/test/java/com/cloud/utils/TestProfiler.java
----------------------------------------------------------------------
diff --git a/utils/src/test/java/com/cloud/utils/TestProfiler.java b/utils/src/test/java/com/cloud/utils/TestProfiler.java
index f0e163e..ad48d78 100644
--- a/utils/src/test/java/com/cloud/utils/TestProfiler.java
+++ b/utils/src/test/java/com/cloud/utils/TestProfiler.java
@@ -19,84 +19,79 @@
package com.cloud.utils;
-import org.apache.log4j.Logger;
import org.junit.Assert;
+import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
import com.cloud.utils.testcase.Log4jEnabledTestCase;
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({Profiler.class})
public class TestProfiler extends Log4jEnabledTestCase {
- protected final static Logger s_logger = Logger.getLogger(TestProfiler.class);
-
- private static final long MILLIS_FACTOR = 1000l;
- private static final int MARGIN = 100;
- // Profiler uses System.nanoTime which is not reliable on the millisecond
- // A sleep of 1000 milliseconds CAN be measured as 999 milliseconds
- // Therefore make the second larger, by 10% of the margin
- private static final long ONE_SECOND = 1000l + (MARGIN / 10);
- private static final double EXPONENT = 3d;
+ private static final long SLEEP_TIME_NANO = 1000000000L;
+ private static Profiler pf;
+
+ @Before
+ public void setUp(){
+ pf = new Profiler();
+ PowerMockito.mockStatic(System.class);
+ PowerMockito.when(System.nanoTime()).thenReturn(0L, SLEEP_TIME_NANO);
+ }
+
@Test
public void testProfilerInMillis() {
- s_logger.info("testProfiler() started");
-
- final Profiler pf = new Profiler();
+ //Given
+ final long sleepTimeMillis = SLEEP_TIME_NANO / 1000000L;
+
+ //When
pf.start();
- try {
- Thread.sleep(ONE_SECOND);
- } catch (final InterruptedException e) {
- }
pf.stop();
- final long durationInMillis = pf.getDurationInMillis();
- s_logger.info("Duration in Millis: " + durationInMillis);
-
- // An error margin in order to cover the time taken by the star/stop calls.
- // 100 milliseconds margin seems too much, but it will avoid assertion error
- // and also fail in case a duration in nanoseconds is used instead.
- Assert.assertTrue(durationInMillis >= MILLIS_FACTOR && durationInMillis <= MILLIS_FACTOR + MARGIN);
-
- s_logger.info("testProfiler() stopped");
+ //Then
+ Assert.assertTrue(pf.getDurationInMillis() == sleepTimeMillis);
}
@Test
public void testProfilerInNano() {
- final Profiler pf = new Profiler();
- pf.start();
- try {
- Thread.sleep(ONE_SECOND);
- } catch (final InterruptedException e) {
- }
+ //Given
+ final long sleepTimeNano = SLEEP_TIME_NANO;
+
+ //When
+ pf.start();
pf.stop();
- final long duration = pf.getDuration();
- s_logger.info("Duration in Nano: " + duration);
- Assert.assertTrue(duration >= Math.pow(MILLIS_FACTOR, EXPONENT));
+ //Then
+ Assert.assertTrue(pf.getDuration() == sleepTimeNano);
}
@Test
public void testProfilerNoStart() {
- final Profiler pf = new Profiler();
- try {
- Thread.sleep(20);
- } catch (final InterruptedException e) {
- }
- pf.stop();
+ //Given
+ final long expectedAnswer = -1;
+
+ //When
+ pf.stop();
- Assert.assertTrue(pf.getDurationInMillis() == -1);
+ //Then
+ Assert.assertTrue(pf.getDurationInMillis() == expectedAnswer);
Assert.assertFalse(pf.isStarted());
}
@Test
public void testProfilerNoStop() {
- final Profiler pf = new Profiler();
- pf.start();
- try {
- Thread.sleep(20);
- } catch (final InterruptedException e) {
- }
+ //Given
+ final long expectedAnswer = -1;
+
+ //When
+ pf.start();
- Assert.assertTrue(pf.getDurationInMillis() == -1);
+ //Then
+ Assert.assertTrue(pf.getDurationInMillis() == expectedAnswer);
Assert.assertFalse(pf.isStopped());
}
}
\ No newline at end of file
[3/3] git commit: updated refs/heads/master to 749b716
Posted by sw...@apache.org.
Merge pull request #1445 from rafaelweingartner/lrg-cs-hackday-025
Fixed Profiler's unit tests bugs.### **Problem:**
The TestProfiler class was using Java Thread methods to test the
Profiler's functionality. That was causing the tests to fail sometimes
since the JVM's thread priority could be low on some OS.
### **Fix:**
Using PowerMockito to mock the System calls, the threads could be
removed. This makes the tests considerably faster, OS independent and
still guarantees the correct implementation of the Profiler class.
The changes on the Profiler's class was only to shorten the class's line
size by not assigning the return value to a variable returning it
straight out.
* pr/1445:
Fixed changes to match code conventions
Fixed Profiler's unit tests bugs.
Signed-off-by: Will Stevens <wi...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/749b7160
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/749b7160
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/749b7160
Branch: refs/heads/master
Commit: 749b71601cdbf7b1ee9ea7cdacb8cfc00750d175
Parents: 0dcaf19 c2afa58
Author: Will Stevens <wi...@gmail.com>
Authored: Mon Apr 18 08:30:46 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
Committed: Mon Apr 18 08:30:46 2016 -0400
----------------------------------------------------------------------
.../src/main/java/com/cloud/utils/Profiler.java | 7 +-
.../test/java/com/cloud/utils/TestProfiler.java | 83 +++++++++-----------
2 files changed, 41 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: updated refs/heads/master to 749b716
Posted by sw...@apache.org.
Fixed changes to match code conventions
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c2afa584
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c2afa584
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c2afa584
Branch: refs/heads/master
Commit: c2afa584ae68f52cdf55a7204c01ed66a5be1912
Parents: 8d6370b
Author: Alexandre Limas Santana <al...@gmail.com>
Authored: Sun Mar 20 11:49:04 2016 -0300
Committer: Alexandre Limas Santana <al...@gmail.com>
Committed: Sun Mar 20 11:49:04 2016 -0300
----------------------------------------------------------------------
.../src/main/java/com/cloud/utils/Profiler.java | 1 -
.../test/java/com/cloud/utils/TestProfiler.java | 44 ++++++++++----------
2 files changed, 22 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c2afa584/utils/src/main/java/com/cloud/utils/Profiler.java
----------------------------------------------------------------------
diff --git a/utils/src/main/java/com/cloud/utils/Profiler.java b/utils/src/main/java/com/cloud/utils/Profiler.java
index b08e7c9..addee2d 100644
--- a/utils/src/main/java/com/cloud/utils/Profiler.java
+++ b/utils/src/main/java/com/cloud/utils/Profiler.java
@@ -24,7 +24,6 @@ public class Profiler {
private static final long MILLIS_FACTOR = 1000l;
private static final double EXPONENT = 2d;
-
private Long startTickNanoSeconds;
private Long stopTickNanoSeconds;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c2afa584/utils/src/test/java/com/cloud/utils/TestProfiler.java
----------------------------------------------------------------------
diff --git a/utils/src/test/java/com/cloud/utils/TestProfiler.java b/utils/src/test/java/com/cloud/utils/TestProfiler.java
index ad48d78..0e68175 100644
--- a/utils/src/test/java/com/cloud/utils/TestProfiler.java
+++ b/utils/src/test/java/com/cloud/utils/TestProfiler.java
@@ -35,19 +35,19 @@ public class TestProfiler extends Log4jEnabledTestCase {
private static final long SLEEP_TIME_NANO = 1000000000L;
private static Profiler pf;
-
+
@Before
- public void setUp(){
- pf = new Profiler();
- PowerMockito.mockStatic(System.class);
- PowerMockito.when(System.nanoTime()).thenReturn(0L, SLEEP_TIME_NANO);
+ public void setUp() {
+ pf = new Profiler();
+ PowerMockito.mockStatic(System.class);
+ PowerMockito.when(System.nanoTime()).thenReturn(0L, SLEEP_TIME_NANO);
}
-
+
@Test
public void testProfilerInMillis() {
//Given
final long sleepTimeMillis = SLEEP_TIME_NANO / 1000000L;
-
+
//When
pf.start();
pf.stop();
@@ -58,11 +58,11 @@ public class TestProfiler extends Log4jEnabledTestCase {
@Test
public void testProfilerInNano() {
- //Given
- final long sleepTimeNano = SLEEP_TIME_NANO;
-
- //When
- pf.start();
+ //Given
+ final long sleepTimeNano = SLEEP_TIME_NANO;
+
+ //When
+ pf.start();
pf.stop();
//Then
@@ -71,26 +71,26 @@ public class TestProfiler extends Log4jEnabledTestCase {
@Test
public void testProfilerNoStart() {
- //Given
- final long expectedAnswer = -1;
+ //Given
+ final long expectedAnswer = -1;
- //When
- pf.stop();
+ //When
+ pf.stop();
- //Then
+ //Then
Assert.assertTrue(pf.getDurationInMillis() == expectedAnswer);
Assert.assertFalse(pf.isStarted());
}
@Test
public void testProfilerNoStop() {
- //Given
- final long expectedAnswer = -1;
+ //Given
+ final long expectedAnswer = -1;
- //When
- pf.start();
+ //When
+ pf.start();
- //Then
+ //Then
Assert.assertTrue(pf.getDurationInMillis() == expectedAnswer);
Assert.assertFalse(pf.isStopped());
}