Merge branch 'join-value-uplink' of https://github.com/swimos/swim-rust into example_app_join_value

Author: SirCipher

api/swimos_api/src/lane/mod.rs

@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#[cfg(test)]
+mod tests;
+
 use std::fmt::{Display, Formatter};
 
 use swimos_form::structural::Tag;
@@ -61,7 +64,10 @@ impl WarpLaneKind {
 
     pub fn uplink_kind(&self) -> UplinkKind {
         match self {
-            WarpLaneKind::Map | WarpLaneKind::DemandMap | WarpLaneKind::JoinMap => UplinkKind::Map,
+            WarpLaneKind::Map
+            | WarpLaneKind::DemandMap
+            | WarpLaneKind::JoinMap
+            | WarpLaneKind::JoinValue => UplinkKind::Map,
             WarpLaneKind::Supply => UplinkKind::Supply,
             WarpLaneKind::Spatial => todo!("Spatial uplinks not supported."),
             _ => UplinkKind::Value,

api/swimos_api/src/lane/tests.rs

@@ -0,0 +1,35 @@
+use crate::agent::UplinkKind;
+use crate::lane::WarpLaneKind;
+
+// spatial lanes are omitted as they are unimplemented
+const LANE_KINDS: [WarpLaneKind; 8] = [
+    WarpLaneKind::Command,
+    WarpLaneKind::Demand,
+    WarpLaneKind::DemandMap,
+    WarpLaneKind::Map,
+    WarpLaneKind::JoinMap,
+    WarpLaneKind::JoinValue,
+    WarpLaneKind::Supply,
+    WarpLaneKind::Value,
+];
+
+#[test]
+fn uplink_kinds() {
+    for kind in LANE_KINDS {
+        let uplink_kind = kind.uplink_kind();
+        if kind.map_like() {
+            assert_eq!(uplink_kind, UplinkKind::Map);
+        } else if matches!(kind, WarpLaneKind::Supply) {
+            assert_eq!(uplink_kind, UplinkKind::Supply);
+        } else {
+            assert_eq!(uplink_kind, UplinkKind::Value)
+        }
+    }
+}
+
+// this is here for when spatial lanes are implemented as the test will no longer panic
+#[test]
+#[should_panic]
+fn spatial_uplink_kind() {
+    WarpLaneKind::Spatial.uplink_kind();
+}