diff --git a/app/views/homework_common/_homework_detail_programing_form.html.erb b/app/views/homework_common/_homework_detail_programing_form.html.erb
index 1a1804275..7b732d7c3 100644
--- a/app/views/homework_common/_homework_detail_programing_form.html.erb
+++ b/app/views/homework_common/_homework_detail_programing_form.html.erb
@@ -67,7 +67,24 @@
     </li>
 
     <% if edit_mode %>
-
+        <% homework.homework_tests.each_with_index do |homework_test,i|%>
+            <div>
+              <li>
+                <label class="label02">&nbsp;测试输入：&nbsp;</label>
+                <input type="text" class="fl h26 w186 mb10" name="input[<%= i%>]" value="<%= homework_test.input%>"/>
+              </li>
+              <li >
+                <label class=" fl f14 ml10">&nbsp;输出：&nbsp;</label>
+                <input type="text" class="fl h26 w186  mb10" name="output[<%= i%>]" value="<%= homework_test.output%>"/>
+              </li>
+              <li>
+                <a class="icon_add ml10 " href="javascript:void(0);" title="添加测试" onclick="add_programing_test($(this).parent().parent())"></a>
+                <a class="icon_remove" href="javascript:void(0);" title="删除测试" onclick="remove_programing_test($(this).parent().parent())"></a>
+                <span class="green_btn fl ml5 mt1">测试</span>
+              </li>
+              <div class="cl"></div>
+            </div>
+        <% end%>
     <% else %>
         <div>
           <li>
diff --git a/app/views/homework_common/edit.html.erb b/app/views/homework_common/edit.html.erb
index 87977c6a9..fc5596437 100644
--- a/app/views/homework_common/edit.html.erb
+++ b/app/views/homework_common/edit.html.erb
@@ -7,10 +7,18 @@
   </h2>
 </div>
 <div class="hwork_new">
-  <%= form_for @homework do |f| %>
-      <%= render :partial => 'homework_common/homework_detail_manual_form', :locals => { :homework => @homework,:f => f,:edit_mode => true } %>
-      <a href="javascript:void(0)" class="blue_btn fl mr10" onClick="submit_homework('edit_homework_common_<%= @homework.id%>');" >提交</a>
-      <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
+  <%if @homework.homework_type == 2%>
+      <%= form_for @homework do |f| %>
+          <%= render :partial => 'homework_common/homework_detail_programing_form', :locals => { :homework => @homework,:f => f,:edit_mode => true } %>
+          <a href="javascript:void(0)" class="blue_btn fl mr10" onClick="submit_homework('edit_homework_common_<%= @homework.id%>');" >提交</a>
+          <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
+      <% end%>
+  <% else %>
+      <%= form_for @homework do |f| %>
+          <%= render :partial => 'homework_common/homework_detail_manual_form', :locals => { :homework => @homework,:f => f,:edit_mode => true } %>
+          <a href="javascript:void(0)" class="blue_btn fl mr10" onClick="submit_homework('edit_homework_common_<%= @homework.id%>');" >提交</a>
+          <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
+      <% end%>
   <% end%>
 </div><!--hwork_new end-->
 <div class="cl"></div>
\ No newline at end of file