Skip to content

Commit 7ebc4fe

Browse files
committed
fix typo QUICKTEST, rename ITSingleDomain to ITFirstDomain
1 parent c4a5853 commit 7ebc4fe

File tree

7 files changed

+11
-15
lines changed

7 files changed

+11
-15
lines changed

integration-tests/src/test/java/oracle/kubernetes/operator/ITSingleDomain.java renamed to integration-tests/src/test/java/oracle/kubernetes/operator/ITFirstDomain.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
* <p>This test is used for creating Operator and a single domain which the Operator manages and
2222
* verifies both.
2323
*/
24-
public class ITSingleDomain extends BaseTest {
24+
public class ITFirstDomain extends BaseTest {
2525
public static final String TESTWEBAPP = "testwebapp";
2626

2727
// property file used to customize operator properties for operator inputs yaml
28-
private static String opPropsFile = "ITSingleDomain_op.properties";
28+
private static String opPropsFile = "ITFirstOperator.properties";
2929

3030
// property file used to customize domain properties for domain inputs yaml
31-
private static String domainPropsFile = "ITSingleDomain_domain.properties";
31+
private static String domainPropsFile = "ITFirstDomain.properties";
3232

3333
// property file used to configure constants for integration tests
3434
private static String appPropsFile = "OperatorIT.properties";
@@ -82,8 +82,7 @@ public static void staticPrepare() throws Exception {
8282
@AfterClass
8383
public static void staticUnPrepare() throws Exception {
8484
Assume.assumeTrue(
85-
System.getenv("QUICKTEST") != null
86-
&& System.getenv("QUICKTEST").equalsIgnoreCase("true"));
85+
System.getenv("QUICKTEST") != null && System.getenv("QUICKTEST").equalsIgnoreCase("true"));
8786
logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
8887
logger.info("BEGIN");
8988
logger.info("Run once, shutdown/deleting operator, domain, pv, etc");

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ public class ITFourthDomain extends BaseTest {
5151
@BeforeClass
5252
public static void staticPrepare() throws Exception {
5353
Assume.assumeTrue(
54-
System.getenv("QUICKTEST") == null
55-
|| System.getenv("QUICKTEST").equalsIgnoreCase("false"));
54+
System.getenv("QUICKTEST") == null || System.getenv("QUICKTEST").equalsIgnoreCase("false"));
5655
logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
5756
logger.info("BEGIN");
5857

@@ -118,7 +117,7 @@ public static void staticUnPrepare() throws Exception {
118117
* @throws Exception
119118
*/
120119
public void verifyDomain1() throws Exception {
121-
ITSingleDomain.getDomain().verifyDomainCreated();
120+
ITFirstDomain.getDomain().verifyDomainCreated();
122121
}
123122

124123
/**
@@ -214,7 +213,7 @@ public void testClusterScaling() throws Exception {
214213
domain.verifyWebAppLoadBalancing(TESTWEBAPP);
215214

216215
// verfiy scaling has no impact on domains1
217-
ITSingleDomain.getDomain().verifyDomainCreated();
216+
ITFirstDomain.getDomain().verifyDomainCreated();
218217
logger.info("SUCCESS");
219218
}
220219

@@ -226,7 +225,7 @@ public void testClusterScaling() throws Exception {
226225
@Test
227226
public void testDeleteAndRecreteDomain1() throws Exception {
228227

229-
Domain domain1 = ITSingleDomain.getDomain();
228+
Domain domain1 = ITFirstDomain.getDomain();
230229
domain1.destroy();
231230
domain1.create();
232231

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ public class ITSecondDomain extends BaseTest {
4141
@BeforeClass
4242
public static void staticPrepare() throws Exception {
4343
Assume.assumeTrue(
44-
System.getenv("QUICKTEST") == null
45-
|| System.getenv("QUICKTEST").equalsIgnoreCase("false"));
44+
System.getenv("QUICKTEST") == null || System.getenv("QUICKTEST").equalsIgnoreCase("false"));
4645
logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
4746
logger.info("BEGIN");
4847

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
@RunWith(Suite.class)
77
@Suite.SuiteClasses({
8-
ITSingleDomain.class,
8+
ITFirstDomain.class,
99
ITSecondDomain.class,
1010
ITThirdDomain.class,
1111
ITFourthDomain.class

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ public class ITThirdDomain extends BaseTest {
4141
@BeforeClass
4242
public static void staticPrepare() throws Exception {
4343
Assume.assumeTrue(
44-
System.getenv("QUICKTEST") == null
45-
|| System.getenv("QUICKTEST").equalsIgnoreCase("false"));
44+
System.getenv("QUICKTEST") == null || System.getenv("QUICKTEST").equalsIgnoreCase("false"));
4645
logger.info("+++++++++++++++++++++++++++++++++---------------------------------+");
4746
logger.info("BEGIN");
4847

0 commit comments

Comments
 (0)