projects
/
simple-mapper
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unified handling of empty input: return always null
[simple-mapper]
/
src
/
test
/
java
/
de
/
juplo
/
jackson
/
SimpleMapperTest.java
diff --git
a/src/test/java/de/juplo/jackson/SimpleMapperTest.java
b/src/test/java/de/juplo/jackson/SimpleMapperTest.java
index
075acca
..
33fb8a3
100644
(file)
--- a/
src/test/java/de/juplo/jackson/SimpleMapperTest.java
+++ b/
src/test/java/de/juplo/jackson/SimpleMapperTest.java
@@
-8,10
+8,7
@@
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Spliterator;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Spliterator;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
import org.junit.Test;
import org.junit.Test;
@@
-30,40
+27,15
@@
public class SimpleMapperTest
Spliterator<Object> spliterator;
spliterator = SimpleMapper.getArraySpliterator(get("/empty/1.json"));
Spliterator<Object> spliterator;
spliterator = SimpleMapper.getArraySpliterator(get("/empty/1.json"));
- assertFalse(
- "The created splitter should have no entries",
- spliterator.tryAdvance((Object t) ->
- {
- fail("The consumer should never be called!");
- }));
+ assertNull(spliterator);
spliterator = SimpleMapper.getArraySpliterator(get("/empty/2.json"));
spliterator = SimpleMapper.getArraySpliterator(get("/empty/2.json"));
- assertFalse(
- "The created splitter should have no entries",
- spliterator.tryAdvance((Object t) ->
- {
- fail("The consumer should never be called!");
- }));
+ assertNull(spliterator);
spliterator = SimpleMapper.getArraySpliterator(get("/empty/3.json"));
spliterator = SimpleMapper.getArraySpliterator(get("/empty/3.json"));
- assertFalse(
- "The created splitter should have no entries",
- spliterator.tryAdvance((Object t) ->
- {
- fail("The consumer should never be called!");
- }));
+ assertNull(spliterator);
spliterator = SimpleMapper.getArraySpliterator(get("/empty/4.json"));
spliterator = SimpleMapper.getArraySpliterator(get("/empty/4.json"));
- assertFalse(
- "The created splitter should have no entries",
- spliterator.tryAdvance((Object t) ->
- {
- fail("The consumer should never be called!");
- }));
+ assertNull(spliterator);
spliterator = SimpleMapper.getArraySpliterator(get("/empty/5.json"));
spliterator = SimpleMapper.getArraySpliterator(get("/empty/5.json"));
- assertFalse(
- "The created splitter should have no entries",
- spliterator.tryAdvance((Object t) ->
- {
- fail("The consumer should never be called!");
- }));
+ assertNull(spliterator);
}
@Test
}
@Test
@@
-72,15
+44,15
@@
public class SimpleMapperTest
List<Object> list;
list = SimpleMapper.convertArray(get("/empty/1.json"));
List<Object> list;
list = SimpleMapper.convertArray(get("/empty/1.json"));
- assert
Equals(0, list.size()
);
+ assert
Null(list
);
list = SimpleMapper.convertArray(get("/empty/2.json"));
list = SimpleMapper.convertArray(get("/empty/2.json"));
- assert
Equals(0, list.size()
);
+ assert
Null(list
);
list = SimpleMapper.convertArray(get("/empty/3.json"));
list = SimpleMapper.convertArray(get("/empty/3.json"));
- assert
Equals(0, list.size()
);
+ assert
Null(list
);
list = SimpleMapper.convertArray(get("/empty/4.json"));
list = SimpleMapper.convertArray(get("/empty/4.json"));
- assert
Equals(0, list.size()
);
+ assert
Null(list
);
list = SimpleMapper.convertArray(get("/empty/5.json"));
list = SimpleMapper.convertArray(get("/empty/5.json"));
- assert
Equals(0, list.size()
);
+ assert
Null(list
);
}
@Test
}
@Test
@@
-89,40
+61,15
@@
public class SimpleMapperTest
Spliterator<Entry<String, Object>> spliterator;
spliterator = SimpleMapper.getObjectSpliterator(get("/empty/1.json"));
Spliterator<Entry<String, Object>> spliterator;
spliterator = SimpleMapper.getObjectSpliterator(get("/empty/1.json"));
- assertFalse(
- "The created splitter should have no entries",
- spliterator.tryAdvance((Entry<String, Object> e) ->
- {
- fail("The consumer should never be called!");
- }));
+ assertNull(spliterator);
spliterator = SimpleMapper.getObjectSpliterator(get("/empty/2.json"));
spliterator = SimpleMapper.getObjectSpliterator(get("/empty/2.json"));
- assertFalse(
- "The created splitter should have no entries",
- spliterator.tryAdvance((Entry<String, Object> e) ->
- {
- fail("The consumer should never be called!");
- }));
+ assertNull(spliterator);
spliterator = SimpleMapper.getObjectSpliterator(get("/empty/3.json"));
spliterator = SimpleMapper.getObjectSpliterator(get("/empty/3.json"));
- assertFalse(
- "The created splitter should have no entries",
- spliterator.tryAdvance((Entry<String, Object> e) ->
- {
- fail("The consumer should never be called!");
- }));
+ assertNull(spliterator);
spliterator = SimpleMapper.getObjectSpliterator(get("/empty/4.json"));
spliterator = SimpleMapper.getObjectSpliterator(get("/empty/4.json"));
- assertFalse(
- "The created splitter should have no entries",
- spliterator.tryAdvance((Entry<String, Object> e) ->
- {
- fail("The consumer should never be called!");
- }));
+ assertNull(spliterator);
spliterator = SimpleMapper.getObjectSpliterator(get("/empty/5.json"));
spliterator = SimpleMapper.getObjectSpliterator(get("/empty/5.json"));
- assertFalse(
- "The created splitter should have no entries",
- spliterator.tryAdvance((Entry<String, Object> e) ->
- {
- fail("The consumer should never be called!");
- }));
+ assertNull(spliterator);
}
@Test
}
@Test
@@
-131,15
+78,15
@@
public class SimpleMapperTest
Map<String, Object> map;
map = SimpleMapper.convertObject(get("/empty/1.json"));
Map<String, Object> map;
map = SimpleMapper.convertObject(get("/empty/1.json"));
- assert
Equals(0, map.size()
);
+ assert
Null(map
);
map = SimpleMapper.convertObject(get("/empty/2.json"));
map = SimpleMapper.convertObject(get("/empty/2.json"));
- assert
Equals(0, map.size()
);
+ assert
Null(map
);
map = SimpleMapper.convertObject(get("/empty/3.json"));
map = SimpleMapper.convertObject(get("/empty/3.json"));
- assert
Equals(0, map.size()
);
+ assert
Null(map
);
map = SimpleMapper.convertObject(get("/empty/4.json"));
map = SimpleMapper.convertObject(get("/empty/4.json"));
- assert
Equals(0, map.size()
);
+ assert
Null(map
);
map = SimpleMapper.convertObject(get("/empty/5.json"));
map = SimpleMapper.convertObject(get("/empty/5.json"));
- assert
Equals(0, map.size()
);
+ assert
Null(map
);
}
@Test
}
@Test