66
77import java .util .ArrayList ;
88import java .util .Map ;
9- import oracle .kubernetes .operator .utils .Operator .RESTCertType ;
109import oracle .kubernetes .operator .utils .Domain ;
1110import oracle .kubernetes .operator .utils .ExecCommand ;
1211import oracle .kubernetes .operator .utils .ExecResult ;
1312import oracle .kubernetes .operator .utils .Operator ;
13+ import oracle .kubernetes .operator .utils .Operator .RESTCertType ;
1414import oracle .kubernetes .operator .utils .TestUtils ;
1515import org .junit .AfterClass ;
1616import org .junit .Assume ;
@@ -632,9 +632,10 @@ public void testAddRemoveDomainUpdateOperatorHC() throws Exception {
632632 verifyOperatorDomainManagement (operator , domainnew , true );
633633 testCompletedSuccessfully = true ;
634634 } finally {
635- if (domain != null ) TestUtils .deleteWeblogicDomainResources (domain .getDomainUid ());
636- if (domainnew != null ) domainnew .destroy ();
637-
635+ if (domain != null )
636+ TestUtils .deleteWeblogicDomainResources (domain .getDomainUid ());
637+ if (domainnew != null )
638+ domainnew .destroy ();
638639 if (operator != null ) {
639640 operator .destroy ();
640641 }
@@ -669,22 +670,20 @@ public void testDeleteOperatorButNotDomain() throws Exception {
669670 operator = null ;
670671 domain .testWlsLivenessProbe ();
671672 testCompletedSuccessfully = true ;
672- } finally {
673- if (domain != null ) TestUtils .deleteWeblogicDomainResources (domain .getDomainUid ());
674-
675- if (operator != null ) {
676- operator .destroy ();
673+ } finally {
674+ if (domain != null )
675+ TestUtils .deleteWeblogicDomainResources (domain .getDomainUid ());
676+ if (operator != null ) {
677+ operator .destroy ();
678+ }
679+ number ++;
677680 }
678- number ++;
679- }
680-
681681 logger .info ("SUCCESS - " + testMethodName );
682682 }
683683
684684 private void verifyOperatorDomainManagement (
685685 Operator operator , Domain domain , boolean isAccessible ) throws Exception {
686686 for (int i = 0 ; i < maxIterations ; i ++) {
687-
688687 try {
689688 operator .verifyDomainExists (domain .getDomainUid ());
690689 if (!isAccessible ) {
@@ -697,7 +696,6 @@ private void verifyOperatorDomainManagement(
697696 if (!ex .getMessage ()
698697 .contains (
699698 "Response {\" status\" :404,\" detail\" :\" /operator/latest/domains/test" + number )) {
700-
701699 } else {
702700 break ;
703701 }
0 commit comments