aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2014-11-23 18:16:29 +0100
committerSamuel Tardieu <sam@rfc1149.net>2015-01-01 12:40:11 +0100
commit69b14c2a67529b92dfb961650c642e91bc47e7d8 (patch)
tree4ae4f413b7b0204f695f82bb24d301593c8aec75
parente79732dc9ef6805dd9a4eb1b011049fded646e28 (diff)
downloadcgeo-69b14c2a67529b92dfb961650c642e91bc47e7d8.zip
cgeo-69b14c2a67529b92dfb961650c642e91bc47e7d8.tar.gz
cgeo-69b14c2a67529b92dfb961650c642e91bc47e7d8.tar.bz2
Update Intellij IDEA files
-rw-r--r--main/cgeo.iml5
-rw-r--r--showcaseview/showcaseview.iml5
-rw-r--r--tests/src/cgeo/geocaching/ImageUtilsTest.java30
-rw-r--r--tests/tests.iml16
4 files changed, 5 insertions, 51 deletions
diff --git a/main/cgeo.iml b/main/cgeo.iml
index 85c7887..45f86a9 100644
--- a/main/cgeo.iml
+++ b/main/cgeo.iml
@@ -46,11 +46,8 @@
<root url="file://$MODULE_DIR$/compile-libs" />
</CLASSES>
<JAVADOC />
- <SOURCES>
- <root url="file://$MODULE_DIR$/compile-libs" />
- </SOURCES>
+ <SOURCES />
<jarDirectory url="file://$MODULE_DIR$/compile-libs" recursive="false" />
- <jarDirectory url="file://$MODULE_DIR$/compile-libs" recursive="false" type="SOURCES" />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
diff --git a/showcaseview/showcaseview.iml b/showcaseview/showcaseview.iml
index e47f7c6..1cd3269 100644
--- a/showcaseview/showcaseview.iml
+++ b/showcaseview/showcaseview.iml
@@ -4,7 +4,7 @@
<facet type="android" name="Android">
<configuration>
<option name="LIBRARY_PROJECT" value="true" />
- <option name="UPDATE_PROPERTY_FILES" value="true" />
+ <option name="UPDATE_PROPERTY_FILES" value="false" />
</configuration>
</facet>
</component>
@@ -17,5 +17,4 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
-</module>
-
+</module> \ No newline at end of file
diff --git a/tests/src/cgeo/geocaching/ImageUtilsTest.java b/tests/src/cgeo/geocaching/ImageUtilsTest.java
deleted file mode 100644
index 7f6c7e5..0000000
--- a/tests/src/cgeo/geocaching/ImageUtilsTest.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package cgeo.geocaching;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import cgeo.geocaching.test.AbstractResourceInstrumentationTestCase;
-import cgeo.geocaching.test.R;
-import cgeo.geocaching.utils.ImageUtils;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-public class ImageUtilsTest extends AbstractResourceInstrumentationTestCase {
-
- private static final String icon64 = "iVBORw0KGgoAAAANSUhEUgAAAAkAAAAJCAYAAADgkQYQAAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAABAElEQVQY002NvUpDQRQG52yEILn+IAYCClaS4tqKtZ1dbHwNuaS00dYmQmrfwMZGRBAtrMQHSCMpTCMqaIx6k909e6wCme4bPhhhhuc8d8PxeC+ZPW33++9T72ZPvdFow1SvStX9We8sz2U6FlQPLUYqqkW30VgGsKJAbur1g5pzXYMosC5giEgy+6hAtUzpqLLq3O8q7M6bbZkqmpKllExUa9+q2gvhbJrKLrLsdkVkxwABShg9eN86nUzunXU6AD/O+2EMgdJ7fAiY92EtxjcAJ+02JyKNkNLmawj9xxiLlxAu/2JcWoQmwBxAFT4Hqq1rs687GADnx9DMnOsD/AMJ54Nj8e9zcgAAAABJRU5ErkJggg==";
-
- public void testBase64decoding() throws IOException {
- final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- ImageUtils.decodeBase64ToStream(icon64, outputStream);
- final byte[] decodedImage = outputStream.toByteArray();
- outputStream.close();
- assertThat(decodedImage.length).as("decoded image size").isEqualTo(409);
- final InputStream originalStream = getResourceStream(R.raw.small_file);
- final byte[] originalImage = new byte[409];
- assertEquals("original image has the right size (consistency check)", 409, originalStream.read(originalImage));
- originalStream.close();
- assertThat(decodedImage).as("decoded base64 image").isEqualTo(originalImage);
- }
-
-}
diff --git a/tests/tests.iml b/tests/tests.iml
index ac5381c..9cb488e 100644
--- a/tests/tests.iml
+++ b/tests/tests.iml
@@ -16,7 +16,7 @@
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
</content>
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="cgeo" exported="" scope="TEST" />
+ <orderEntry type="module" module-name="cgeo" scope="TEST" />
<orderEntry type="module-library">
<library>
<CLASSES>
@@ -31,17 +31,5 @@
</library>
</orderEntry>
<orderEntry type="inheritedJdk" />
- <orderEntry type="module-library" scope="PROVIDED">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../main/compile-libs/org.eclipse.jdt.annotation_1.1.0.v20130513-1648.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../main/compile-libs/org.eclipse.jdt.annotation_1.1.0.v20130513-1648.jar!/src" />
- </SOURCES>
- </library>
- </orderEntry>
</component>
-</module>
-
+</module> \ No newline at end of file