diff --git a/notebooks/reachExpGPT/ReachExpGPT.ipynb b/notebooks/reachExpGPT/ReachExpGPT.ipynb index e7144cae..61d0f2bb 100644 --- a/notebooks/reachExpGPT/ReachExpGPT.ipynb +++ b/notebooks/reachExpGPT/ReachExpGPT.ipynb @@ -943,8 +943,8 @@ " val error_resp = AbsMsg(CBEnter, SubClassMatcher(Set(\"com.example.networkfailure.MainActivity$MyErrorListener\"), \"void onErrorResponse\\\\(.*\\\\)\", \"onErrorResponse\"),\n", " TopVal::f::Nil)\n", " val queue_add = AbsMsg(CIExit, SubClassMatcher(Set(\"com.android.volley.RequestQueue\"), \".* add\\\\(.*\\\\)\", \"queueAdd\"), TopVal::d::a::Nil)\n", - " val construct_req = AbsMsg(CIExit, SubClassMatcher(Set(\"com.android.volley.StringRequest\"), \".*.*\", \"consRequest\"),Nil)\n", - " val construct_err = AbsMsg(CIExit, SubClassMatcher(Set(\"com.example.networkfailure.MainActivity$MyErrorListener\"), \".*.*\", \"consErr\"), Nil) \n", + " val construct_req = AbsMsg(CIExit, SubClassMatcher(Set(\"com.android.volley.toolbox.StringRequest\"), \".*.*\", \"consRequest\"),TopVal::Nil)\n", + " val construct_err = AbsMsg(CIExit, SubClassMatcher(Set(\"com.example.networkfailure.MainActivity$MyErrorListener\"), \".*.*\", \"consErr\"), TopVal::Nil) \n", " val construct_with_error = LSSpec(f::Nil,Nil,construct_err,error_resp)\n", " val disallow = LSSpec(a::Nil, d::Nil, SDialog.showI,SpecSignatures.Activity_onDestroy_exit)\n", " val enableSpecs = Set[LSSpec]()\n", @@ -963,7 +963,10 @@ " val disallow = NetFail.disallow\n", " val enableSpecs = NetFail.enableSpecs\n", "\n", - " val query = Reachable(LifeState.Signature(\"com.example.networkfailure.MainActivity\", \"void fetchUserData()\"),82)\n", + " val dis = LSSpec(Nil,Nil, LSTrue, NetFail.construct_req.copy(mt=CIEnter))\n", + " val query = DisallowedCallin(\"com.example.networkfailure.MainActivity\",\"void fetchUserData()\", \n", + " dis)\n", + " //Reachable(LifeState.Signature(\"com.example.networkfailure.MainActivity\", \"void fetchUserData()\"),87)\n", " /*Reachable(LifeState.Signature(\"com.example.networkfailure.MainActivity$MyErrorListener\", \n", " \"void onErrorResponse(com.android.volley.VolleyError)\"), 52)*/\n", "\n", @@ -976,7 +979,7 @@ " outFolder = Some(configOutputDir.toString),\n", " initialQuery = List(query), truncateOut=false,\n", " specSet = PickleSpec(NetFail.enableSpecs, \n", - " Set(disallow), \n", + " Set(dis), \n", " NetFail.allMsg\n", " ),\n", " componentFilter = None,\n", @@ -1009,7 +1012,7 @@ " }\n", "}\n", "\n", - "if(rerun){\n", + "if(true || rerun){\n", " runNetFail()\n", "}\n", "\n", @@ -1078,7 +1081,7 @@ " val enableSpecs = IneffNet.enableSpecs\n", "\n", " val query = //Reachable(LifeState.Signature(\"com.example.inefficientnetwork.MainActivity\", \"void fetchArticles()\"),67)\n", - " DisallowedCallin(\"android.widget.TextView\",\"void setText(java.lang.CharSequence)\", IneffNet.disallow)\n", + " DisallowedCallin(\"com.example.inefficientnetwork.MainActivity\",\"void fetchArticles()\", IneffNet.disallow)\n", " //DisallowedCallin(\"com.example.inefficientnetwork.MainActivity\", \"void fetchArticles()\", IneffNet.disallow)\n", " //DisallowedCallin(\"com.android.volley.toolbox.Volley\", \"com.android.volley.RequestQueue newRequestQueue(android.content.Context)\", IneffNet.disallow)\n", " //Reachable(LifeState.Signature(\"com.example.inefficientnetwork.MainActivity\", \"void fetchArticles()\"),104)\n",