summaryrefslogtreecommitdiff
path: root/cmpcj
diff options
context:
space:
mode:
authorgeronimo <geronimo013@gmx.de>2012-08-15 05:33:17 +0200
committergeronimo <geronimo013@gmx.de>2012-08-15 05:33:17 +0200
commit7eb41fd1431019f44227af6f5d707e7c98e0416e (patch)
tree302b5e15e2d7deaf54921839de95423e785554c4 /cmpcj
parente8175c7b23047fefd52f85afe05e2864b2a9bba8 (diff)
downloadcmp-7eb41fd1431019f44227af6f5d707e7c98e0416e.tar.gz
cmp-7eb41fd1431019f44227af6f5d707e7c98e0416e.tar.bz2
removed junit from client project and added -lcrypto to server makefile (fix for ubuntu)
Diffstat (limited to 'cmpcj')
-rw-r--r--cmpcj/.classpath1
-rw-r--r--cmpcj/src/de/schwarzrot/cmpc/util/MedialistParser.java3
2 files changed, 1 insertions, 3 deletions
diff --git a/cmpcj/.classpath b/cmpcj/.classpath
index b28f98d..6c1a5de 100644
--- a/cmpcj/.classpath
+++ b/cmpcj/.classpath
@@ -4,7 +4,6 @@
<classpathentry kind="src" path="res"/>
<classpathentry kind="lib" path="lib/glazedlists_java15.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="lib" path="lib/gson-2.2.2.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/cmpcj/src/de/schwarzrot/cmpc/util/MedialistParser.java b/cmpcj/src/de/schwarzrot/cmpc/util/MedialistParser.java
index 8f69af0..4b46a13 100644
--- a/cmpcj/src/de/schwarzrot/cmpc/util/MedialistParser.java
+++ b/cmpcj/src/de/schwarzrot/cmpc/util/MedialistParser.java
@@ -7,7 +7,6 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
-import org.junit.Test;
import com.google.gson.stream.JsonReader;
import de.schwarzrot.cmpc.domain.Media;
import de.schwarzrot.cmpc.domain.MediaType;
@@ -35,7 +34,7 @@ public class MedialistParser {
}
- @Test
+ // @Test
public void testJSonParsing() {
FileInputStream fis = null;