add test for #78 (#86)

- add enum type to all_datatypes integration test
- remove cppcli namespace conversion that replaces . with :: inline.

Author: jothepro

src/it/resources/all_datatypes.djinni

@@ -1,3 +1,8 @@
+enum_data = enum {
+  a;
+  b;
+}
+
 all_datatypes = record {
   booleanData: bool;
   integer8Data: i8;
@@ -13,4 +18,5 @@ all_datatypes = record {
   setData: set<bool>;
   mapData: map<i8, bool>;
   optionalData: optional<bool>;
+  enum_data: enum_data;
 }

src/it/resources/expected/all_datatypes/cpp-headers/all_datatypes.hpp

@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include "enum_data.hpp"
 #include <chrono>
 #include <cstdint>
 #include <optional>
@@ -27,6 +28,7 @@ struct AllDatatypes final {
     std::unordered_set<bool> setData;
     std::unordered_map<int8_t, bool> mapData;
     std::optional<bool> optionalData;
+    EnumData enum_data;
 
     AllDatatypes(bool booleanData_,
                  int8_t integer8Data_,
@@ -41,7 +43,8 @@ struct AllDatatypes final {
                  std::vector<bool> listData_,
                  std::unordered_set<bool> setData_,
                  std::unordered_map<int8_t, bool> mapData_,
-                 std::optional<bool> optionalData_)
+                 std::optional<bool> optionalData_,
+                 EnumData enum_data_)
     : booleanData(std::move(booleanData_))
     , integer8Data(std::move(integer8Data_))
     , integer16Data(std::move(integer16Data_))
@@ -56,6 +59,7 @@ struct AllDatatypes final {
     , setData(std::move(setData_))
     , mapData(std::move(mapData_))
     , optionalData(std::move(optionalData_))
+    , enum_data(std::move(enum_data_))
     {}
 
     AllDatatypes()
@@ -73,5 +77,6 @@ struct AllDatatypes final {
     , setData()
     , mapData()
     , optionalData()
+    , enum_data()
     {}
 };

src/it/resources/expected/all_datatypes/cpp-headers/enum_data.hpp

@@ -0,0 +1,22 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file was generated by Djinni from all_datatypes.djinni
+
+#pragma once
+
+#include <functional>
+
+enum class EnumData : int {
+    A,
+    B,
+};
+
+namespace std {
+
+template <>
+struct hash<::EnumData> {
+    size_t operator()(::EnumData type) const {
+        return std::hash<int>()(static_cast<int>(type));
+    }
+};
+
+}  // namespace std

src/it/resources/expected/all_datatypes/cppcli/AllDatatypes.cpp

@@ -18,7 +18,8 @@ AllDatatypes::AllDatatypes(bool booleanData,
                            System::Collections::Generic::List<bool>^ listData,
                            System::Collections::Generic::HashSet<bool>^ setData,
                            System::Collections::Generic::Dictionary<char, bool>^ mapData,
-                           System::Nullable<bool> optionalData)
+                           System::Nullable<bool> optionalData,
+                           ::EnumData enumData)
 : _booleanData(booleanData)
 , _integer8Data(integer8Data)
 , _integer16Data(integer16Data)
@@ -33,6 +34,7 @@ AllDatatypes::AllDatatypes(bool booleanData,
 , _setData(setData)
 , _mapData(mapData)
 , _optionalData(optionalData)
+, _enumData(enumData)
 {}
 
 bool AllDatatypes::BooleanData::get()
@@ -105,9 +107,14 @@ System::Nullable<bool> AllDatatypes::OptionalData::get()
     return _optionalData;
 }
 
+EnumData AllDatatypes::EnumData::get()
+{
+    return _enumData;
+}
+
 System::String^ AllDatatypes::ToString()
 {
-    return System::String::Format("AllDatatypes {{BooleanData{0}, Integer8Data{1}, Integer16Data{2}, Integer32Data{3}, Integer64Data{4}, Float32Data{5}, Float64Data{6}, StringData{7}, BinaryData{8}, DateData{9}, ListData{10}, SetData{11}, MapData{12}, OptionalData{13}}}",
+    return System::String::Format("AllDatatypes {{BooleanData{0}, Integer8Data{1}, Integer16Data{2}, Integer32Data{3}, Integer64Data{4}, Float32Data{5}, Float64Data{6}, StringData{7}, BinaryData{8}, DateData{9}, ListData{10}, SetData{11}, MapData{12}, OptionalData{13}, EnumData{14}}}",
                                   BooleanData,
                                   Integer8Data,
                                   Integer16Data,
@@ -121,7 +128,8 @@ System::String^ AllDatatypes::ToString()
                                   ListData,
                                   SetData,
                                   MapData,
-                                  OptionalData);
+                                  OptionalData,
+                                  EnumData);
 }
 
 AllDatatypes::CppType AllDatatypes::ToCpp(AllDatatypes::CsType cs)
@@ -140,7 +148,8 @@ AllDatatypes::CppType AllDatatypes::ToCpp(AllDatatypes::CsType cs)
             ::djinni::List<::djinni::Bool>::ToCpp(cs->ListData),
             ::djinni::Set<::djinni::Bool>::ToCpp(cs->SetData),
             ::djinni::Map<::djinni::I8, ::djinni::Bool>::ToCpp(cs->MapData),
-            ::djinni::Optional<std::optional, ::djinni::Bool>::ToCpp(cs->OptionalData)};
+            ::djinni::Optional<std::optional, ::djinni::Bool>::ToCpp(cs->OptionalData),
+            ::djinni::Enum<::EnumData, ::EnumData>::ToCpp(cs->EnumData)};
 }
 
 AllDatatypes::CsType AllDatatypes::FromCpp(const AllDatatypes::CppType& cpp)
