[DO NOT MERGE] adding mysql 5.7 install in travis

.travis.install-mysql-5.7.sh

@@ -0,0 +1,6 @@
+echo mysql-apt-config mysql-apt-config/select-server select mysql-5.7 | sudo debconf-set-selections
+wget http://dev.mysql.com/get/mysql-apt-config_0.7.3-1_all.deb
+sudo dpkg --install mysql-apt-config_0.7.3-1_all.deb
+sudo apt-get update -q
+sudo apt-get install -q -y -o Dpkg::Options::=--force-confnew mysql-server
+sudo mysql_upgrade

.travis.yml

@@ -8,7 +8,7 @@ php:
     - "5.6"
     - "7"
 
-sudo: false
+sudo: true
 
 addons:
     firefox: "44.0"
@@ -56,6 +56,8 @@ before_script:
     - mkdir -p project smarty/templates_c
     - chmod 777 smarty/templates_c
 
+    - bash .travis.install-mysql-5.7.sh
+
     # Set up the MySQL database, install the Schema, create a MySQL user
     # for the config file, and reset the Loris user's password for testing
     - mysql -e 'CREATE DATABASE LorisTest'

SQL/0000-00-00-schema.sql

@@ -1086,12 +1086,12 @@ CREATE TABLE `tarchive` (
   `DicomArchiveID` varchar(255) NOT NULL default '',
   `PatientID` varchar(255) NOT NULL default '',
   `PatientName` varchar(255) NOT NULL default '',
-  `PatientDoB` date NOT NULL default '0000-00-00',
+  `PatientDoB` date default NULL,
   `PatientGender` varchar(255) default NULL,
   `neurodbCenterName` varchar(255) default NULL,
   `CenterName` varchar(255) NOT NULL default '',
-  `LastUpdate` datetime NOT NULL default '0000-00-00 00:00:00',
-  `DateAcquired` date NOT NULL default '0000-00-00',
+  `LastUpdate` datetime default NULL,
+  `DateAcquired` date default NULL,
   `DateFirstArchived` datetime default NULL,
   `DateLastArchived` datetime default NULL,
   `AcquisitionCount` int(11) NOT NULL default '0',
@@ -1311,7 +1311,7 @@ CREATE TABLE `users` (
   `Active` enum('Y','N') NOT NULL default 'Y',
   `Password_md5` varchar(34) default NULL,
   `Password_hash` varchar(255) default NULL,
-  `Password_expiry` date NOT NULL default '0000-00-00',
+  `Password_expiry` date default NULL,
   `Pending_approval` enum('Y','N') default 'Y',
   `Doc_Repo_Notifications` enum('Y','N') default 'N',
   PRIMARY KEY  (`ID`),

modules/conflict_resolver/test/conflict_resolverTest.php

@@ -55,7 +55,6 @@ function setUp()
              'OldValue1'           => 'Mother',
              'OldValue2'           => 'Father',
              'NewValue'            => 'NULL',
-             'ConflictID'          => 'NULL',
             )
         );
          $this->DB->insert(

modules/dashboard/test/DashboardTest.php

@@ -57,7 +57,7 @@ function setUp()
             array(
              'CenterID'  => '55',
              'Name'      => 'TESTinPSC',
-             'Alias'     => 'test',
+             'Alias'     => 'tst',
              'MRI_alias' => 'test',
             )
         );
@@ -111,6 +111,7 @@ function setUp()
             "violations_resolved",
             array(
              'ExtID'     => '1001',
+             'hash'      => 'not null value',
              'TypeTable' => 'mri_protocol_violated_scans',
              'Resolved'  => 'other',
             )
@@ -119,6 +120,7 @@ function setUp()
             "violations_resolved",
             array(
              'ExtID'     => '1002',
+             'hash'      => 'not null value',
              'TypeTable' => 'MRICandidateErrors',
              'Resolved'  => 'unresolved',
             )

modules/data_team_helper/php/NDB_Form_data_team_helper.class.inc

