fix(fjage): adding test for ParameterChangeNtf and fixed implementati…

…on issue
org-arl · Jan 22, 2024 · 4945921 · 4945921
1 parent 904176b
commit 4945921
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 5 deletions.
diff --git a/src/main/java/org/arl/fjage/param/ParameterMessageBehavior.java b/src/main/java/org/arl/fjage/param/ParameterMessageBehavior.java
@@ -241,13 +241,13 @@ protected ParameterRsp processParameterReq(ParameterReq msg, ParameterRsp rsp) {
             }
             if (sv != null) {
               rsp.set(e.param, sv, false);
-              if (sv != current) onParamChange(e.param, ndx, sv);
+              if (!sv.equals(current)) onParamChange(e.param, ndx, sv);
             }
           } catch (NoSuchMethodException ex) {
             Object rv = setParam(e.param, ndx, evalue);
             if (rv != null) {
               rsp.set(e.param, rv, isReadOnly(e.param, ndx));
-              if (rv != current) onParamChange(e.param, ndx, rv);
+              if (!rv.equals(current)) onParamChange(e.param, ndx, rv);
             } else {
               if (ndx >= 0) throw ex;
               Field f = cls.getField(fldName);
@@ -259,7 +259,7 @@ protected ParameterRsp processParameterReq(ParameterReq msg, ParameterRsp rsp) {
               }
               rv = f.get(agent);
               rsp.set(e.param, rv, ro);
-              if (rv != current) onParamChange(e.param, ndx, rv);
+              if (!rv.equals(current)) onParamChange(e.param, ndx, rv);
             }
           }
         }

diff --git a/src/test/java/org/arl/fjage/test/BasicTests.java b/src/test/java/org/arl/fjage/test/BasicTests.java
@@ -493,6 +493,30 @@ public void testAIDParam() {
     assertTrue(client1.count + client2.count + client3.count > 100);
   }
 
+  @Test
+  public void testParamNtf(){
+    log.info("testParamNtf");
+    Platform platform = new RealTimePlatform();
+    Container container = new Container(platform);
+    ParamServerAgent server = new ParamServerAgent(false);
+    ParamNtfClientAgent client = new ParamNtfClientAgent();
+    container.add("S", server);
+    container.add("C", client);
+    platform.start();
+    platform.delay(2000);
+    assertEquals(server.n, 1);
+    client.zVal = 7;
+    platform.delay(2000);
+    assertEquals(server.n, 2);
+    log.info("Warnings: "+client.warnings);
+    log.info("Errors: "+(server.errors + client.errors));
+    assertEquals(server.errors, 0);
+    assertEquals(client.errors, 0);
+    assertEquals(client.warnings, 0);
+    platform.shutdown();
+    platform.delay(2000);
+  }
+
   private static class RequestMessage extends Message {
     private static final long serialVersionUID = 1L;
     public int x;
@@ -517,12 +541,14 @@ public NuisanceMessage(AgentID recipient) {
   }
 
   public enum Params implements Parameter {
-    x, y, s
+    x, y, z, s
   }
 
   public class ParamServerAgent extends Agent {
     public int errors = 0;
     public int x = 1;
+    public int n = 0;
+    public int z = 0;
     public float getY() { return 2; }
     public String getS() { return "xxx"; }
     public int setX(int x) { return x+1; }
@@ -535,7 +561,12 @@ public ParamServerAgent(boolean yor) {
     @Override
     public void init() {
       register("server");
-      add(new ParameterMessageBehavior(Params.class));
+      add(new ParameterMessageBehavior(Params.class){
+        @Override
+        protected void onParamChange(Parameter p, int ndx, Object v) {
+          n++;
+        }
+      });
       add(new MessageBehavior() {
         @Override
         public void onReceive(Message msg) {
@@ -699,6 +730,39 @@ public void onTick() {
     }
   }
 
+  private class ParamNtfClientAgent extends Agent{
+    public int zVal = 4;
+    public int errors = 0;
+    public int warnings = 0;
+    public ParamNtfClientAgent() {
+      super();
+    }
+    @Override
+    public void init(){
+      delay(200);
+
+      AgentID server = agentForService("server");
+      if (server == null) {
+        log.warning("Unable to find server");
+        errors++;
+        return;
+      }
+      add(new TickerBehavior(100) {
+        @Override
+        public void onTick() {
+          Message req = new ParameterReq().set(Params.z, zVal);
+          req.setRecipient(server);
+          Message rsp = request(req, 1000);
+          if (rsp == null) {
+            log.warning("Unable to set z to " + zVal);
+            warnings++;
+          }
+        }
+      });
+    }
+
+  }
+
   private class AIDParamClientAgent extends Agent {
     public int errors = 0;
     public int warnings = 0;