X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FConfigurationSoneParserTest.java;h=0df4836c38f474a39a82d5fd405e2e7f06dccc56;hp=7bbfae838c6b9671c04f21a1170cda25f0af00cf;hb=851ef7a7f4e25fe3c57c2d9c67349acce58f1ddc;hpb=f8672b1385173a103d7f085d8e9cd43bc5762d71

diff --git a/src/test/java/net/pterodactylus/sone/core/ConfigurationSoneParserTest.java b/src/test/java/net/pterodactylus/sone/core/ConfigurationSoneParserTest.java
index 7bbfae8..0df4836 100644
--- a/src/test/java/net/pterodactylus/sone/core/ConfigurationSoneParserTest.java
+++ b/src/test/java/net/pterodactylus/sone/core/ConfigurationSoneParserTest.java
@@ -69,13 +69,13 @@ public class ConfigurationSoneParserTest {
 	public ConfigurationSoneParserTest() {
 		when(sone.getId()).thenReturn("1");
 		configurationSoneParser =
-				new ConfigurationSoneParser(configuration, sone);
+				new ConfigurationSoneParser(configuration, "1");
 	}
 
 	@Test
 	public void emptyProfileIsLoadedCorrectly() {
 		setupEmptyProfile();
-		Profile profile = configurationSoneParser.parseProfile();
+		Profile profile = configurationSoneParser.parseProfile(sone);
 		assertThat(profile, notNullValue());
 		assertThat(profile.getFirstName(), nullValue());
 		assertThat(profile.getMiddleName(), nullValue());
@@ -96,7 +96,7 @@ public class ConfigurationSoneParserTest {
 	@Test
 	public void filledProfileWithFieldsIsParsedCorrectly() {
 		setupFilledProfile();
-		Profile profile = configurationSoneParser.parseProfile();
+		Profile profile = configurationSoneParser.parseProfile(sone);
 		assertThat(profile, notNullValue());
 		assertThat(profile.getFirstName(), is("First"));
 		assertThat(profile.getMiddleName(), is("M."));
@@ -330,7 +330,7 @@ public class ConfigurationSoneParserTest {
 		AlbumBuilderFactory albumBuilderFactory = createAlbumBuilderFactory();
 		List<Album> topLevelAlbums =
 				configurationSoneParser.parseTopLevelAlbums(
-						albumBuilderFactory);
+						albumBuilderFactory, sone);
 		assertThat(topLevelAlbums, hasSize(2));
 		Album firstAlbum = topLevelAlbums.get(0);
 		assertThat(firstAlbum, isAlbum("A1", null, "T1", "D1", "I1"));
@@ -381,30 +381,30 @@ public class ConfigurationSoneParserTest {
 	public void albumWithInvalidTitleIsRecognized() {
 		setupAlbum(0, "A1", null, null, "D1", "I1");
 		configurationSoneParser.parseTopLevelAlbums(
-				createAlbumBuilderFactory());
+				createAlbumBuilderFactory(), sone);
 	}
 
 	@Test(expected = InvalidAlbumFound.class)
 	public void albumWithInvalidDescriptionIsRecognized() {
 		setupAlbum(0, "A1", null, "T1", null, "I1");
 		configurationSoneParser.parseTopLevelAlbums(
-				createAlbumBuilderFactory());
+				createAlbumBuilderFactory(), sone);
 	}
 
 	@Test(expected = InvalidParentAlbumFound.class)
 	public void albumWithInvalidParentIsRecognized() {
 		setupAlbum(0, "A1", "A0", "T1", "D1", "I1");
 		configurationSoneParser.parseTopLevelAlbums(
-				createAlbumBuilderFactory());
+				createAlbumBuilderFactory(), sone);
 	}
 
 	@Test
 	public void imagesAreParsedCorrectly() {
 		setupTopLevelAlbums();
 		configurationSoneParser.parseTopLevelAlbums(
-				createAlbumBuilderFactory());
+				createAlbumBuilderFactory(), sone);
 		setupImages();
-		configurationSoneParser.parseImages(createImageBuilderFactory());
+		configurationSoneParser.parseImages(createImageBuilderFactory(), sone);
 		Map<String, Album> albums = configurationSoneParser.getAlbums();
 		assertThat(albums.get("A1").getImages(),
 				contains(isImage("I1", 1000L, "K1", "T1", "D1", 16, 9)));
@@ -453,72 +453,72 @@ public class ConfigurationSoneParserTest {
 	public void missingAlbumIdIsRecognized() {
 		setupTopLevelAlbums();
 		configurationSoneParser.parseTopLevelAlbums(
-				createAlbumBuilderFactory());
+				createAlbumBuilderFactory(), sone);
 		setupImage(0, "I1", null, 1000L, "K1", "T1", "D1", 16, 9);
-		configurationSoneParser.parseImages(createImageBuilderFactory());
+		configurationSoneParser.parseImages(createImageBuilderFactory(), sone);
 	}
 
 	@Test(expected = InvalidParentAlbumFound.class)
 	public void invalidAlbumIdIsRecognized() {
 		setupTopLevelAlbums();
 		configurationSoneParser.parseTopLevelAlbums(
-				createAlbumBuilderFactory());
+				createAlbumBuilderFactory(), sone);
 		setupImage(0, "I1", "A4", 1000L, "K1", "T1", "D1", 16, 9);
-		configurationSoneParser.parseImages(createImageBuilderFactory());
+		configurationSoneParser.parseImages(createImageBuilderFactory(), sone);
 	}
 
 	@Test(expected = InvalidImageFound.class)
 	public void missingCreationTimeIsRecognized() {
 		setupTopLevelAlbums();
 		configurationSoneParser.parseTopLevelAlbums(
-				createAlbumBuilderFactory());
+				createAlbumBuilderFactory(), sone);
 		setupImage(0, "I1", "A1", null, "K1", "T1", "D1", 16, 9);
-		configurationSoneParser.parseImages(createImageBuilderFactory());
+		configurationSoneParser.parseImages(createImageBuilderFactory(), sone);
 	}
 
 	@Test(expected = InvalidImageFound.class)
 	public void missingKeyIsRecognized() {
 		setupTopLevelAlbums();
 		configurationSoneParser.parseTopLevelAlbums(
-				createAlbumBuilderFactory());
+				createAlbumBuilderFactory(), sone);
 		setupImage(0, "I1", "A1", 1000L, null, "T1", "D1", 16, 9);
