Fix TTS-1932 by improving support file in mediacapture

Move the support txt file to local by default,
 and delete unnecessary characters in the end.

Signed-off-by: Li, Hao <haox.li@intel.com>

diff --git a/tct-mediacapture-w3c-tests/mediacapture/HTMLInputElement_attribute.html b/tct-mediacapture-w3c-tests/mediacapture/HTMLInputElement_attribute.html
index 2be48d691843491a5a799451ec8e7a4e57bfa690..20487c36aa5b854b7e2307393547466ae2706d36 100644 (file)
--- a/tct-mediacapture-w3c-tests/mediacapture/HTMLInputElement_attribute.html
+++ b/tct-mediacapture-w3c-tests/mediacapture/HTMLInputElement_attribute.html
@@ -26,7 +26,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Authors:
-        Xinx, liu <xinx.liu@intel.com>
+        Liu, Xin <xinx.liu@intel.com>
 
 -->
 
@@ -35,8 +35,8 @@ Authors:
     <title>MediaCapture Test: HTMLInputElement_exist</title>
     <link rel="author" title="Intel" href="http://www.intel.com" />
     <link rel="help" href="http://www.w3.org/TR/2012/WD-html-media-capture-20120712/#the-capture-attribute" />
-    <meta name="flags" content="" />
-    <meta name="assert" content="Check that the HTMLInputElement attributes are implemented as specified for existence and type" />
+    <meta name="flags" content="">
+    <meta name="assert" content="Check that the HTMLInputElement attributes are implemented as specified for existence and type">
     <script src="../resources/testharness.js"></script>
     <script src="../resources/testharnessreport.js"></script>
   </head>

diff --git a/tct-mediacapture-w3c-tests/mediacapture/capture_fallback_file_upload.html b/tct-mediacapture-w3c-tests/mediacapture/capture_fallback_file_upload.html
index 663851fe1c7b79c51419541f638e667db05c7699..ef948d45f06d57ff30df69831a912d6ea7549026 100644 (file)
--- a/tct-mediacapture-w3c-tests/mediacapture/capture_fallback_file_upload.html
+++ b/tct-mediacapture-w3c-tests/mediacapture/capture_fallback_file_upload.html
@@ -27,6 +27,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Authors:
         Zhang, Zhiqiang <zhiqiang.zhang@intel.com>
+        Liu, Xin <xinx.liu@intel.com>
+        Li, Hao <haox.li@intel.com>
 
 -->
 
@@ -36,8 +38,8 @@ Authors:
     <title>HTML Media Capture Test: capture_fallback_file_upload</title>
     <link rel='author' title='Intel' href='http://www.intel.com'>
     <link rel='help' href='http://www.w3.org/TR/2012/WD-html-media-capture-20120712/'>
-    <meta name="flags" content="interact" />
-    <meta name="assert" content="Check if the input will can accept an file as expected when accept is set to a MIME type" />
+    <meta name="flags" content="interact">
+    <meta name="assert" content="Check if the input will can accept an file as expected when accept is set to a MIME type">
     <script src='../resources/testharness.js'></script>
     <script src='../resources/testharnessreport.js'></script>
   </head>
@@ -46,8 +48,7 @@ Authors:
 
     <p>Test steps:</p>
     <ol>
-      <li>Download <a href="support/upload.doc">upload.doc</a> to local.</li>
-      <li>Select the local upload.doc file to run the test.</li>
+      <li>Select the local upload.txt file under the Documents to run the test.</li>
     </ol>
 
     <form>
@@ -66,7 +67,7 @@ Authors:
         test(function() {
           var fileList = document.querySelector('#fileChooser').files;
           assert_equals(fileList.length, 1, 'fileList length is 1');
-          assert_equals(fileList.item(0).name, 'upload.doc', 'file name string is "upload.doc"');
+          assert_equals(fileList.item(0).name, 'upload.txt', 'file name string is "upload.txt"');
         }, 'Check if input.capture fallback to file upload when the accept attribute value is set to a MIME type that has no associated capture control type');
 
         done();

