Added 'protocol' field to Device struct (cf. #17)

TODO.md

@@ -2,9 +2,19 @@
 
 - [ ] TCP/IP protocol (cf. https://github.com/uhppoted/uhppote-core/issues/17)
       - [x] Verify TCP with real controller
+      - [ ] Rework address as *netip.AddrPort
+            - [x] uhppote-core
+            - [ ] Update uhppoted-lib::conf
+            - [ ] Update throughout
+                  - [x] uhppote-cli
+                  - [ ] uhppoted-lib
+            = [ ] Replace pointer with zero value
       - [ ] Add protocol field to UHPPOTE controller struct
-            - [ ] Rework address as *netip.AddrPort
+            - [ ] uhppote-core
             - [ ] Update uhppoted-lib::conf
+            - [ ] Update throughout
+                  - [ ] uhppote-cli
+                  - [ ] uhppoted-lib
       - [ ] TCP 'driver'
       - [ ] CHANGELOG
       - [ ] README

uhppote/device.go

@@ -13,6 +13,7 @@ type Device struct {
 	Address  *netip.AddrPort // controller IPv4 address
 	Doors    []string        // controller door names (required for ACL functions)
 	TimeZone *time.Location  // controller timezone (required when controller is located in a different time zone to the application)
+	Protocol string          // controller network protocol ("udp", "tcp", "any")
 }
 
 // Convenience function to instantiate a configured controller from the information in a configuration file.
@@ -23,6 +24,7 @@ func NewDevice(name string, serialNumber uint32, address *netip.AddrPort, doors
 		Address:  address,
 		Doors:    doors,
 		TimeZone: time.Local,
+		Protocol: "udp",
 	}
 }
 
@@ -34,6 +36,7 @@ func (d Device) Clone() Device {
 		Address:  nil,
 		Doors:    make([]string, len(d.Doors)),
 		TimeZone: d.TimeZone,
+		Protocol: d.Protocol,
 	}
 
 	if d.Address != nil {

uhppote/device_test.go

@@ -0,0 +1,79 @@
+package uhppote
+
+import (
+	"net/netip"
+	"reflect"
+	"testing"
+	"time"
+)
+
+func TestNewDevice(t *testing.T) {
+	address := netip.MustParseAddrPort("192.168.1.100:60000")
+
+	expected := Device{
+		Name:     "Alpha",
+		DeviceID: 405419896,
+		Address:  &address,
+		Doors: []string{
+			"Gryffindor",
+			"Hufflepuff",
+			"Ravenclaw",
+			"Slytherin",
+		},
+		TimeZone: time.Local,
+		Protocol: "udp",
+	}
+
+	device := NewDevice("Alpha", 405419896, &address, []string{
+		"Gryffindor",
+		"Hufflepuff",
+		"Ravenclaw",
+		"Slytherin",
+	})
+
+	if device == nil {
+		t.Fatalf("error creating Device (%v)", device)
+	}
+
+	if !reflect.DeepEqual(*device, expected) {
+		t.Errorf("incorrectly created Device\nexpected: %+v\ngot:      %+v", expected, *device)
+	}
+}
+
+func TestDeviceClone(t *testing.T) {
+	address := netip.MustParseAddrPort("192.168.1.100:60000")
+
+	expected := Device{
+		Name:     "Alpha",
+		DeviceID: 405419896,
+		Address:  &address,
+		Doors: []string{
+			"Gryffindor",
+			"Hufflepuff",
+			"Ravenclaw",
+			"Slytherin",
+		},
+		TimeZone: time.FixedZone("UTC-8", -8*60*60),
+		Protocol: "udp",
+	}
+
+	device := Device{
+		Name:     "Alpha",
+		DeviceID: 405419896,
+		Address:  &address,
+		Doors: []string{
+			"Gryffindor",
+			"Hufflepuff",
+			"Ravenclaw",
+			"Slytherin",
+		},
+		TimeZone: time.FixedZone("UTC-8", -8*60*60),
+		Protocol: "udp",
+	}
+
+	cloned := device.Clone()
+
+	if !reflect.DeepEqual(cloned, expected) {
+		t.Errorf("incorrectly cloned Device\nexpected: %+v\ngot:      %+v", expected, cloned)
+	}
+}