@@ -417,7 +417,7 @@ class NDB_Form_data_team_helper extends NDB_Form
         }
 
         else{
-            $query = "SELECT COUNT(*), s.ID, s.visit_label, c.PSCID,s.candid, f.SessionID, f.test_name,f.data_entry,f.commentid, t.Full_name FROM session s
+            $query = "SELECT COUNT(*) FROM session s
             JOIN flag f ON (f.sessionid = s.id)
             JOIN candidate c ON (c.candid = s.candid)
             JOIN test_names t ON (t.Test_name = f.Test_name)
@@ -459,7 +459,7 @@ class NDB_Form_data_team_helper extends NDB_Form
             JOIN psc ON (s.CenterID = psc.CenterID)	";
         }
         else{
-            $query = "SELECT COUNT(*), s.ID, s.visit_label, c.PSCID,s.candid, f.SessionID, f.test_name,f.data_entry,f.commentid, t.Full_name FROM session s
+            $query = "SELECT COUNT(*) FROM session s
             JOIN flag f ON (f.sessionid = s.id)
             JOIN candidate c ON (c.candid = s.candid)
             JOIN test_names t ON (t.Test_name = f.Test_name)

modules/dicom_archive/test/dicom_archiveTest.php

@@ -68,6 +68,7 @@ function setUp()
              'SessionID'              => '44',
              'uploadAttempt'          => '0',
              'CreateInfo'             => 'NULL',
+             'AcquisitionMetadata'    => 'A really long text that can not be null.',
             )
         );
     }

modules/document_repository/test/document_repositoryTest.php

@@ -27,7 +27,7 @@ public function setUp()
     {
         parent::setUp();
          $window = new WebDriverWindow($this->webDriver);
-         $size = new WebDriverDimension(1024,1768);
+         $size   = new WebDriverDimension(1024, 1768);
          $window->setSize($size);
         $this->DB->insert(
             "document_repository_categories",
@@ -50,7 +50,6 @@ public function setUp()
              'uploaded_by'   => 'admin',
              'For_site'      => '3',
              'comments'      => 'tester',
-             'multipart'     => 'NULL',
              'EARLI'         => '0',
              'hide_video'    => '0',
              'File_category' => '9999999',
@@ -154,7 +153,8 @@ function testDocumentRepositoryCreateCategory()
         $this->safeFindElement(WebDriverBy::Id("postCategory"))->click();
         sleep(10);
         $this->safeFindElement(
-            WebDriverBy::Xpath("//*[@id='TestTestTesta']/td/span"),3000
+            WebDriverBy::Xpath("//*[@id='TestTestTesta']/td/span"),
+            3000
         )
             ->click();
         $test = $this->safeFindElement(WebDriverBy::Id("testa"))
@@ -173,7 +173,8 @@ function testDocumentRepositoryUploadFile()
         $this->markTestSkipped("This method isn't working properly on travis.");
         $this->safeGet($this->url . "/document_repository/");
         $this->safeFindElement(
-            WebDriverBy::Xpath("//*[@id='TESTTESTTESTTESTa']/td/span"),3000
+            WebDriverBy::Xpath("//*[@id='TESTTESTTESTTESTa']/td/span"),
+            3000
         )
             ->click();
         $test = $this->safeFindElement(WebDriverBy::linkText("README.md"))
@@ -187,7 +188,8 @@ function testDocumentRepositoryUploadFile()
      * @return void
      */
     function testDocumentRepositoryUploadFileEditDeleteComment()
-    {    $this->markTestSkipped("This method isn't working properly on travis.");
+    {
+        $this->markTestSkipped("This method isn't working properly on travis.");
          $this->safeGet($this->url . "/document_repository/");
          $this->safeFindElement(
              WebDriverBy::Xpath("//*[@id='TESTTESTTESTTESTa']/td/span")

modules/examiner/test/ExaminerTest.php

@@ -43,12 +43,12 @@ public function setUp()
         $this->DB->insert(
             "psc",
             array(
-             'CenterID'   => '9999999',
+             'CenterID'   => '99',
              'Name'       => 'TEST_Site',
              'Study_site' => 'Y',
              'StateID'    => '0',
              'Alias'      => 'DDD',
-             'MRI_alias'  => 'TESTTEST',
+             'MRI_alias'  => 'TEST',
             )
         );
     }

modules/help_editor/test/help_editorTest.php

@@ -45,7 +45,6 @@ function setUp()
              'topic'    => 'Test Topic',
              'content'  => 'This is a test content.',
              'created'  => '2013-04-05 00:00:00',
-             'updated'  => 'NULL',
             )
         );
     }

modules/imaging_browser/test/imaging_browserTest.php

@@ -243,7 +243,7 @@ public function setUp()
              'QCStatus'          => null,
              'QCFirstChangeTime' => 1455040145,
              'QCLastChangeTime'  => 1455040145,
-             'Selected'          => 't2'
+             'Selected'          => true
             )
         );
 
@@ -258,7 +258,7 @@ public function setUp()
              'QCStatus'          => null,
              'QCFirstChangeTime' => 1455040145,
              'QCLastChangeTime'  => 1455040145,
-             'Selected'          => 't1'
+             'Selected'          => true
             )
         );
 
@@ -1285,4 +1285,4 @@ function testImageCommentsWindowEditable()
         $this->webDriver->switchTo()->window($diff[1])->close();
     }
 }