@@ -158,5 +167,6 @@ AllDatatypes::CsType AllDatatypes::FromCpp(const AllDatatypes::CppType& cpp)
                               ::djinni::List<::djinni::Bool>::FromCpp(cpp.listData),
                               ::djinni::Set<::djinni::Bool>::FromCpp(cpp.setData),
                               ::djinni::Map<::djinni::I8, ::djinni::Bool>::FromCpp(cpp.mapData),
-                              ::djinni::Optional<std::optional, ::djinni::Bool>::FromCpp(cpp.optionalData));
+                              ::djinni::Optional<std::optional, ::djinni::Bool>::FromCpp(cpp.optionalData),
+                              ::djinni::Enum<::EnumData, ::EnumData>::FromCpp(cpp.enum_data));
 }

src/it/resources/expected/all_datatypes/cppcli/AllDatatypes.hpp

@@ -4,6 +4,7 @@
 #pragma once
 
 #include "../cpp-headers/all_datatypes.hpp"
+#include "EnumData.hpp"
 
 [System::Serializable]
 public ref class AllDatatypes {
@@ -79,6 +80,11 @@ public ref class AllDatatypes {
         System::Nullable<bool> get();
     }
 
+    property ::EnumData EnumData
+    {
+        ::EnumData get();
+    }
+
     AllDatatypes(bool booleanData,
                  char integer8Data,
                  short integer16Data,
@@ -92,7 +98,8 @@ public ref class AllDatatypes {
                  System::Collections::Generic::List<bool>^ listData,
                  System::Collections::Generic::HashSet<bool>^ setData,
                  System::Collections::Generic::Dictionary<char, bool>^ mapData,
-                 System::Nullable<bool> optionalData);
+                 System::Nullable<bool> optionalData,
+                 ::EnumData enumData);
 
     System::String^ ToString() override;
 
@@ -118,4 +125,5 @@ public ref class AllDatatypes {
     System::Collections::Generic::HashSet<bool>^ _setData;
     System::Collections::Generic::Dictionary<char, bool>^ _mapData;
     System::Nullable<bool> _optionalData;
+    ::EnumData _enumData;
 };

src/it/resources/expected/all_datatypes/cppcli/EnumData.cpp

@@ -0,0 +1,7 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file was generated by Djinni from all_datatypes.djinni
+
+#include "EnumData.hpp"  // my header
+#include "../cpp-headers/enum_data.hpp"
+
+// Empty... making sure the symbols get included in the build.

src/it/resources/expected/all_datatypes/cppcli/EnumData.hpp

@@ -0,0 +1,11 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file was generated by Djinni from all_datatypes.djinni
+
+#pragma once
+
+#include "../cpp-headers/enum_data.hpp"
+
+public enum class EnumData {
+    A,
+    B,
+};

src/it/resources/expected/all_datatypes/cwrapper-headers/dh__all_datatypes.h

@@ -24,5 +24,6 @@ void all_datatypes_add_callback_get_all_datatypes_f11(struct DjinniObjectHandle
 void all_datatypes_add_callback_get_all_datatypes_f12(struct DjinniObjectHandle *( * ptr)(struct DjinniRecordHandle *));
 void all_datatypes_add_callback_get_all_datatypes_f13(struct DjinniObjectHandle *( * ptr)(struct DjinniRecordHandle *));
 void all_datatypes_add_callback_get_all_datatypes_f14(struct DjinniBoxedBool *( * ptr)(struct DjinniRecordHandle *));
-void all_datatypes_add_callback_create_all_datatypes(struct DjinniRecordHandle *( * ptr)(bool, int8_t, int16_t, int32_t, int64_t, float, double, struct DjinniString *, struct DjinniBinary *, uint64_t, struct DjinniObjectHandle *, struct DjinniObjectHandle *, struct DjinniObjectHandle *, struct DjinniBoxedBool *));
+void all_datatypes_add_callback_get_all_datatypes_f15(int( * ptr)(struct DjinniRecordHandle *));
+void all_datatypes_add_callback_create_all_datatypes(struct DjinniRecordHandle *( * ptr)(bool, int8_t, int16_t, int32_t, int64_t, float, double, struct DjinniString *, struct DjinniBinary *, uint64_t, struct DjinniObjectHandle *, struct DjinniObjectHandle *, struct DjinniObjectHandle *, struct DjinniBoxedBool *, int));
 void all_datatypes_add_callback___delete(void( * ptr)(struct DjinniRecordHandle *));

src/it/resources/expected/all_datatypes/cwrapper-headers/dh__enum_data.h

@@ -0,0 +1,6 @@
+// AUTOGENERATED FILE - DO NOT MODIFY!
+// This file was generated by Djinni from all_datatypes.djinni
+
+#pragma once // python_cdef_ignore
+#include <stdbool.h>  // python_cdef_ignore
+

src/it/resources/expected/all_datatypes/cwrapper/dh__all_datatypes.cpp

@@ -7,9 +7,11 @@
 #include "../cpp-headers/all_datatypes.hpp"
 
 #include "dh__all_datatypes.hpp"
+#include "dh__enum_data.hpp"
 #include "dh__list_bool.hpp"
 #include "dh__map_int8_t_bool.hpp"
 #include "dh__set_bool.hpp"
+#include "enum_data.hpp"
 #include <chrono>
 #include <optional>
 #include <vector>
@@ -109,9 +111,15 @@ void all_datatypes_add_callback_get_all_datatypes_f14(DjinniBoxedBool *( * ptr)(
     s_callback_all_datatypes_get_all_datatypes_f14 = ptr;
 }
 
-static DjinniRecordHandle * ( * s_callback_all_datatypes_create_all_datatypes)(bool, int8_t, int16_t, int32_t, int64_t, float, double, DjinniString *, DjinniBinary *, uint64_t, DjinniObjectHandle *, DjinniObjectHandle *, DjinniObjectHandle *, DjinniBoxedBool *);
+static int ( * s_callback_all_datatypes_get_all_datatypes_f15)(DjinniRecordHandle *);
 
-void all_datatypes_add_callback_create_all_datatypes(DjinniRecordHandle *( * ptr)(bool, int8_t, int16_t, int32_t, int64_t, float, double, DjinniString *, DjinniBinary *, uint64_t, DjinniObjectHandle *, DjinniObjectHandle *, DjinniObjectHandle *, DjinniBoxedBool *)) {
+void all_datatypes_add_callback_get_all_datatypes_f15(int( * ptr)(DjinniRecordHandle *)) {
+    s_callback_all_datatypes_get_all_datatypes_f15 = ptr;
+}
+
+static DjinniRecordHandle * ( * s_callback_all_datatypes_create_all_datatypes)(bool, int8_t, int16_t, int32_t, int64_t, float, double, DjinniString *, DjinniBinary *, uint64_t, DjinniObjectHandle *, DjinniObjectHandle *, DjinniObjectHandle *, DjinniBoxedBool *, int);
+
+void all_datatypes_add_callback_create_all_datatypes(DjinniRecordHandle *( * ptr)(bool, int8_t, int16_t, int32_t, int64_t, float, double, DjinniString *, DjinniBinary *, uint64_t, DjinniObjectHandle *, DjinniObjectHandle *, DjinniObjectHandle *, DjinniBoxedBool *, int)) {
     s_callback_all_datatypes_create_all_datatypes = ptr;
 }
 
@@ -138,7 +146,8 @@ djinni::Handle<DjinniRecordHandle> DjinniAllDatatypes::fromCpp(const ::AllDataty
             _field_listData.release(),
             _field_setData.release(),
             _field_mapData.release(),
-            _field_optionalData.release()),
+            _field_optionalData.release(),
+            int32_from_enum_enum_data(dr.enum_data)),
         all_datatypes___delete);
     return _aux;
 }
@@ -165,7 +174,8 @@ ::AllDatatypes DjinniAllDatatypes::toCpp(djinni::Handle<DjinniRecordHandle> dh)
         DjinniListBool::toCpp(std::move( _field_listData)),
         DjinniSetBool::toCpp(std::move( _field_setData)),
         DjinniMapInt8TBool::toCpp(std::move( _field_mapData)),
-        DjinniBoxedBool::toCpp(std::move( _field_optionalData)));
+        DjinniBoxedBool::toCpp(std::move( _field_optionalData)),
+        static_cast<::EnumData>(s_callback_all_datatypes_get_all_datatypes_f15(dh.get())));
     return _aux;
 }