Merge pull request #23 from Said-Belhadj/developHEADmaster

Merging develop to master.

4 files changed, 39 insertions, 115 deletions

diff --git a/files/albums.xml b/files/albums.xml
index edfd610..bf6468f 100644
--- a/files/albums.xml
+++ b/files/albums.xml
@@ -1,27 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <albums>
     <album>
-        <title>Best of Beatles</title>
-        <artist/>
+        <title>Best of Drake</title><artist/>
         <lengthInSeconds>2160</lengthInSeconds>
         <UUID>55a1e629-ef8c-4554-be90-7668105724cd</UUID>
-        <date>1970-12-10</date>
+        <date>2019-12-10</date>
         <songs>
-            <UUID>66d277ca-cbc4-471c-a07e-082362275bcc</UUID>
-            <UUID>6b834132-0a30-4b83-9835-814121b963a1</UUID>
-            <UUID>b2ee0ca0-b5e2-4bc9-8fed-7932fb145f2f</UUID>
-            <UUID>bbe99998-1be6-4a40-8bf0-6a7fce9087c9</UUID>
-            <UUID>66d277ca-cbc4-471c-a07e-082363375bcc</UUID>
+            <UUID>21d277ca-cbc4-471c-a07e-082363375bcc</UUID>
+            <UUID>31d277ca-cbc4-471c-a07e-082363375bcc</UUID>
+            <UUID>61d277ca-cbc4-471c-a07e-082363375bcc</UUID>
         </songs>
     </album>
     <album>
-        <title>ABBA Gold</title>
+        <title>Best of Ariana Grande</title>
         <artist/>
         <lengthInSeconds>3490</lengthInSeconds>
-        <UUID>f015cb19-ed91-47cc-a262-12f5348e6f89</UUID>
-        <date>1978-01-23</date>
-        <songs>
-            <UUID>44136020-dc80-4522-9b71-2b9aad5e3039</UUID>
-        </songs>
+        <UUID>66d277ca-cbc4-471c-a07e-082363375bcc</UUID>
+        <date>2016-01-23</date>
+        <songs/>
     </album>
-</albums>
\ No newline at end of file
+</albums>
diff --git a/files/elements.xml b/files/elements.xml
index 7fefc5f..189ede0 100644
--- a/files/elements.xml
+++ b/files/elements.xml
@@ -1,110 +1,35 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <elements>
     <song>
-        <title>Here Comes the Sun</title>
-        <artist>The Beatles</artist>
-        <length>186</length>
-        <UUID>66d277ca-cbc4-471c-a07e-082362275bcc</UUID>
-        <content>here_comes_the_sun.mp3</content>
-        <genre>pop</genre>
-    </song>
-    <song>
-        <title>I Want to Hold your Hand</title>
-        <artist>The Beatles</artist>
+        <title>Side To Side</title>
+        <artist>Ariana Grande</artist>
         <length>186</length>
         <UUID>66d277ca-cbc4-471c-a07e-082363375bcc</UUID>
-        <content>i_want_to_hold_your_hand.mp3</content>
+        <content>Song/Side_To_Side.wav</content>
         <genre>rock</genre>
     </song>
     <song>
