From 993994432113c0215490831d19828835d1f599ff Mon Sep 17 00:00:00 2001
From: nyatla <nyatla@47198e57-cb75-475f-84c4-a814cd6f29e0>
Date: Sun, 20 Jul 2014 12:17:31 +0000
Subject: [PATCH] =?utf8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=82=B1=E3=83=BC?=
 =?utf8?q?=E3=82=B9=E3=81=AE=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: http://svn.osdn.jp/svnroot/mimic/trunk@386 47198e57-cb75-475f-84c4-a814cd6f29e0
---
 misc/mbedJS/mbddJS.API/test.I2CSlave.html |   1 +
 misc/mbedJS/mbddJS.API/test.MCU.html      | 131 +++++++++++++++++++++++++++++-
 misc/mbedJS/mbddJS.API/test.Serial.html   |   7 +-
 3 files changed, 133 insertions(+), 6 deletions(-)

diff --git a/misc/mbedJS/mbddJS.API/test.I2CSlave.html b/misc/mbedJS/mbddJS.API/test.I2CSlave.html
index a84b8eb..0dd2541 100644
--- a/misc/mbedJS/mbddJS.API/test.I2CSlave.html
+++ b/misc/mbedJS/mbddJS.API/test.I2CSlave.html
@@ -151,6 +151,7 @@ function async()
 function sync()
 {
 	log();
+	alert(mbedJS.I2CSlave.RxStatus.NoData);
 	var g=function*(){
 	try{
 		var v;
diff --git a/misc/mbedJS/mbddJS.API/test.MCU.html b/misc/mbedJS/mbddJS.API/test.MCU.html
index ad3fe54..188d866 100644
--- a/misc/mbedJS/mbddJS.API/test.MCU.html
+++ b/misc/mbedJS/mbddJS.API/test.MCU.html
@@ -34,6 +34,7 @@ function async()
 			log("[PASS]onGetInfo:"+v.version+","+v.platform+","+v.mcu.name+","+v.mcu.eth+","+v.memory.free);
 			var pin=new mbedJS.DigitalIn(mcu,mbedJS.PinName.P0_22,{
 				onNew:function(){
+					log("...");
 					mcu.disposeObject(pin._oid);
 				}});
 		},
@@ -49,7 +50,129 @@ function async()
 		}
 	});
 }
