Code Review
/
vfc
/
nfvo
/
driver
/
vnfm
/
svnfm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fix template generator for R2"
[vfc/nfvo/driver/vnfm/svnfm.git]
/
nokiav2
/
driver
/
src
/
test
/
java
/
org
/
onap
/
vfc
/
nfvo
/
driver
/
vnfm
/
svnfm
/
nokia
/
util
/
TestSystemFunctions.java
diff --git
a/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/util/TestSystemFunctions.java
b/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/util/TestSystemFunctions.java
index
1b34d28
..
749b249
100644
(file)
--- a/
nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/util/TestSystemFunctions.java
+++ b/
nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/util/TestSystemFunctions.java
@@
-64,16
+64,16
@@
public class TestSystemFunctions {
Inter inter = new Inter();
inter.start();
//wait for thread to enter waiting
Inter inter = new Inter();
inter.start();
//wait for thread to enter waiting
- while
(!entered.get() && inter.getState() != Thread.State.TIMED_WAITING && (System.currentTimeMillis() < start + 60*1000) )
{
+ while
(!entered.get() && inter.getState() != Thread.State.TIMED_WAITING && (System.currentTimeMillis() < start + 60 * 1000))
{
Thread.sleep(10);
}
Thread.sleep(10);
}
- if
(!(System.currentTimeMillis() < start + 60*1000))
{
+ if
(!(System.currentTimeMillis() < start + 60 * 1000))
{
throw new RuntimeException("Thread did not enter waiting state");
}
//when
inter.interrupt();
//verify
throw new RuntimeException("Thread did not enter waiting state");
}
//when
inter.interrupt();
//verify
- while (exceptions.size() != 1 && (System.currentTimeMillis() < start + 60
*
1000)) {
+ while (exceptions.size() != 1 && (System.currentTimeMillis() < start + 60
*
1000)) {
Thread.sleep(10);
}
assertEquals(1, exceptions.size());
Thread.sleep(10);
}
assertEquals(1, exceptions.size());