projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release-0.9.4'
[Sone.git]
/
src
/
test
/
java
/
net
/
pterodactylus
/
sone
/
text
/
SoneTextParserTest.java
diff --git
a/src/test/java/net/pterodactylus/sone/text/SoneTextParserTest.java
b/src/test/java/net/pterodactylus/sone/text/SoneTextParserTest.java
index
cd05acb
..
051c235
100644
(file)
--- a/
src/test/java/net/pterodactylus/sone/text/SoneTextParserTest.java
+++ b/
src/test/java/net/pterodactylus/sone/text/SoneTextParserTest.java
@@
-1,5
+1,5
@@
/*
/*
- * Sone - SoneTextParserTest.java - Copyright © 2011–201
3
David Roden
+ * Sone - SoneTextParserTest.java - Copyright © 2011–201
5
David Roden
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-20,10
+20,15
@@
package net.pterodactylus.sone.text;
import java.io.IOException;
import java.io.StringReader;
import java.util.Arrays;
import java.io.IOException;
import java.io.StringReader;
import java.util.Arrays;
+import java.util.Collection;
-import junit.framework.TestCase;
-import net.pterodactylus.sone.core.SoneProvider;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.data.impl.IdOnlySone;
+import net.pterodactylus.sone.database.SoneProvider;
+
+import com.google.common.base.Function;
+import com.google.common.base.Optional;
+import junit.framework.TestCase;
/**
* JUnit test case for {@link SoneTextParser}.
/**
* JUnit test case for {@link SoneTextParser}.
@@
-177,21
+182,46
@@
public class SoneTextParserTest extends TestCase {
*/
private static class TestSoneProvider implements SoneProvider {
*/
private static class TestSoneProvider implements SoneProvider {
+ @Override
+ public Function<String, Optional<Sone>> soneLoader() {
+ return new Function<String, Optional<Sone>>() {
+ @Override
+ public Optional<Sone> apply(String soneId) {
+ return getSone(soneId);
+ }
+ };
+ }
+
/**
* {@inheritDoc}
*/
@Override
/**
* {@inheritDoc}
*/
@Override
- public Sone getSone(final String soneId, boolean create) {
- return new Sone(soneId, false) {
+ public Optional<Sone> getSone(final String soneId) {
+ return Optional.<Sone>of(new IdOnlySone(soneId));
+ }
- /**
- * {@inheritDoc}
- */
- @Override
- public String getName() {
- return soneId;
- }
- };
+ /**
+ * {@inheritDocs}
+ */
+ @Override
+ public Collection<Sone> getSones() {
+ return null;
+ }
+
+ /**
+ * {@inheritDocs}
+ */
+ @Override
+ public Collection<Sone> getLocalSones() {
+ return null;
+ }
+
+ /**
+ * {@inheritDocs}
+ */
+ @Override
+ public Collection<Sone> getRemoteSones() {
+ return null;
}
}
}
}