diff --git a/tct-mediacapture-w3c-tests/mediacapture/capture_reflect.html b/tct-mediacapture-w3c-tests/mediacapture/capture_reflect.html
index b52eeb6eb95f532c0dab0b865c0e63f947908f4e..b62385b1631af7238c72b8002e26810f5b638632 100644 (file)
--- a/tct-mediacapture-w3c-tests/mediacapture/capture_reflect.html
+++ b/tct-mediacapture-w3c-tests/mediacapture/capture_reflect.html
@@ -27,6 +27,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Authors:
         Zhang, Zhiqiang <zhiqiang.zhang@intel.com>
+        Liu, Xin <xinx.liu@intel.com>
 
 -->
 

diff --git a/tct-mediacapture-w3c-tests/mediacapture/capture_video.html b/tct-mediacapture-w3c-tests/mediacapture/capture_video.html
index 5b79615613e10e216bea25bfd7571b6ce6c22f25..316fd1df5c67b6810ad2e755da51bf9f11f677a2 100644 (file)
--- a/tct-mediacapture-w3c-tests/mediacapture/capture_video.html
+++ b/tct-mediacapture-w3c-tests/mediacapture/capture_video.html
@@ -27,6 +27,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Authors:
         Zhang, Zhiqiang <zhiqiang.zhang@intel.com>
+        Liu, Xin <xinx.liu@intel.com>
 
 -->
 
@@ -36,8 +37,8 @@ Authors:
     <title>HTML Media Capture Test: capture_video</title>
     <link rel='author' title='Intel' href='http://www.intel.com'>
     <link rel='help' href='http://www.w3.org/TR/2012/WD-html-media-capture-20120712/'>
-    <meta name="flags" content="" />
-    <meta name="assert" content="Check if the input will accept an video when capture set to acmcorder" />
+    <meta name="flags" content="">
+    <meta name="assert" content="Check if the input will accept an video when capture set to acmcorder">
   </head>
   <body>
     <p>Click the button, allow microphone and camera access, and start to capture a video.</p>

diff --git a/tct-mediacapture-w3c-tests/mediacapture/support/upload.doc b/tct-mediacapture-w3c-tests/mediacapture/support/upload.doc
deleted file mode 100644 (file)
index e965047..0000000
--- a/tct-mediacapture-w3c-tests/mediacapture/support/upload.doc
+++ /dev/null
@@ -1 +0,0 @@
-Hello

diff --git a/tct-mediacapture-w3c-tests/mediacapture/support/upload.txt b/tct-mediacapture-w3c-tests/mediacapture/support/upload.txt
new file mode 100644 (file)
index 0000000..e965047
--- /dev/null
+++ b/tct-mediacapture-w3c-tests/mediacapture/support/upload.txt
@@ -0,0 +1 @@
+Hello

diff --git a/tct-mediacapture-w3c-tests/tct-mediacapture-w3c-tests.spec b/tct-mediacapture-w3c-tests/tct-mediacapture-w3c-tests.spec
index f61a895351931bc8a02c52e322416f745f2526e4..0d97d4b5ef61df865759d1389a17ee4c6914ddc9 100755 (executable)
--- a/tct-mediacapture-w3c-tests/tct-mediacapture-w3c-tests.spec
+++ b/tct-mediacapture-w3c-tests/tct-mediacapture-w3c-tests.spec
@@ -110,6 +110,12 @@ if [ $? -eq 0 ]; then
         echo "Install /opt/%name/%name.wgt fail ..."
     fi
     sync
+    ###### cp upload.txt to /opt/usr/media/Documents for mediacapture testing ######
+    if [ -f /opt/tct-mediacapture-w3c-tests/mediacapture/support/upload.txt ]; then
+        cp -f /opt/tct-mediacapture-w3c-tests/mediacapture/support/upload.txt /opt/usr/media/Documents
+    else
+        echo "cp file fail, please check if exists file: /opt/tct-mediacapture-w3c-tests/mediacapture/support/upload.txt..."
+    fi
 fi
 
 
@@ -140,6 +146,10 @@ if [ $? -eq 0 ]; then
         fi
         sync
     fi
+    ###### remove upload.txt from /opt/usr/media/Documents after mediacapture testing ######
+    if [ -f /opt/usr/media/Documents/upload.txt ]; then
+        rm -f /opt/usr/media/Documents/upload.txt
+    fi
 
 fi