From 177f4f75ffae736b4756caf3e26eaaa2de5f24aa Mon Sep 17 00:00:00 2001
From: Cristiano Magro <cristiano.magro@vola.it>
Date: Tue, 16 Jan 2018 16:24:33 +0100
Subject: [PATCH] Refactor directory tree

---
 tests/SetupUploadTest.php |   46 ++++++++++++++++++++++++++++++++++++----------
 1 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/tests/SetupUploadTest.php b/tests/SetupUploadTest.php
index 72d05eb..930681e 100644
--- a/tests/SetupUploadTest.php
+++ b/tests/SetupUploadTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require 'bootstrap.php';
+
 
 /**
  * Implementazione dei test per la classe SetupUpload
@@ -10,7 +10,7 @@
 class SetupUploadTest extends PHPUnit_Framework_TestCase {
 
     /**
-     *  @var $object SetupUpload 
+     *  @var $object SetupUpload
      */
     protected $object;
 
@@ -27,15 +27,16 @@
      * This method is called after a test is executed.
      */
     protected function tearDown() {
-        
+
     }
 
     public static function setUpBeforeClass() {
-        
+
     }
 
     /**
      * Conversione di una stringa nel corrispondente valore di byte
+     *
      * @since 0.3.0
      */
     public function test_str2Bytes() {
@@ -60,11 +61,32 @@
         $this->assertEquals('0', SetupUpload::str2Bytes('0 mB'));
         $this->assertEquals('0', SetupUpload::str2Bytes('0 GB'));
         $this->assertEquals('0', SetupUpload::str2Bytes('0 TB'));
-        $this->assertEquals('0', SetupUpload::str2Bytes('0 XB'));
+    }
+
+    /**
+     * Conversione di una stringa nel corrispondente valore di byte, stringhe
+     * non convertibili devono andare in errore
+     *
+     * @since             0.3.1
+     * @expectedException Upload_Exc_Error
+     * @dataProvider      getBytesStringNotValid
+     */
+    public function test_str2BytesNonValido($byteString) {
+        SetupUpload::str2Bytes($byteString);
+    }
+
+    public function getBytesStringNotValid() {
+        return array(
+            array(''),
+            array('b'),
+            array('1 k'),
+            array('1 a'),
+        );
     }
 
     /**
      * La coda non inizializzata prevede un numero minimo di files
+     *
      * @since 0.3.1
      */
     public function testDefaultValue() {
@@ -72,10 +94,11 @@
     }
 
     /**
-     * Gestione di valori non adeguati 
-     * @since 0.3.1
-     * @expectedException UploadFile_Exc
-     * @dataProvider getNumMaxFilesException
+     * Gestione di valori non adeguati
+     *
+     * @since             0.3.1
+     * @expectedException Upload_Exc_Error
+     * @dataProvider      getNumMaxFilesException
      */
     public function testNotValidNumMaxFilesGetException($num) {
         $this->object->setNumMaxFiles($num);
@@ -92,7 +115,8 @@
 
     /**
      * Caselle della coda valide
-     * @since 0.3.1
+     *
+     * @since        0.3.1
      * @dataProvider getSomeMaxFiles
      */
     public function testSomeValidMaxFiles($num) {
@@ -111,6 +135,7 @@
 
     /**
      * Impostazioni delle dimensioni massime del totale caricabile
+     *
      * @since 0.3.1
      */
     public function testSetSizeMaxFilesByte() {
@@ -126,6 +151,7 @@
 
     /**
      * Impostazioni delle dimensioni massime di un file
+     *
      * @since 0.3.1
      */
     public function testSetSizeLimitFile() {

--
Gitblit v1.8.0