Skip to content

Commit 436e528

Browse files
committed
renaming domain input file names
1 parent ba5cf90 commit 436e528

File tree

8 files changed

+3
-75
lines changed

8 files changed

+3
-75
lines changed

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

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,8 @@ public class ITOperator extends BaseTest {
4242
"DomainWithServerStartPolicyAsAdminOnly.yaml";
4343
private static String domainWithStorageReclaimPolicyRecycleYamlFile =
4444
"DomainWithStorageReclaimPolicyRecycle.yaml";
45-
46-
private static String domain4YamlFile = "domain4.yaml";
47-
private static String domain5YamlFile = "domain5.yaml";
48-
private static final String domain1ForDelValueYamlFile = "domain_del_1.yaml";
49-
private static final String domain2ForDelValueYamlFile = "domain_del_2.yaml";
50-
private static final String domain3ForDelValueYamlFile = "domain_del_3.yaml";
51-
private static String domainWithApacheLB = "DomainWithApacheLB.yaml";
52-
private static String domain10YamlFile = "domain10.yaml";
45+
private static String domainWithDefaultValuesForSamplesYamlFile =
46+
"DomainWithDefaultValuesForSamples.yaml";
5347

5448
// property file used to configure constants for integration tests
5549
private static String appPropsFile = "OperatorIT.properties";
@@ -283,9 +277,7 @@ public void testTwoDomainsManagedByTwoOperators() throws Exception {
283277
if (!domainUidsToBeDeleted.equals("")) {
284278
logger.info("About to delete domains: " + domainUidsToBeDeleted);
285279
TestUtils.deleteWeblogicDomainResources(domainUidsToBeDeleted);
286-
logger.info("domain1 domainMap " + domain1.getDomainMap());
287280
TestUtils.verifyAfterDeletion(domain1);
288-
logger.info("domain2 domainMap " + domain2.getDomainMap());
289281
TestUtils.verifyAfterDeletion(domain2);
290282
}
291283
}
@@ -379,7 +371,7 @@ public void testCreateDomainWithDefaultValuesInSampleInputs() throws Exception {
379371
Domain domain = null;
380372
boolean testCompletedSuccessfully = false;
381373
try {
382-
domain = TestUtils.createDomain(domain10YamlFile);
374+
domain = TestUtils.createDomain(domainWithDefaultValuesForSamplesYamlFile);
383375
domain.verifyDomainCreated();
384376
testBasicUseCases(domain);
385377
// testAdvancedUseCasesForADomain(operator1, domain10);

integration-tests/src/test/resources/DomainWithAutoAndCustomSitConfig.yaml

Lines changed: 0 additions & 10 deletions
This file was deleted.

integration-tests/src/test/resources/domain4.yaml

Lines changed: 0 additions & 10 deletions
This file was deleted.

integration-tests/src/test/resources/domain5.yaml

Lines changed: 0 additions & 17 deletions
This file was deleted.

integration-tests/src/test/resources/domain_del_1.yaml

Lines changed: 0 additions & 9 deletions
This file was deleted.

integration-tests/src/test/resources/domain_del_2.yaml

Lines changed: 0 additions & 9 deletions
This file was deleted.

integration-tests/src/test/resources/domain_del_3.yaml

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)