fixed enum tests after previous changes

Author: Kostiantyn Sologubov

generator/test/test_enums.py

@@ -37,11 +37,9 @@ def test_deprecated(self):
                                           deprecated=True)
         })
         expected = {
-            'kind': 'custom',
-            'return_type': 'int',
+            'kind': 'simple',
             'package_name': 'com.smartdevicelink.proxy.rpc.enums',
             'class_name': 'TestDeprecated',
-            'imports': {'java.util.EnumSet'},
             'params': (
                 self.producer.params(name='PRIMARY_WIDGET', origin='PRIMARY_WIDGET', deprecated=True,
                                      internal=1, description=None, since=None, value=None),),
@@ -58,7 +56,6 @@ def test_Language(self):
         })
         expected = {
             'kind': 'custom',
-            'return_type': 'String',
             'package_name': 'com.smartdevicelink.proxy.rpc.enums',
             'class_name': 'Language',
             'params': (
@@ -78,11 +75,9 @@ def test_PredefinedWindows(self):
         elements['PRIMARY_WIDGET'] = EnumElement(name='PRIMARY_WIDGET', value=1)
         item = Enum(name='PredefinedWindows', elements=elements)
         expected = {
-            'kind': 'custom',
-            'return_type': 'int',
+            'kind': 'simple',
             'package_name': 'com.smartdevicelink.proxy.rpc.enums',
             'class_name': 'PredefinedWindows',
-            'imports': {'java.util.EnumSet'},
             'params': (self.producer.params(name='DEFAULT_WINDOW', origin='DEFAULT_WINDOW',
                                             internal=0, description=None, since=None, value=None,
                                             deprecated=None),
@@ -102,7 +97,6 @@ def test_SamplingRate(self):
         })
         expected = {
             'kind': 'custom',
-            'return_type': 'String',
             'package_name': 'com.smartdevicelink.proxy.rpc.enums',
             'class_name': 'SamplingRate',
             'imports': {'java.util.EnumSet'},
@@ -124,7 +118,6 @@ def test_Result(self):
         item = Enum(name='Result', elements=elements)
         expected = {
             'kind': 'simple',
-            'return_type': 'String',
             'package_name': 'com.smartdevicelink.proxy.rpc.enums',
             'class_name': 'Result',
             'params': (
@@ -146,7 +139,6 @@ def test_DisplayType(self):
         })
         expected = {
             'kind': 'simple',
-            'return_type': 'String',
             'package_name': 'com.smartdevicelink.proxy.rpc.enums',
             'class_name': 'DisplayType',
             'params': (
@@ -165,7 +157,6 @@ def test_SpeechCapabilities(self):
         })
         expected = {
             'kind': 'simple',
-            'return_type': 'String',
             'package_name': 'com.smartdevicelink.proxy.rpc.enums',
             'class_name': 'SpeechCapabilities',
             'params': (
@@ -184,7 +175,6 @@ def test_VrCapabilities1(self):
         })
         expected = {
             'kind': 'simple',
-            'return_type': 'String',
             'package_name': 'com.smartdevicelink.proxy.rpc.enums',
             'class_name': 'VrCapabilities',
             'params': (
@@ -203,7 +193,6 @@ def test_ButtonName(self):
         })
         expected = {
             'kind': 'simple',
-            'return_type': 'String',
             'package_name': 'com.smartdevicelink.proxy.rpc.enums',
             'class_name': 'ButtonName',
             'params': (
@@ -223,7 +212,6 @@ def test_Dimension(self):
         })
         expected = {
             'kind': 'custom',
-            'return_type': 'String',
             'package_name': 'com.smartdevicelink.proxy.rpc.enums',
             'class_name': 'Dimension',
             'params': (
@@ -245,7 +233,6 @@ def test_VehicleDataEventStatus(self):
         })
         expected = {
             'kind': 'simple',
-            'return_type': 'String',
             'package_name': 'com.smartdevicelink.proxy.rpc.enums',
             'class_name': 'VehicleDataEventStatus',
             'params': (
@@ -266,7 +253,6 @@ def test_SystemCapabilityType(self):
         item = Enum(name='SystemCapabilityType', elements=elements)
         expected = {
             'kind': 'simple',
-            'return_type': 'String',
             'package_name': 'com.smartdevicelink.proxy.rpc.enums',
             'class_name': 'SystemCapabilityType',
             'params': (