Skip to content

Commit 28782af

Browse files
committed
fix QUICKTEST flow
1 parent 9db7239 commit 28782af

File tree

1 file changed

+20
-23
lines changed

1 file changed

+20
-23
lines changed

integration-tests/src/test/java/oracle/kubernetes/operator/ITUsabilityOperatorHelmChart.java

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,9 @@ public class ITUsabilityOperatorHelmChart extends BaseTest {
3838
*/
3939
@BeforeClass
4040
public static void staticPrepare() throws Exception {
41-
if (!QUICKTEST) {
42-
// initialize test properties and create the directories
43-
initialize(APP_PROPS_FILE);
44-
}
41+
Assume.assumeFalse(QUICKTEST);
42+
// initialize test properties and create the directories
43+
initialize(APP_PROPS_FILE);
4544
}
4645

4746
/**
@@ -51,15 +50,14 @@ public static void staticPrepare() throws Exception {
5150
*/
5251
@AfterClass
5352
public static void staticUnPrepare() throws Exception {
54-
if (!QUICKTEST) {
55-
logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
56-
logger.info("BEGIN");
57-
logger.info("Run once, release cluster lease");
53+
Assume.assumeFalse(QUICKTEST);
54+
logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
55+
logger.info("BEGIN");
56+
logger.info("Run once, release cluster lease");
5857

59-
tearDown();
58+
tearDown();
6059

61-
logger.info("SUCCESS");
62-
}
60+
logger.info("SUCCESS");
6361
}
6462

6563
/**
@@ -69,7 +67,6 @@ public static void staticUnPrepare() throws Exception {
6967
*/
7068
@Test
7169
public void testOperatorCreateDeleteCreate() throws Exception {
72-
Assume.assumeFalse(QUICKTEST);
7370
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
7471
logTestBegin(testMethodName);
7572
Operator firstoperator = null;
@@ -122,7 +119,7 @@ public void testOperatorCreateDeleteCreate() throws Exception {
122119
*/
123120
@Test
124121
public void testCreateSecondOperatorUsingSameOperatorNSNegativeInstall() throws Exception {
125-
Assume.assumeFalse(QUICKTEST);
122+
126123
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
127124
logTestBegin(testMethodName);
128125
Operator firstoperator = null;
@@ -179,7 +176,7 @@ public void testCreateSecondOperatorUsingSameOperatorNSNegativeInstall() throws
179176
*/
180177
@Test
181178
public void testNotPreCreatedOpNSCreateOperatorNegativeInstall() throws Exception {
182-
Assume.assumeFalse(QUICKTEST);
179+
183180
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
184181
logTestBegin(testMethodName);
185182
Operator operator = null;
@@ -215,7 +212,7 @@ public void testNotPreCreatedOpNSCreateOperatorNegativeInstall() throws Exceptio
215212
*/
216213
@Test
217214
public void testNotPreexistedOpServiceAccountCreateOperatorNegativeInstall() throws Exception {
218-
Assume.assumeFalse(QUICKTEST);
215+
219216
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
220217
logTestBegin(testMethodName);
221218
Operator operator = null;
@@ -272,7 +269,7 @@ public void testNotPreexistedOpServiceAccountCreateOperatorNegativeInstall() thr
272269
*/
273270
@Test
274271
public void testSecondOpSharingSameTargetDomainsNSNegativeInstall() throws Exception {
275-
Assume.assumeFalse(QUICKTEST);
272+
276273
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
277274
logTestBegin(testMethodName);
278275
Operator secondoperator = null;
@@ -332,7 +329,7 @@ public void testSecondOpSharingSameTargetDomainsNSNegativeInstall() throws Excep
332329
*/
333330
@Test
334331
public void testTargetNSIsNotPreexistedNegativeInstall() throws Exception {
335-
Assume.assumeFalse(QUICKTEST);
332+
336333
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
337334
logTestBegin(testMethodName);
338335
Operator operator = null;
@@ -382,7 +379,7 @@ public void testTargetNSIsNotPreexistedNegativeInstall() throws Exception {
382379
*/
383380
@Test
384381
public void testSecondOpSharingSameExternalRestPortNegativeInstall() throws Exception {
385-
Assume.assumeFalse(QUICKTEST);
382+
386383
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
387384
logTestBegin(testMethodName);
388385
Operator operator1 = null;
@@ -442,7 +439,7 @@ public void testSecondOpSharingSameExternalRestPortNegativeInstall() throws Exce
442439
*/
443440
@Test
444441
public void testCreateWithUpperCaseTargetDomainNegativeInstall() throws Exception {
445-
Assume.assumeFalse(QUICKTEST);
442+
446443
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
447444
logTestBegin(testMethodName);
448445
Operator operator = null;
@@ -488,7 +485,7 @@ public void testCreateWithUpperCaseTargetDomainNegativeInstall() throws Exceptio
488485
*/
489486
@Test
490487
public void testCreateChartWithInvalidAttributesNegativeInstall() throws Exception {
491-
Assume.assumeFalse(QUICKTEST);
488+
492489
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
493490
logTestBegin(testMethodName);
494491
Operator operator = null;
@@ -539,7 +536,7 @@ public void testCreateChartWithInvalidAttributesNegativeInstall() throws Excepti
539536
*/
540537
@Test
541538
public void testCreateWithEmptyTargetDomainInstall() throws Exception {
542-
Assume.assumeFalse(QUICKTEST);
539+
543540
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
544541
logTestBegin(testMethodName);
545542
Operator operator = null;
@@ -561,7 +558,7 @@ public void testCreateWithEmptyTargetDomainInstall() throws Exception {
561558
}
562559

563560
private void upgradeOperator(Operator operator, String upgradeSet) throws Exception {
564-
Assume.assumeFalse(QUICKTEST);
561+
565562
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
566563
logTestBegin(testMethodName);
567564
operator.callHelmUpgrade(upgradeSet);
@@ -575,7 +572,7 @@ private void upgradeOperator(Operator operator, String upgradeSet) throws Except
575572
*/
576573
@Test
577574
public void testCreateWithDefaultTargetDomainInstall() throws Exception {
578-
Assume.assumeFalse(QUICKTEST);
575+
579576
String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
580577
logTestBegin(testMethodName);
581578
Operator operator = null;

0 commit comments

Comments
 (0)