-        <title>Something</title>
-        <artist>The Beatles</artist>
-        <length>182</length>
-        <UUID>6b834132-0a30-4b83-9835-814121b963a1</UUID>
-        <content>something.mp3</content>
-        <genre>pop</genre>
-    </song>
-    <audiobook>
-        <title>Producing the Beatles</title>
-        <artist>Jason Kruppa</artist>
-        <length>1640</length>
-        <UUID>9a744375-95cb-4f25-8dfd-f488e0f2e1f1</UUID>
-        <content>producing_the_beatles.mp3</content>
-        <language>english</language>
-        <category>documentary</category>
-    </audiobook>
-    <audiobook>
-        <title>Snow White</title>
-        <artist>Disney</artist>
-        <length>999</length>
-        <UUID>c88c33dc-6c56-42d5-8381-202c679558e4</UUID>
-        <content>name.mp3</content>
-        <language>english</language>
-        <category>youth</category>
-    </audiobook>
-    <song>
-        <title>Julia</title>
-        <artist>The Beatles</artist>
-        <length>176</length>
-        <UUID>b2ee0ca0-b5e2-4bc9-8fed-7932fb145f2f</UUID>
-        <content>julia.mp3</content>
-        <genre>pop</genre>
-    </song>
-    <audiobook>
-        <title>Hamlet</title>
-        <artist>Shakespeare</artist>
-        <length>10800</length>
-        <UUID>804d2dea-3e49-4c42-99f6-e195d3a68da7</UUID>
-        <content>hamlet.mp3</content>
-        <language>english</language>
-        <category>theater</category>
-    </audiobook>
-    <song>
-        <title>Yesterday</title>
-        <artist>The Beatles</artist>
-        <length>180</length>
-        <UUID>bbe99998-1be6-4a40-8bf0-6a7fce9087c9</UUID>
-        <content>yesterday.mp3</content>
-        <genre>pop</genre>
-    </song>
-    <song>
-        <title>Mamma Mia</title>
-        <artist>ABBA</artist>
-        <length>213</length>
-        <UUID>a9b8d71a-70af-4f6a-a908-ad09ec8345d3</UUID>
-        <content>mamma_mia.mp3</content>
-        <genre>pop</genre>
-    </song>
-    <song>
-        <title>Dancing Queen</title>
-        <artist>ABBA</artist>
-        <length>230</length>
-        <UUID>18c49fcc-3b6e-4743-884f-89274a8a2e9a</UUID>
-        <content>dancing_queen.mp3</content>
-        <genre>pop</genre>
-    </song>
-    <song>
-        <title>Fernando</title>
-        <artist>ABBA</artist>
-        <length>252</length>
-        <UUID>44136020-dc80-4522-9b71-2b9aad5e3039</UUID>
-        <content>fernando.mp3</content>
+        <title>STB</title>
+        <artist>Drake</artist>
+        <length>286</length>
+        <UUID>61d277ca-cbc4-471c-a07e-082363375bcc</UUID>
+        <content>Song/STB.wav</content>
         <genre>pop</genre>
     </song>
     <song>
-        <title>The name of the game</title>
-        <artist>ABBA</artist>
-        <length>291</length>
-        <UUID>a2a19231-d244-4440-ad2a-41315e5ca00a</UUID>
-        <content>the_name_of_the_game.mp3</content>
+        <title>Hotline Bling</title>
+        <artist>Drake</artist>
+        <length>256</length>
+        <UUID>31d277ca-cbc4-471c-a07e-082363375bcc</UUID>
+        <content>Song/Hotline_Bling.wav</content>
         <genre>pop</genre>
     </song>
     <song>
-        <title>The winner takes it all</title>
-        <artist>ABBA</artist>
-        <length>254</length>
-        <UUID>383c9337-6a58-40aa-ac4d-83fd964a397c</UUID>
-        <content>the_winner_takes_it_all.mp3</content>
+        <title>Toosie Slide</title>
+        <artist>Drake</artist>
+        <length>286</length>
+        <UUID>21d277ca-cbc4-471c-a07e-082363375bcc</UUID>
+        <content>Song/Toosie_Slide.wav</content>
         <genre>pop</genre>
     </song>
-</elements>
\ No newline at end of file
+</elements>
diff --git a/files/parse_JUnit.xml b/files/parse_JUnit.xml
new file mode 100644
index 0000000..92f7c75
--- /dev/null
+++ b/files/parse_JUnit.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<parse>
+
+</parse>
\ No newline at end of file
diff --git a/files/playlists.xml b/files/playlists.xml
index e68fd77..9955928 100644
--- a/files/playlists.xml
+++ b/files/playlists.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <playlists>
     <playlist>
         <title>my favourite songs</title>
@@ -12,9 +12,9 @@
         <title>my third playlist</title>
         <UUID>23173338-8b6e-4174-af71-2fe8eef705da</UUID>
         <elements>
-            <UUID>bbe99998-1be6-4a40-8bf0-6a7fce9087c9</UUID>
-            <UUID>6b834132-0a30-4b83-9835-814121b963a1</UUID>
-            <UUID>66d277ca-cbc4-471c-a07e-082362275bcc</UUID>
+            <UUID>21d277ca-cbc4-471c-a07e-082363375bcc</UUID>
+            <UUID>31d277ca-cbc4-471c-a07e-082363375bcc</UUID>
+            <UUID>61d277ca-cbc4-471c-a07e-082363375bcc</UUID>
         </elements>
     </playlist>
-</playlists>
\ No newline at end of file
+</playlists>