-?>
+?>

modules/mri_violations/test/mri_violationsTest.php

@@ -31,7 +31,7 @@ public function setUp()
             array(
              'CenterID' => '55',
              'Name' => 'TESTinPSC',
-             'Alias' => 'test',
+             'Alias' => 'tst',
              'MRI_alias' => 'test'
             )
 
@@ -84,6 +84,7 @@ public function setUp()
             "violations_resolved",
             array(
              'ExtID'         => '1001',
+             'hash'          => 'not null value',
              'TypeTable'     => 'mri_protocol_violated_scans',
              'Resolved'      => 'other'
             )
@@ -92,6 +93,7 @@ public function setUp()
             "violations_resolved",
             array(
              'ExtID'         => '1002',
+             'hash'          => 'not null value',
              'TypeTable'     => 'MRICandidateErrors',
              'Resolved'      => 'unresolved'
             )

modules/new_profile/test/new_profileTest.php

@@ -174,8 +174,8 @@ function testNewProfileDoBDateError() {
         $this->webDriver->get($this->url . "/new_profile/");
 
         $dates = $this->webDriver->findElements(WebDriverBy::cssSelector(".input-date"));
-        $dates[0]->sendKeys("01/01/2015");
-        $dates[1]->sendKeys("01/02/2015");
+        $dates[0]->sendKeys("2015-01-01");
+        $dates[1]->sendKeys("2015-02-01");
         $this->webDriver->findElement(WebDriverBy::Xpath("//*[@id='footer']/div[1]"))
                  ->click();
         $gender = $this->webDriver->findElement(WebDriverBy::Name("gender"));
@@ -204,8 +204,8 @@ function testNewProfileCreateCandidate() {
         $this->webDriver->get($this->url . "/new_profile/");
 
         $dates = $this->webDriver->findElements(WebDriverBy::cssSelector(".input-date"));
-        $dates[0]->sendKeys("01/01/2015");
-        $dates[1]->sendKeys("01/01/2015");
+        $dates[0]->sendKeys("2015-01-01");
+        $dates[1]->sendKeys("2015-01-01");
         $this->safeFindElement(WebDriverBy::Xpath("//*[@id='footer']/div[1]"))
                  ->click();
         sleep(1);
@@ -235,8 +235,8 @@ function testNewProfilePSCIDSequential() {
         $this->webDriver->get($this->url . "/new_profile/");
 
         $dates = $this->webDriver->findElements(WebDriverBy::cssSelector(".input-date"));
-        $dates[0]->sendKeys("01/01/2015");
-        $dates[1]->sendKeys("01/01/2015");
+        $dates[0]->sendKeys("2015-01-01");
+        $dates[1]->sendKeys("2015-01-01");
         $this->webDriver->findElement(WebDriverBy::Xpath("//*[@id='footer']/div[1]"))
                  ->click();
         sleep(1);
@@ -254,8 +254,8 @@ function testNewProfilePSCIDSequential() {
         $this->webDriver->get($this->url . "/new_profile/");
 
         $dates = $this->webDriver->findElements(WebDriverBy::cssSelector(".input-date"));
-        $dates[0]->sendKeys("01/01/2015");
-        $dates[1]->sendKeys("01/01/2015");
+        $dates[0]->sendKeys("2015-01-01");
+        $dates[1]->sendKeys("2015-01-01");
         $this->webDriver->findElement(WebDriverBy::Xpath("//*[@id='footer']/div[1]"))
                  ->click();
         sleep(1);

modules/reliability/test/reliabilityTest.php

@@ -37,7 +37,7 @@ public function setUp()
              array(
               'CenterID' => '55',
               'Name' => 'TESTinPSC',
-              'Alias' => 'test',
+              'Alias' => 'tst',
               'MRI_alias' => 'test'
              )
 

modules/statistics/php/NDB_Form_statistics.class.inc

@@ -525,7 +525,7 @@ class NDB_Form_statistics extends NDB_Form
                 AND c.Active='Y'
                 $suproject_query
                 $Param_Project
-                GROUP BY s.CenterID, VLabel, f.Data_Entry ORDER BY c.PSCID;",
+                GROUP BY s.CenterID, VLabel, f.Data_Entry",
             $this->params
         );
         foreach($result as $row) {

modules/survey_accounts/test/survey_accountsTest.php

@@ -31,7 +31,7 @@ public function setUp()
             array(
              'CenterID' => '55',
              'Name' => 'TESTinPSC',
-             'Alias' => 'test',
+             'Alias' => 'tst',
              'MRI_alias' => 'test'
             )
         );