features/example.message.hello.feature in trema-0.2.5 vs features/example.message.hello.feature in trema-0.2.6

@@ -1,25 +1,59 @@
 Feature: Send hello messages
 
+  In order to start conversations with switches
   As a Trema user
   I want to send hello messages to openflow switches
-  So that I can start transactions with switches
 
-
-  Scenario: Hello trema
-    When I try trema run "./objects/examples/openflow_message/hello 10" with following configuration (backgrounded):
+  @slow_process
+  Scenario: Hello message in C
+    Given a file named "hello.conf" with:
       """
-      vswitch("hello") { datapath_id "0xabc" }
+      custom_switch("hello") { 
+        datapath_id "0xabc" 
+        path "./objects/examples/openflow_switch/hello_switch"
+      }
       """
+    When I run `trema run "../../objects/examples/openflow_message/hello 10" -c hello.conf -d`
       And wait until "hello" is up
-      And I terminated all trema services
-    Then the log file "openflowd.hello.log" should include "received: OFPT_HELLO" x 11
+      And I run `trema killall`
+    Then the file "../../tmp/log/customswitch.hello.log" should contain:
+      """
+      received: OFPT_HELLO
+      received: OFPT_HELLO
+      received: OFPT_HELLO
+      received: OFPT_HELLO
+      received: OFPT_HELLO
+      received: OFPT_HELLO
+      received: OFPT_HELLO
+      received: OFPT_HELLO
+      received: OFPT_HELLO
+      received: OFPT_HELLO
+      received: OFPT_HELLO
+      """
 
-
-  Scenario: Hello trema in Ruby
-    When I try trema run "./src/examples/openflow_message/hello.rb 0xabc, 10" with following configuration (backgrounded):
+  @slow_process
+  Scenario: Hello message in Ruby
+    Given a file named "hello-r.conf" with:
       """
-      vswitch("hello-r") { datapath_id "0xabc" }
+      custom_switch("hello-r") { 
+        datapath_id "0xabc" 
+        path "./objects/examples/openflow_switch/hello_switch"
+      }
       """
+    When I run `trema run "../../src/examples/openflow_message/hello.rb 10" -c hello-r.conf -d`
       And wait until "HelloController" is up
-      And I terminated all trema services
-    Then the log file "openflowd.hello-r.log" should include "received: OFPT_HELLO" x 11
+      And I run `trema killall`
+    Then the file "../../tmp/log/customswitch.hello-r.log" should contain:
+      """
+      received: OFPT_HELLO
+      received: OFPT_HELLO
+      received: OFPT_HELLO
+      received: OFPT_HELLO
+      received: OFPT_HELLO
+      received: OFPT_HELLO
+      received: OFPT_HELLO
+      received: OFPT_HELLO
+      received: OFPT_HELLO
+      received: OFPT_HELLO
+      received: OFPT_HELLO
+      """