work around for missing trust service identity asserter schematype ja… (#1439)

* work around for missing trust service identity asserter schematype jar in discoverDomain

* system test was running without schema file. Change expected return code

Author: CarolynRountree

core/src/main/python/wlsdeploy/tool/discover/discoverer.py

@@ -454,7 +454,12 @@ def _discover_artificial_folder(self, model_subfolder_type, location, name_token
                 location.add_name_token(name_token, name)
                 massaged = self._inspect_artificial_folder_name(name, location)
                 location.add_name_token(name_token, massaged)
-                artificial = self._get_artificial_type(location)
+                # circumventing problems if the trust identity asserter schematype jar
+                # is not in the oracle home. Force it to have the correct name.
+                if name == 'Trust Service Identity Asserter':
+                    artificial = 'TrustServiceIdentityAsserter'
+                else:
+                    artificial = self._get_artificial_type(location)
                 if artificial is None:
                     if self._aliases.is_custom_folder_allowed(location):
                         _logger.fine('WLSDPLY-06148', model_subfolder_type, massaged, location.get_folder_path(),

integration-tests/system-test/src/test/java/oracle/weblogic/deploy/integration/ITWdt.java

@@ -530,7 +530,7 @@ void test17DiscoverDomainWithRequiredArgument(TestInfo testInfo) throws Exceptio
                 + " -domain_type RestrictedJRF";
             CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out);
             // SecurityConfiguration warning
-            assertEquals(1, result.exitValue(), "Unexpected return code");
+            assertEquals(0, result.exitValue(), "Unexpected return code");
 
             // verify model file
             verifyModelFile(discoveredModel.toString());
@@ -569,7 +569,7 @@ void test18DiscoverDomainWithModelFile(TestInfo testInfo) throws Exception {
         try (PrintWriter out = getTestMethodWriter(testInfo)) {
             CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out);
             // SecurityConfiguration warning
-            assertEquals(1, result.exitValue(), "Unexpected return code");
+            assertEquals(0, result.exitValue(), "Unexpected return code");
 
             // verify model file
             verifyModelFile(discoveredModelFile.toString());
@@ -601,7 +601,7 @@ void test19DiscoverDomainWithVariableFile(TestInfo testInfo) throws Exception {
       try (PrintWriter out = getTestMethodWriter(testInfo)) {
           CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out);
           // SecurityConfiguration warning
-          assertEquals(1, result.exitValue(), "Unexpected return code");
+          assertEquals(0, result.exitValue(), "Unexpected return code");
 
           // verify model file and variable file
           verifyModelFile(discoveredModelFile.toString());
@@ -652,7 +652,7 @@ void test20DiscoverDomainJRFDomainType(TestInfo testInfo) throws Exception {
 
             CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out);
             // SecurityConfiguration warning
-            assertEquals(1, result.exitValue(), "Unexpected return code");
+            assertEquals(0, result.exitValue(), "Unexpected return code");
 
             // verify model file
             verifyModelFile(discoveredModelFile.toString());