From 7d7913bc1ea277955609df2f65ce4af692869466 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Sun, 21 Dec 2008 17:47:35 +0000 Subject: [PATCH] * improved OpenSubtitlesHasherTest * removed JUnit 3 test suit stubs --- test/AllTests.java | 6 --- .../sourceforge/filebot/FileBotTestSuite.java | 6 --- .../ui/panel/rename/MatcherTestSuite.java | 6 --- .../filebot/web/OpenSubtitlesHasherTest.java | 44 +++++++++++++++++-- .../web/SubsceneSubtitleClientTest.java | 2 +- .../sourceforge/filebot/web/WebTestSuite.java | 7 --- .../net/sourceforge/tuned/TunedTestSuite.java | 7 --- 7 files changed, 42 insertions(+), 36 deletions(-) diff --git a/test/AllTests.java b/test/AllTests.java index 858d2af2..8d74e2a5 100644 --- a/test/AllTests.java +++ b/test/AllTests.java @@ -1,5 +1,3 @@ -import junit.framework.JUnit4TestAdapter; -import junit.framework.Test; import net.sourceforge.filebot.FileBotTestSuite; import net.sourceforge.tuned.TunedTestSuite; @@ -12,8 +10,4 @@ import org.junit.runners.Suite.SuiteClasses; @SuiteClasses( { FileBotTestSuite.class, TunedTestSuite.class }) public class AllTests { - public static Test suite() { - return new JUnit4TestAdapter(AllTests.class); - } - } diff --git a/test/net/sourceforge/filebot/FileBotTestSuite.java b/test/net/sourceforge/filebot/FileBotTestSuite.java index dd73a3ac..ec025e18 100644 --- a/test/net/sourceforge/filebot/FileBotTestSuite.java +++ b/test/net/sourceforge/filebot/FileBotTestSuite.java @@ -2,8 +2,6 @@ package net.sourceforge.filebot; -import junit.framework.JUnit4TestAdapter; -import junit.framework.Test; import net.sourceforge.filebot.ui.panel.rename.MatcherTestSuite; import net.sourceforge.filebot.web.WebTestSuite; @@ -16,8 +14,4 @@ import org.junit.runners.Suite.SuiteClasses; @SuiteClasses( { MatcherTestSuite.class, WebTestSuite.class, ArgumentBeanTest.class }) public class FileBotTestSuite { - public static Test suite() { - return new JUnit4TestAdapter(FileBotTestSuite.class); - } - } diff --git a/test/net/sourceforge/filebot/ui/panel/rename/MatcherTestSuite.java b/test/net/sourceforge/filebot/ui/panel/rename/MatcherTestSuite.java index bf123307..2a8b3a7f 100644 --- a/test/net/sourceforge/filebot/ui/panel/rename/MatcherTestSuite.java +++ b/test/net/sourceforge/filebot/ui/panel/rename/MatcherTestSuite.java @@ -2,8 +2,6 @@ package net.sourceforge.filebot.ui.panel.rename; -import junit.framework.JUnit4TestAdapter; -import junit.framework.Test; import net.sourceforge.filebot.ui.panel.rename.metric.AbstractNameSimilarityMetricTest; import net.sourceforge.filebot.ui.panel.rename.metric.NumericSimilarityMetricTest; @@ -16,8 +14,4 @@ import org.junit.runners.Suite.SuiteClasses; @SuiteClasses( { AbstractNameSimilarityMetricTest.class, NumericSimilarityMetricTest.class }) public class MatcherTestSuite { - public static Test suite() { - return new JUnit4TestAdapter(MatcherTestSuite.class); - } - } diff --git a/test/net/sourceforge/filebot/web/OpenSubtitlesHasherTest.java b/test/net/sourceforge/filebot/web/OpenSubtitlesHasherTest.java index 022a12cb..4c226f83 100644 --- a/test/net/sourceforge/filebot/web/OpenSubtitlesHasherTest.java +++ b/test/net/sourceforge/filebot/web/OpenSubtitlesHasherTest.java @@ -5,14 +5,52 @@ package net.sourceforge.filebot.web; import static org.junit.Assert.assertEquals; import java.io.File; +import java.io.FileInputStream; +import java.util.Arrays; +import java.util.Collection; +import org.junit.Ignore; import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; +@RunWith(Parameterized.class) +@Ignore("No test data") public class OpenSubtitlesHasherTest { - @Test - public void computeHash() throws Exception { - assertEquals("8e245d9679d31e12", OpenSubtitlesHasher.computeHash(new File("breakdance.avi"))); + private String expectedHash; + private File file; + + + public OpenSubtitlesHasherTest(String expectedHash, File file) { + this.file = file; + this.expectedHash = expectedHash; } + + + @Parameters + public static Collection parameters() { + Object[][] parameters = new Object[3][]; + + parameters[0] = new Object[] { "8e245d9679d31e12", new File("breakdance.avi") }; + parameters[1] = new Object[] { "61f7751fc2a72bfb", new File("dummy.bin") }; + parameters[2] = new Object[] { "a79fa10ba3b31395", new File("mini.txt") }; + + return Arrays.asList(parameters); + } + + + @Test + public void computeHashFile() throws Exception { + assertEquals(expectedHash, OpenSubtitlesHasher.computeHash(file)); + } + + + @Test + public void computeHashStream() throws Exception { + assertEquals(expectedHash, OpenSubtitlesHasher.computeHash(new FileInputStream(file), file.length())); + } + } diff --git a/test/net/sourceforge/filebot/web/SubsceneSubtitleClientTest.java b/test/net/sourceforge/filebot/web/SubsceneSubtitleClientTest.java index 0ad73578..0bf97eae 100644 --- a/test/net/sourceforge/filebot/web/SubsceneSubtitleClientTest.java +++ b/test/net/sourceforge/filebot/web/SubsceneSubtitleClientTest.java @@ -59,7 +59,7 @@ public class SubsceneSubtitleClientTest { assertEquals("Firefly - The Complete Series", result.getName()); assertEquals("http://subscene.com/Firefly-The-Complete-Series/subtitles-20008.aspx", result.getURL().toString()); - assertEquals(15, result.getSubtitleCount()); + assertEquals(16, result.getSubtitleCount()); } diff --git a/test/net/sourceforge/filebot/web/WebTestSuite.java b/test/net/sourceforge/filebot/web/WebTestSuite.java index d6e72ed3..6c2b7174 100644 --- a/test/net/sourceforge/filebot/web/WebTestSuite.java +++ b/test/net/sourceforge/filebot/web/WebTestSuite.java @@ -2,9 +2,6 @@ package net.sourceforge.filebot.web; -import junit.framework.JUnit4TestAdapter; -import junit.framework.Test; - import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; @@ -14,8 +11,4 @@ import org.junit.runners.Suite.SuiteClasses; @SuiteClasses( { TVDotComClientTest.class, AnidbClientTest.class, TVRageClientTest.class, SubsceneSubtitleClientTest.class, OpenSubtitlesHasherTest.class }) public class WebTestSuite { - public static Test suite() { - return new JUnit4TestAdapter(WebTestSuite.class); - } - } diff --git a/test/net/sourceforge/tuned/TunedTestSuite.java b/test/net/sourceforge/tuned/TunedTestSuite.java index c915f73c..5efa1efa 100644 --- a/test/net/sourceforge/tuned/TunedTestSuite.java +++ b/test/net/sourceforge/tuned/TunedTestSuite.java @@ -2,9 +2,6 @@ package net.sourceforge.tuned; -import junit.framework.JUnit4TestAdapter; -import junit.framework.Test; - import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; @@ -14,8 +11,4 @@ import org.junit.runners.Suite.SuiteClasses; @SuiteClasses( { ByteBufferOutputStreamTest.class, PreferencesMapTest.class, PreferencesListTest.class }) public class TunedTestSuite { - public static Test suite() { - return new JUnit4TestAdapter(TunedTestSuite.class); - } - }