Organize more test commands, add test_blockwise_all()

Author: j-devel

examples/xbd-net/src/lib.rs

@@ -103,17 +103,10 @@ async fn xbd_main() -> Result<(), i8> {
     let req_internal_native = ("[fe80::78ec:5fff:febd:add9]:5683", "/.well-known/core");
     let req_external_native = ("[fe80::20be:cdff:fe0e:44a1]:5683", "/hello");
 
-    if 0 == 1 { // non-blocking
-        let cb = |out| { println!("@@ out: {:?}", out); };
-
-        //==== native, internal server
-        let (addr, uri) = req_internal_native;
-        Xbd::gcoap_get(addr, uri, cb);
-
-        //==== native, external server -- LD_LIBRARY_PATH=./libcoap/local/lib libcoap-minimal/server 5683 fe80::20be:cdff:fe0e:44a1%tap1 &
-        let (addr, uri) = req_external_native;
-        Xbd::gcoap_get(addr, uri, cb);
-    }
+    //==== native, internal server
+    //let (addr, uri) = req_internal_native;
+    //==== native, external server -- LD_LIBRARY_PATH=./libcoap/local/lib libcoap-minimal/server 5683 fe80::20be:cdff:fe0e:44a1%tap1 &
+    //let (addr, uri) = req_external_native;
 
     if 1 == 1 { // async, dev, server !!!!
         let addr_self = "[::1]:5683";
@@ -148,17 +141,11 @@ async fn xbd_main() -> Result<(), i8> {
             panic!("ok");
         }
 
-        if 0 == 1 {
-            println!("!! ======== dev calling non-blocking");
-            Xbd::gcoap_get(addr_self, "/cli/stats", |out| { println!("!! out: {:?}", out); });
-            Xbd::gcoap_get(addr_self, "/cli/stats", |out| { println!("!! out: {:?}", out); });
-        }
-
         // TODO async gcoap ping
 
         if 0 == 1 { // fileserver, blockwise, stream
             test_blockwise(addr_self).await.unwrap();
-            //panic!("debug ok"); // !!!!
+            panic!("debug ok"); // !!!!
         }
     }
 

examples/xbd-net/src/xbd/shell.rs

@@ -126,22 +126,30 @@ async fn test_async_sleep() {
     println!("test_async_sleep(): $$");
 }
 
-async fn test_async_blockwise_get() {
-    println!("test_async_blockwise_get(): ^^");
+async fn test_blockwise_all() {
+    println!("test_blockwise_all(): ^^");
+    crate::test_blockwise("[::1]:5683").await.unwrap();
+    println!("test_blockwise_all(): $$");
+}
+
+async fn test_async_blockwise() {
+    println!("test_async_blockwise(): ^^");
 
     let mut bs = crate::Xbd::async_gcoap_get_blockwise(
         "[::1]:5683", "/const/song.txt").unwrap();
     while let Some(req) = bs.next().await {
         println!("@@ out: {:?}", req.await);
     }
 
-    println!("test_async_blockwise_get(): $$");
+    println!("test_async_blockwise(): $$");
 }
 
 async fn test_heapless_req() {
     println!("test_heapless_req(): ^^");
-    let out = crate::Xbd::async_gcoap_get("[::1]", "/.well-known/core").await;
-    println!("@@ out: {:?}", out);
+    println!("-------- out-0:");
+    println!("{:?}", crate::Xbd::async_gcoap_get("[::1]", "/.well-known/core").await);
+    println!("-------- out-1:");
+    println!("{:?}", crate::Xbd::async_gcoap_get("[::1]", "/cli/stats").await);
     println!("test_heapless_req(): $$");
 }
 
@@ -162,6 +170,7 @@ const ARRAY_ALIAS_ENUMERATED: &[&str] = &[
 
 const ARRAY_ALIAS_FUNCTION: &[&str] = &[
     "f",
+    "b",
     "f0",
     "f1",
     "f2",
@@ -172,9 +181,10 @@ const ARRAY_ALIAS_FUNCTION: &[&str] = &[
 async fn run_function_alias(name: &str) {
     match name {
         "f" => test_heapless_req().await, // !!!!
+        "b" => test_blockwise_all().await, // nn | a debug, b
         "f0" => (|| println!("hello world!"))(),
         "f1" => test_async_sleep().await,
-        "f2" => test_async_blockwise_get().await,
+        "f2" => test_async_blockwise().await,
         "f3" => crate::test_blockwise("[::1]:5683").await.unwrap(),
         _ => println!("function alias [{}] is not defined!", name),
     }