-		configurationSoneParser.parseImages(createImageBuilderFactory());
+		configurationSoneParser.parseImages(createImageBuilderFactory(), sone);
 	}
 
 	@Test(expected = InvalidImageFound.class)
 	public void missingTitleIsRecognized() {
 		setupTopLevelAlbums();
 		configurationSoneParser.parseTopLevelAlbums(
-				createAlbumBuilderFactory());
+				createAlbumBuilderFactory(), sone);
 		setupImage(0, "I1", "A1", 1000L, "K1", null, "D1", 16, 9);
-		configurationSoneParser.parseImages(createImageBuilderFactory());
+		configurationSoneParser.parseImages(createImageBuilderFactory(), sone);
 	}
 
 	@Test(expected = InvalidImageFound.class)
 	public void missingDescriptionIsRecognized() {
 		setupTopLevelAlbums();
 		configurationSoneParser.parseTopLevelAlbums(
-				createAlbumBuilderFactory());
+				createAlbumBuilderFactory(), sone);
 		setupImage(0, "I1", "A1", 1000L, "K1", "T1", null, 16, 9);
-		configurationSoneParser.parseImages(createImageBuilderFactory());
+		configurationSoneParser.parseImages(createImageBuilderFactory(), sone);
 	}
 
 	@Test(expected = InvalidImageFound.class)
 	public void missingWidthIsRecognized() {
 		setupTopLevelAlbums();
 		configurationSoneParser.parseTopLevelAlbums(
-				createAlbumBuilderFactory());
+				createAlbumBuilderFactory(), sone);
 		setupImage(0, "I1", "A1", 1000L, "K1", "T1", "D1", null, 9);
-		configurationSoneParser.parseImages(createImageBuilderFactory());
+		configurationSoneParser.parseImages(createImageBuilderFactory(), sone);
 	}
 
 	@Test(expected = InvalidImageFound.class)
 	public void missingHeightIsRecognized() {
 		setupTopLevelAlbums();
 		configurationSoneParser.parseTopLevelAlbums(
-				createAlbumBuilderFactory());
+				createAlbumBuilderFactory(), sone);
 		setupImage(0, "I1", "A1", 1000L, "K1", "T1", "D1", 16, null);
-		configurationSoneParser.parseImages(createImageBuilderFactory());
+		configurationSoneParser.parseImages(createImageBuilderFactory(), sone);
 	}
 
 }