-
+function async2()
+{
+	log();
+	log("ASYNC2");
+	var mcu=new mbedJS.Mcu("192.168.128.39",
+	{
+		onNew:function(){
+			log("[PASS]onNew");
+			mcu.getInfo(function(v){
+				log("[PASS]onGetInfo:"+v.version+","+v.platform+","+v.mcu.name+","+v.mcu.eth+","+v.memory.free);
+				var pin=new mbedJS.DigitalIn(mcu,mbedJS.PinName.P0_22,function(){
+					log("...");
+					mcu.disposeObject(pin._oid,function(v){
+						log("[PASS]onDisposeObject:"+v);
+						mcu.close();
+					});
+				});
+			});
+		},
+		onClose:function(){
+			log("[PASS]onClose");
+		},
+		onError:function(){
+			alert("Error");
+		}
+	});
+}
+function dispose1()
+{
+	log();
+	log("d1");
+	var mcu=new mbedJS.Mcu("192.168.128.39",
+	{
+		onNew:function(){
+			log("[PASS]onNew");
+			var pin=new mbedJS.DigitalIn(mcu,mbedJS.PinName.P0_22,function(){
+				pin.dispose(function(v){
+					log("[PASS]onDispose:"+v);
+					mcu.close();
+				});
+			});
+		},
+		onClose:function(){
+			log("[PASS]onClose");
+		},
+		onError:function(){
+			alert("Error");
+		}
+	});
+}
+function dispose2()
+{
+	log();
+	log("d1");
+	var mcu=new mbedJS.Mcu("192.168.128.39",
+	{
+		onNew:function(){
+			log("[PASS]onNew");
+			var pin=new mbedJS.DigitalIn(mcu,mbedJS.PinName.P0_22,{
+				onNew:function(){
+					log("[PASS]onNew:");
+					pin.dispose();
+				},
+				onDispose:function(v){
+					log("[PASS]onDispose:"+v);
+				mcu.close();
+				}
+			});
+		},
+		onClose:function(){
+			log("[PASS]onClose");
+		},
+		onError:function(){
+			alert("Error");
+		}
+	});
+}
+function dispose3()
+{
+	log();
+	log("d3");
+	var mcu=new mbedJS.Mcu("192.168.128.39",
+	{
+		onNew:function(){
+			log("[PASS]onNew");
+			var pin=new mbedJS.DigitalIn(mcu,mbedJS.PinName.P0_22,{
+				onNew:function(){
+					log("[PASS]onNew:");
+					pin.dispose();
+					mcu.close();
+				}
+			});
+		},
+		onClose:function(){
+			log("[PASS]onClose");
+		},
+		onError:function(){
+			alert("Error");
+		}
+	});
+}
+function dispose4()
+{
+	var g=function*(){
+	try{
+		log();
+		var mcu=new mbedJS.Mcu("192.168.128.39",g);
+		log(2);
+		var v;
+		yield mcu.waitForNew();
+		var pin= new mbedJS.DigitalIn(mcu,mbedJS.PinName.P0_22,g);
+		yield pin.waitForNew();
+		v=yield pin.dispose();
+		log("[PASS]dispose:"+v);
+		yield mcu.close();
+		log("[PASS]close");
+	}catch(e){
+		alert(e);
+		mcu.shutdown();
+	}
+	}();
+	g.next();
+}
 /**
  * 誤った使用方法でExceptionが出た場合にシャットダウンできるかのテスト
  */
@@ -85,7 +208,11 @@ log(3);
 <h1>MCU test</h1>
 <hr/>
 <button onclick="async();">ASYNC</button>
+<button onclick="async2();">ASYNC2</button>
 <button onclick="sync();">SYNC</button>
-<button onclick="sync2();">SYNC2</button>
+<button onclick="dispose1();">D1</button>
+<button onclick="dispose2();">D2</button>
+<button onclick="dispose3();">D3</button>
+<button onclick="dispose4();">D4</button>
 <textarea id="console" rows="15" cols="80"></textarea>
 </body>
\ No newline at end of file
diff --git a/misc/mbedJS/mbddJS.API/test.Serial.html b/misc/mbedJS/mbddJS.API/test.Serial.html
index 88c78e8..ef707e9 100644
--- a/misc/mbedJS/mbddJS.API/test.Serial.html
+++ b/misc/mbedJS/mbddJS.API/test.Serial.html
@@ -50,7 +50,7 @@ function async()
 			},
 			onSend_break:function(){
 				log("[PASS]onSend_break:");
-				uart.format(8,uart.Parity.None,1);
+				uart.format(8,mbedJS.Serial.Parity.None,1);
 			},
 			onFormat:function(){
 				log("[PASS]onForma:");
@@ -107,7 +107,7 @@ function async2()
 					log("[PASS]onBaud:");
 					uart.send_break(function(){
 						log("[PASS]onSend_break:");
-						uart.format(8,uart.Parity.None,1,function(){
+						uart.format(8,mbedJS.Serial.Parity.None,1,function(){
 							log("[PASS]onForma:");
 							uart.readable(function(v){
 								log("[PASS]onReadable:"+v);
@@ -160,7 +160,7 @@ function sync()
 		log("[PASS]onBaud:");
 		yield uart.send_break();
 		log("[PASS]onSend_break:");
-		yield uart.format(8,uart.Parity.None,1);
+		yield uart.format(8,mbedJS.Serial.Parity.None,1);
 		log("[PASS]onForma:");
 		v=yield uart.readable();
 		log("[PASS]onReadable:"+v);
@@ -188,7 +188,6 @@ function sync()
 }
 
 
-
 </script>
 </head>
 <body>
-- 
2.11.0