Update e2e tests

- Fix native configs for win in sample app. - Integrate spring-native with samples app. - Tweak e2e workflow to upload artifacts and some other generic changes. - Relates #401
2022-05-08 14:18:47 +01:00
parent 6d39c2b059
commit c6a8e1c65c
7 changed files with 727 additions and 18 deletions
--- a/spring-shell-samples/src/main/resources/META-INF/native-image/jni-config.json
+++ b/spring-shell-samples/src/main/resources/META-INF/native-image/jni-config.json
@@ -0,0 +1,512 @@
+[
+  {
+    "name" : "com.sun.jna.Native",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true
+  },
+  {
+    "name" : "java.lang.Class",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true
+  },
+  {
+    "name" : "java.lang.reflect.Method",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true
+  },
+  {
+    "name" : "java.lang.String",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true
+  },
+  {
+    "name" : "java.nio.Buffer",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true
+  },
+  {
+    "name" : "java.nio.ByteBuffer",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true
+  },
+  {
+    "name" : "java.nio.CharBuffer",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true
+  },
+  {
+    "name" : "java.nio.ShortBuffer",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true
+  },
+  {
+    "name" : "java.nio.IntBuffer",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true
+  },
+  {
+    "name" : "java.nio.LongBuffer",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true
+  },
+  {
+    "name" : "java.nio.FloatBuffer",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true
+  },
+  {
+    "name" : "java.nio.DoubleBuffer",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true
+  },
+  {
+    "name" : "java.lang.Void",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true,
+    "fields" : [
+      { "name" : "TYPE" }
+    ]
+  },
+  {
+    "name" : "java.lang.Boolean",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true,
+    "fields" : [
+      { "name" : "value", "allowWrite" : true },
+      { "name" : "TYPE" }
+    ]
+  },
+  {
+    "name" : "java.lang.Byte",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true,
+    "fields" : [
+      { "name" : "value", "allowWrite" : true },
+      { "name" : "TYPE" }
+    ]
+  },
+  {
+    "name" : "java.lang.Character",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true,
+    "fields" : [
+      { "name" : "value", "allowWrite" : true },
+      { "name" : "TYPE" }
+    ]
+  },
+  {
+    "name" : "java.lang.Short",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true,
+    "fields" : [
+      { "name" : "value", "allowWrite" : true },
+      { "name" : "TYPE" }
+    ]
+  },
+  {
+    "name" : "java.lang.Integer",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true,
+    "fields" : [
+      { "name" : "value", "allowWrite" : true },
+      { "name" : "TYPE" }
+    ]
+  },
+  {
+    "name" : "java.lang.Long",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true,
+    "fields" : [
+      { "name" : "value", "allowWrite" : true },
+      { "name" : "TYPE" }
+    ]
+  },
+  {
+    "name" : "java.lang.Float",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true,
+    "fields" : [
+      { "name" : "value", "allowWrite" : true },
+      { "name" : "TYPE" }
+    ]
+  },
+  {
+    "name" : "java.lang.Double",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true,
+    "fields" : [
+      { "name" : "value", "allowWrite" : true },
+      { "name" : "TYPE" }
+    ]
+  },
+  {
+    "name" : "com.sun.jna.Pointer",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true,
+    "fields" : [
+      { "name" : "peer", "allowWrite" : true }
+    ]
+  },
+  {
+    "name" : "com.sun.jna.Structure$ByValue",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true
+  },
+  {
+    "name" : "com.sun.jna.WString",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true
+  },
+  {
+    "name" : "com.sun.jna.NativeMapped",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true
+  },
+  {
+    "name" : "com.sun.jna.IntegerType",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true
+  },
+  {
+    "name" : "com.sun.jna.PointerType",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true
+  },
+  {
+    "name" : "com.sun.jna.JNIEnv",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true
+  },
+  {
+    "name" : "com.sun.jna.Native$ffi_callback",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true
+  },
+  {
+    "name" : "com.sun.jna.FromNativeConverter",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true
+  },
+  {
+    "name" : "com.sun.jna.Structure",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true,
+    "fields" : [
+      { "name" : "memory", "allowWrite" : true },
+      { "name" : "typeInfo", "allowWrite" : true }
+    ],
+    "methods" : [
+      { "name" : "newInstance", "parameterTypes" : ["java.lang.Class","com.sun.jna.Pointer"] },
+      { "name" : "newInstance", "parameterTypes" : ["java.lang.Class", "long"] },
+      { "name" : "newInstance", "parameterTypes" : ["java.lang.Class"] },
+      { "name" : "getTypeInfo", "parameterTypes": ["java.lang.Object"] }
+    ]
+  },
+  {
+    "name" : "com.sun.jna.Callback",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true
+  },
+  {
+    "name" : "com.sun.jna.CallbackReference$AttachOptions",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true
+  },
+  {
+    "name" : "com.sun.jna.CallbackReference",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true
+  },
+  {
+    "name" : "com.sun.jna.IntegerType",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true,
+    "fields" : [
+      { "name" : "value", "allowWrite" : true }
+    ]
+  },
+  {
+    "name" : "com.sun.jna.PointerType",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true,
+    "fields" : [
+      { "name" : "pointer", "allowWrite" : true }
+    ]
+  },
+  {
+    "name" : "com.sun.jna.Structure$FFIType",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true
+  },
+  {
+    "name" : "com.sun.jna.Structure$FFIType$size_t",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true
+  },
+  {
+    "name" : "com.sun.jna.Structure$FFIType$FFITypes",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true,
+    "fields" : [
+      { "name" : "ffi_type_void", "allowWrite" : true },
+      { "name" : "ffi_type_float", "allowWrite" : true },
+      { "name" : "ffi_type_double", "allowWrite" : true },
+      { "name" : "ffi_type_longdouble", "allowWrite" : true },
+      { "name" : "ffi_type_uint8", "allowWrite" : true },
+      { "name" : "ffi_type_sint8", "allowWrite" : true },
+      { "name" : "ffi_type_uint16", "allowWrite" : true },
+      { "name" : "ffi_type_sint16", "allowWrite" : true },
+      { "name" : "ffi_type_uint32", "allowWrite" : true },
+      { "name" : "ffi_type_sint32", "allowWrite" : true },
+      { "name" : "ffi_type_uint64", "allowWrite" : true },
+      { "name" : "ffi_type_sint64", "allowWrite" : true },
+      { "name" : "ffi_type_pointer", "allowWrite" : true }
+    ]
+  },
+  {
+    "name" : "com.sun.jna.NativeLong",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true
+  },
+  {
+    "name" : "com.sun.jna.ptr.PointerByReference",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true
+  },
+  {
+    "name" : "org.jline.terminal.impl.jna.win.Kernel32$CHAR_INFO",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true,
+    "fields" : [
+      { "name" : "uChar", "allowWrite" : true },
+      { "name" : "Attributes", "allowWrite" : true }
+    ]
+  },
+  {
+    "name" : "org.jline.terminal.impl.jna.win.Kernel32$CONSOLE_CURSOR_INFO",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true,
+    "fields" : [
+      { "name" : "dwSize", "allowWrite" : true },
+      { "name" : "bVisible", "allowWrite" : true }
+    ]
+  },
+  {
+    "name" : "org.jline.terminal.impl.jna.win.Kernel32$CONSOLE_SCREEN_BUFFER_INFO",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true,
+    "fields" : [
+      { "name" : "dwSize", "allowWrite" : true },
+      { "name" : "dwCursorPosition", "allowWrite" : true },
+      { "name" : "wAttributes", "allowWrite" : true },
+      { "name" : "srWindow", "allowWrite" : true },
+      { "name" : "dwMaximumWindowSize", "allowWrite" : true }
+    ]
+  },
+  {
+    "name" : "org.jline.terminal.impl.jna.win.Kernel32$COORD",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true,
+    "fields" : [
+      { "name" : "X", "allowWrite" : true },
+      { "name" : "Y", "allowWrite" : true }
+    ]
+  },
+  {
+    "name" : "org.jline.terminal.impl.jna.win.Kernel32$INPUT_RECORD",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true,
+    "fields" : [
+      { "name" : "EventType", "allowWrite" : true },
+      { "name" : "Event", "allowWrite" : true }
+    ]
+  },
+  {
+    "name" : "org.jline.terminal.impl.jna.win.Kernel32$INPUT_RECORD$EventUnion",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true,
+    "fields" : [
+      { "name" : "KeyEvent", "allowWrite" : true },
+      { "name" : "MouseEvent", "allowWrite" : true },
+      { "name" : "WindowBufferSizeEvent", "allowWrite" : true },
+      { "name" : "MenuEvent", "allowWrite" : true },
+      { "name" : "FocusEvent", "allowWrite" : true }
+    ]
+  },
+  {
+    "name" : "org.jline.terminal.impl.jna.win.Kernel32$KEY_EVENT_RECORD",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true,
+    "fields" : [
+      { "name" : "bKeyDown", "allowWrite" : true },
+      { "name" : "wRepeatCount", "allowWrite" : true },
+      { "name" : "wVirtualKeyCode", "allowWrite" : true },
+      { "name" : "wVirtualScanCode", "allowWrite" : true },
+      { "name" : "uChar", "allowWrite" : true },
+      { "name" : "dwControlKeyState", "allowWrite" : true }
+    ]
+  },
+  {
+    "name" : "org.jline.terminal.impl.jna.win.Kernel32$MOUSE_EVENT_RECORD",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true,
+    "fields" : [
+      { "name" : "dwMousePosition", "allowWrite" : true },
+      { "name" : "dwButtonState", "allowWrite" : true },
+      { "name" : "dwControlKeyState", "allowWrite" : true },
+      { "name" : "dwEventFlags", "allowWrite" : true }
+    ]
+  },
+  {
+    "name" : "org.jline.terminal.impl.jna.win.Kernel32$WINDOW_BUFFER_SIZE_RECORD",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true,
+    "fields" : [
+      { "name" : "dwSize", "allowWrite" : true }
+    ]
+  },
+  {
+    "name" : "org.jline.terminal.impl.jna.win.Kernel32$MENU_EVENT_RECORD",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true,
+    "fields" : [
+      { "name" : "dwCommandId", "allowWrite" : true }
+    ]
+  },
+  {
+    "name" : "org.jline.terminal.impl.jna.win.Kernel32$FOCUS_EVENT_RECORD",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true,
+    "fields" : [
+      { "name" : "bSetFocus", "allowWrite" : true }
+    ]
+  },
+  {
+    "name" : "org.jline.terminal.impl.jna.win.Kernel32$SMALL_RECT",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true,
+    "fields" : [
+      { "name" : "Left", "allowWrite" : true },
+      { "name" : "Top", "allowWrite" : true },
+      { "name" : "Right", "allowWrite" : true },
+      { "name" : "Bottom", "allowWrite" : true }
+    ]
+  },
+  {
+    "name" : "org.jline.terminal.impl.jna.win.Kernel32$UnionChar",
+    "allDeclaredConstructors" : true,
+    "allPublicConstructors" : true,
+    "allDeclaredMethods" : true,
+    "allPublicMethods" : true,
+    "fields" : [
+      { "name" : "UnicodeChar", "allowWrite" : true },
+      { "name" : "AsciiChar", "allowWrite" : true }
+    ]
+  }
+]
--- a/spring-shell-samples/src/main/resources/META-INF/native-image/reflect-config.json
+++ b/spring-shell-samples/src/main/resources/META-INF/native-image/reflect-config.json
@@ -1,9 +0,0 @@
-[
-  {
-    "name":"org.springframework.shell.samples.jcommander.Args",
-    "allDeclaredFields":true,
-    "queryAllDeclaredMethods":true,
-    "queryAllDeclaredConstructors":true,
-    "methods":[{"name":"<init>","parameterTypes":[] }]
-  }
-]
--- a/spring-shell-samples/src/main/resources/META-INF/spring.factories
+++ b/spring-shell-samples/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.nativex.type.NativeConfiguration=\
+org.springframework.shell.samples.config.SpringShellNativeConfiguration