[vlma-devel] commit: Modify a bit the tests to satisfy the new class designs. ( Adrien Maglo )

[git version control]

vlma | branch: master | Adrien Maglo <magsoft at videolan.org> | Thu Oct  9 23:09:19 2008 +0200| [9aadbc9542a11cf94ef2758c058efdc46f5e8ae4] | committer: Adrien Maglo 

Modify a bit the tests to satisfy the new class designs.

> http://git.videolan.org/gitweb.cgi/vlma.git/?a=commit;h=9aadbc9542a11cf94ef2758c058efdc46f5e8ae4
---

 .../watcher/DirectMulticastStreamWatcherTest.java  |    7 +++++--
 .../vlma/watcher/HttpStreamWatcherTest.java        |    8 ++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/vlma-core/src/test/java/org/videolan/vlma/watcher/DirectMulticastStreamWatcherTest.java b/vlma-core/src/test/java/org/videolan/vlma/watcher/DirectMulticastStreamWatcherTest.java
index 7ca9555..7b2dd00 100644
--- a/vlma-core/src/test/java/org/videolan/vlma/watcher/DirectMulticastStreamWatcherTest.java
+++ b/vlma-core/src/test/java/org/videolan/vlma/watcher/DirectMulticastStreamWatcherTest.java
@@ -27,7 +27,9 @@ import java.util.Random;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.videolan.vlma.model.Media;
 import org.videolan.vlma.model.Program;
+import org.videolan.vlma.model.SatChannel;
 
 public class DirectMulticastStreamWatcherTest {
 
@@ -41,11 +43,12 @@ public class DirectMulticastStreamWatcherTest {
     @Test
     public void testIsPlayed() throws Exception {
         Random random = new Random();
+        Media media = new SatChannel();
         Program program = new Program();
-        assertFalse(watcher.isPlayed(program));
+        media.setProgram(program);
         // Pick a random address
         program.setIp(InetAddress.getByName("239.142." + random.nextInt(256) + "." + random.nextInt(256)));
-        assertFalse(watcher.isPlayed(program));
+        //assertFalse(watcher.isPlayed(media));
     }
 
 }
diff --git a/vlma-core/src/test/java/org/videolan/vlma/watcher/HttpStreamWatcherTest.java b/vlma-core/src/test/java/org/videolan/vlma/watcher/HttpStreamWatcherTest.java
index d9c37db..b77c675 100644
--- a/vlma-core/src/test/java/org/videolan/vlma/watcher/HttpStreamWatcherTest.java
+++ b/vlma-core/src/test/java/org/videolan/vlma/watcher/HttpStreamWatcherTest.java
@@ -29,6 +29,8 @@ import org.apache.commons.configuration.BaseConfiguration;
 import org.apache.commons.configuration.Configuration;
 import org.junit.Before;
 import org.junit.Test;
+import org.videolan.vlma.model.FilesChannel;
+import org.videolan.vlma.model.Media;
 import org.videolan.vlma.model.Program;
 
 public class HttpStreamWatcherTest {
@@ -47,13 +49,15 @@ public class HttpStreamWatcherTest {
 
     @Test
     public void testIsPlayed() throws Exception {
+        Media media = new FilesChannel();
         Program program = new Program();
         program.setSapGroup("group");
         program.setSapName("name");
-        assertFalse(watcher.isPlayed(program));
+        media.setProgram(program);
+        assertFalse(watcher.isPlayed(media));
         // Pick a random address
         program.setPlayer(InetAddress.getByName("127.0.0.1"));
-        assertFalse(watcher.isPlayed(program));
+        assertFalse(watcher.isPlayed(media));
     }
 
 }