Changed name of visitor functions for enums

Also added a test for unssported Enums of 64 bits.
ni · Jun 29, 2018 · 2be5809 · 2be5809
1 parent 50fdf2e
commit 2be5809
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/source/core/module_typeHelpers.js b/source/core/module_typeHelpers.js
@@ -51,16 +51,16 @@
             var fnName = '';
             switch (sizeOfEnum) {
             case 1:
-                visitFn = typeVisitor.visitEnumUInt8;
-                fnName = 'visitEnumUInt8';
+                visitFn = typeVisitor.visitEnum8;
+                fnName = 'visitEnum8';
                 break;
             case 2:
-                visitFn = typeVisitor.visitEnumUInt16;
-                fnName = 'visitEnumUInt16';
+                visitFn = typeVisitor.visitEnum16;
+                fnName = 'visitEnum16';
                 break;
             case 4:
-                visitFn = typeVisitor.visitEnumUInt32;
-                fnName = 'visitEnumUInt32';
+                visitFn = typeVisitor.visitEnum32;
+                fnName = 'visitEnum32';
                 break;
             default:
                 throw new Error('Unexpected size for Enum. Found: ' + sizeOfEnum);

diff --git a/test-it/karma/publicapi/TypeReflection.Test.js b/test-it/karma/publicapi/TypeReflection.Test.js
@@ -19,9 +19,9 @@ describe('The Vireo EggShell Reflection API', function () {
 
         return {
             visitBoolean: returnTypeName('Boolean'),
-            visitEnumUInt8: returnTypeName('Enum8'),
-            visitEnumUInt16: returnTypeName('Enum16'),
-            visitEnumUInt32: returnTypeName('Enum32'),
+            visitEnum8: returnTypeName('Enum8'),
+            visitEnum16: returnTypeName('Enum16'),
+            visitEnum32: returnTypeName('Enum32'),
             visitInt8: returnTypeName('Int8'),
             visitInt16: returnTypeName('Int16'),
             visitInt32: returnTypeName('Int32'),
@@ -98,13 +98,17 @@ describe('The Vireo EggShell Reflection API', function () {
                 expect(reflectOnEmptyVisitor('dataItem_String')).toThrowError(/visitString/);
                 expect(reflectOnEmptyVisitor('dataItem_Boolean')).toThrowError(/visitBoolean/);
                 expect(reflectOnEmptyVisitor('dataItem_Timestamp')).toThrowError(/visitTimestamp/);
-                expect(reflectOnEmptyVisitor('enum8alphabet')).toThrowError(/visitEnumUInt8/);
-                expect(reflectOnEmptyVisitor('enum16numbers')).toThrowError(/visitEnumUInt16/);
-                expect(reflectOnEmptyVisitor('enum32colors')).toThrowError(/visitEnumUInt32/);
+                expect(reflectOnEmptyVisitor('enum8alphabet')).toThrowError(/visitEnum8/);
+                expect(reflectOnEmptyVisitor('enum16numbers')).toThrowError(/visitEnum16/);
+                expect(reflectOnEmptyVisitor('enum32colors')).toThrowError(/visitEnum32/);
                 expect(reflectOnEmptyVisitor('wave_Double')).toThrowError(/visitAnalogWaveform/);
                 expect(reflectOnEmptyVisitor('dataItem_ClusterOfScalars')).toThrowError(/visitCluster/);
                 expect(reflectOnEmptyVisitor('dataItem_ArrayOfBoolean')).toThrowError(/visitArray/);
             });
+
+            it('throws for unsupported enum types', function () {
+                expect(reflectOnEmptyVisitor('enum64releases')).toThrowError(/Unexpected size/);
+            });
         });
 
         describe('dispatches a call on visitor', function () {