Updated WLST data type compatibility check method to see "class java.lang.Log" and "<type 'javainstance'>" as being compatible with WLST long

Author: mwooten

core/src/test/python/validation_test.py

@@ -33,14 +33,18 @@ def setUp(self):
         self.wls_helper = WebLogicHelper(self._logger)
 
     def testModelValidation(self):
-
-        _model_file = self._resources_dir + '/test_jms_mail.json'
         _method_name = 'testModelValidation'
 
+        _model_file = self._resources_dir + '/variablestest.yaml'
+        _variable_file = self._resources_dir + '/variablestest.properties'
+        _archive_file = self._resources_dir + '/variablestest.zip'
+
         mw_home = os.environ['MW_HOME']
         args_map = {
             '-oracle_home': mw_home,
-            '-model_file': _model_file
+            '-model_file': _model_file,
+            '-variable_file': _variable_file,
+            '-archive_file': _archive_file
         }
 
         model_context = ModelContext('ValidationTestCase', args_map)

core/src/test/resources/variablestest.properties

@@ -0,0 +1,18 @@
+SecurityConfiguration.CredentialEncrypted=welcome1
+SecurityConfiguration.NodeManagerUsername=weblogic
+SecurityConfiguration.NodeManagerPasswordEncrypted=welcome1
+JDBCSystemResource.MyPersistentStoreDS.JdbcResource.JDBCDriverParams.PasswordEncrypted=welcome1
+JDBCSystemResource.MyPersistentStoreDS.JdbcResource.JDBCDriverParams.Properties.user.Value=weblogic
+JDBCSystemResource.MyDataSource.JdbcResource.JDBCDriverParams.PasswordEncrypted=welcome1
+JDBCSystemResource.MyDataSource.JdbcResource.JDBCDriverParams.Properties.user.Value=weblogic
+MailSession.MyMailSession.SessionPasswordEncrypted=welcome1
+MailSession.MyMailSession.SessionUsername=weblogic
+MailSession.MailSession-0.SessionPasswordEncrypted=welcome1
+MailSession.MailSession-0.SessionUsername=weblogic
+JMSSystemResource.MyJmsModule.JmsResource.ForeignServer.MyForeignServer.JNDIPropertiesCredentialEncrypted=welcome1
+JMSSystemResource.MyJmsModule.JmsResource.SAFRemoteContext.MyRemoteSAFcontext.SAFLoginContext.PasswordEncrypted=welcome1
+JMSSystemResource.MyJmsModule.JmsResource.SAFRemoteContext.MyRemoteSAFcontext.SAFLoginContext.Username=weblogic
+JMSBridgeDestination.JMS-Bridge-Remote-Destination.UserName=weblogic
+JMSBridgeDestination.JMS-Bridge-Remote-Destination.UserPasswordEncrypted=welcome1
+WLDFSystemResource.MyWldfModule.WLDFResource.WatchNotification.RestNotification.MyRestAction.HttpAuthenticationPasswordEncrypted=welcome1
+WLDFSystemResource.MyWldfModule.WLDFResource.WatchNotification.RestNotification.MyRestAction.HttpAuthenticationUserName=weblogic