Skip to content

Gradle test update #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Slashdacoda wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Gradle test update #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e886cc1
Fix gradle test
Sep 6, 2018
fbe8833
Fix gradle test
Sep 6, 2018
3cf5a6c
Fix gradle test
Sep 6, 2018
9ee7018
Fix gradle test
Sep 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/test/java/io/github/infolis/algorithm/FederatedSearcherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,14 @@ public void testDaraQueryServices() throws IOException {
List<SearchResult> searchResults = dataStoreClient.get(SearchResult.class, execution.getSearchResults());
// since the query service is given twice, FederatedSearcher should find the same result twice
assertEquals(2, searchResults.size());
assertEquals("10.4232/1.5126", searchResults.get(0).getIdentifier());
assertEquals("10.4232/1.5126", searchResults.get(1).getIdentifier());

//Update from 10.4232/1.5126 to 10.4232/1.12967
//assertEquals("10.4232/1.5126", searchResults.get(0).getIdentifier());
//assertEquals("10.4232/1.5126", searchResults.get(1).getIdentifier());

assertEquals("10.4232/1.12967", searchResults.get(0).getIdentifier());
assertEquals("10.4232/1.12967", searchResults.get(1).getIdentifier());

}

}
18 changes: 13 additions & 5 deletions src/test/java/io/github/infolis/algorithm/ReferenceLinkerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import io.github.infolis.model.entity.InfolisFile;
import io.github.infolis.infolink.querying.DaraHTMLQueryService;
import io.github.infolis.infolink.querying.QueryService;
//import io.github.infolis.util.SerializationUtils;

/**
*
Expand Down Expand Up @@ -49,8 +50,10 @@ public void testExecute() throws IOException {
EntityLink link2 = dataStoreClient.get(EntityLink.class, linkUris.get(1));
Entity toEntity2 = dataStoreClient.get(Entity.class, link2.getToEntity());
Entity fromEntity2 = dataStoreClient.get(Entity.class, link2.getFromEntity());
assertEquals("Studiensituation und studentische Orientierungen 2012/13 (Studierenden-Survey)", toEntity2.getName());
assertEquals("10.4232/1.5126", toEntity2.getIdentifiers().get(0));
// Einzukommentieren! //assertEquals("Studiensituation und studentische Orientierungen 2012/13 (Studierenden-Survey)", toEntity2.getName());
//assertEquals("10.4232/1.5126", toEntity2.getIdentifiers().get(0));
assertEquals("10.4232/1.12510", toEntity2.getIdentifiers().get(0));

assertEquals("Studierendensurvey", toEntity1.getName());
assertEquals(Arrays.asList("2012/13"), toEntity1.getNumericInfo());
assertEquals(toEntity1.getUri(), fromEntity2.getUri());
Expand All @@ -62,8 +65,13 @@ public void testExecute() throws IOException {
exec2.setSearchResultLinkerClass(MultiMatchesLinker.class);
exec2.instantiateAlgorithm(dataStoreClient, fileResolver).run();
linkUris = exec2.getLinks();
assertEquals(4, linkUris.size());
assertEquals(5, linkUris.size());
List<EntityLink> links = dataStoreClient.get(EntityLink.class, linkUris);
/*System.out.println(SerializationUtils.toJSON(links.get(0)));
System.out.println(SerializationUtils.toJSON(links.get(1)));
System.out.println(SerializationUtils.toJSON(links.get(2)));
System.out.println(SerializationUtils.toJSON(links.get(3)));
System.out.println(SerializationUtils.toJSON(links.get(4)));*/
toEntity1 = dataStoreClient.get(Entity.class, links.get(1).getToEntity());
toEntity2 = dataStoreClient.get(Entity.class, links.get(2).getToEntity());
Entity toEntity3 = dataStoreClient.get(Entity.class, links.get(3).getToEntity());
Expand Down Expand Up @@ -93,7 +101,7 @@ public void testExecute() throws IOException {
exec4.setSearchResultLinkerClass(MultiMatchesLinker.class);
exec4.instantiateAlgorithm(dataStoreClient, fileResolver).run();
linkUris = exec4.getLinks();
assertEquals(26, linkUris.size());
assertEquals(28, linkUris.size());

// tests for query cache
Execution exec5 = new Execution();
Expand Down Expand Up @@ -151,4 +159,4 @@ public void testExecute() throws IOException {
assertEquals("10.4232/1.4875", toEntity7b.getIdentifiers().get(0));
}

}
}
7 changes: 5 additions & 2 deletions src/test/java/io/github/infolis/algorithm/SearchDoisAndCreateLinksTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
public class SearchDoisAndCreateLinksTest extends InfolisBaseTest {

private final String[] testString = {
"Version 1.0.0, 21.03.2013 erste Archiv-Version doi:10.4232/1.11692. Änderungen in dieser Version. 2013-11-21, Fehler in Antwortskala für V749 OVERALL ..."
//"Version 1.0.0, 21.03.2013 erste Archiv-Version doi:10.4232/1.11692. Änderungen in dieser Version. 2013-11-21, Fehler in Antwortskala für V749 OVERALL ..."
"Version 1.0.1 (aktuelle Version) 21.11.2013 Antwortskala für V749 OVERALL LIFE SATISFACTION korrigiert doi:10.4232/1.11782"
};
private List<String> uris = new ArrayList<>();

Expand Down Expand Up @@ -65,7 +66,9 @@ public void testSearchDoisAndCreateLinks() throws IOException {
el = createdLinks.get(1);
Entity targetEntity = dataStoreClient.get(Entity.class, el.getToEntity());
assertEquals("German General Social Survey - ALLBUS 2010", targetEntity.getName());
assertEquals("10.4232/1.11692", (targetEntity.getIdentifiers().get(0)));
//assertEquals("10.4232/1.11692", (targetEntity.getIdentifiers().get(0)));
assertEquals("10.4232/1.11782", (targetEntity.getIdentifiers().get(0)));

}

public List<String> postQueryServices() throws IOException {
Expand Down
47 changes: 35 additions & 12 deletions src/test/java/io/github/infolis/infolink/querying/DaraSolrMatcherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,41 @@ public class DaraSolrMatcherTest {

// note: da|ra's database may change! If test fails, check whether these values are still correct
public DaraSolrMatcherTest() {
expectedOutput.put("10.4232/1.4263", "Studiensituation und studentische Orientierungen 2006/07 (Studierenden-Survey)");
expectedOutput.put("10.4232/1.4344", "Studiensituation und studentische Orientierungen 2003/04 (Studierenden-Survey)");
expectedOutput.put("10.4232/1.11059", "Studiensituation und studentische Orientierungen 2009/10 (Studierenden-Survey)");
expectedOutput.put("10.4232/1.1884", "Studiensituation und studentische Orientierungen 1982/83 (Studierenden-Survey)");
expectedOutput.put("10.4232/1.1885", "Studiensituation und studentische Orientierungen 1984/85 (Studierenden-Survey)");
expectedOutput.put("10.4232/1.3130", "Studiensituation und studentische Orientierungen 1992/93 (Studierenden-Survey)");
expectedOutput.put("10.4232/1.3131", "Studiensituation und studentische Orientierungen 1994/95 (Studierenden-Survey)");
expectedOutput.put("10.4232/1.2416", "Studiensituation und studentische Orientierungen 1986/87 (Studierenden-Survey)");
expectedOutput.put("10.4232/1.2417", "Studiensituation und studentische Orientierungen 1989/90 (Studierenden-Survey)");
expectedOutput.put("10.4232/1.5126", "Studiensituation und studentische Orientierungen 2012/13 (Studierenden-Survey)");
expectedOutput.put("10.4232/1.4208", "Studiensituation und studentische Orientierungen 2000/01 (Studierenden-Survey)");
expectedOutput.put("10.4232/1.3511", "Studiensituation und studentische Orientierungen 1997/98 (Studierenden-Survey)");
//expectedOutput.put("10.4232/1.4263", "Studiensituation und studentische Orientierungen 2006/07 (Studierenden-Survey)");
expectedOutput.put("10.4232/1.12507", "Studiensituation und studentische Orientierungen 2006/07 (Studierenden-Survey)");

//expectedOutput.put("10.4232/1.4344", "Studiensituation und studentische Orientierungen 2003/04 (Studierenden-Survey)");
expectedOutput.put("10.4232/1.12508", "Studiensituation und studentische Orientierungen 2003/04 (Studierenden-Survey)");

//expectedOutput.put("10.4232/1.11059", "Studiensituation und studentische Orientierungen 2009/10 (Studierenden-Survey)");
expectedOutput.put("10.4232/1.12509", "Studiensituation und studentische Orientierungen 2009/10 (Studierenden-Survey)");

//expectedOutput.put("10.4232/1.1884", "Studiensituation und studentische Orientierungen 1982/83 (Studierenden-Survey)");
expectedOutput.put("10.4232/1.12499", "Studiensituation und studentische Orientierungen 1982/83 (Studierenden-Survey)");

//expectedOutput.put("10.4232/1.1885", "Studiensituation und studentische Orientierungen 1984/85 (Studierenden-Survey)");
expectedOutput.put("10.4232/1.12500", "Studiensituation und studentische Orientierungen 1984/85 (Studierenden-Survey)");

//expectedOutput.put("10.4232/1.3130", "Studiensituation und studentische Orientierungen 1992/93 (Studierenden-Survey)");
expectedOutput.put("10.4232/1.12503", "Studiensituation und studentische Orientierungen 1992/93 (Studierenden-Survey)");

//expectedOutput.put("10.4232/1.3131", "Studiensituation und studentische Orientierungen 1994/95 (Studierenden-Survey)");
expectedOutput.put("10.4232/1.12504", "Studiensituation und studentische Orientierungen 1994/95 (Studierenden-Survey)");

//expectedOutput.put("10.4232/1.2416", "Studiensituation und studentische Orientierungen 1986/87 (Studierenden-Survey)");
expectedOutput.put("10.4232/1.12501", "Studiensituation und studentische Orientierungen 1986/87 (Studierenden-Survey)");

//expectedOutput.put("10.4232/1.2417", "Studiensituation und studentische Orientierungen 1989/90 (Studierenden-Survey)");
expectedOutput.put("10.4232/1.12502", "Studiensituation und studentische Orientierungen 1989/90 (Studierenden-Survey)");

//expectedOutput.put("10.4232/1.5126", "Studiensituation und studentische Orientierungen 2012/13 (Studierenden-Survey)");
expectedOutput.put("10.4232/1.12510", "Studiensituation und studentische Orientierungen 2012/13 (Studierenden-Survey)");

//expectedOutput.put("10.4232/1.4208", "Studiensituation und studentische Orientierungen 2000/01 (Studierenden-Survey)");
expectedOutput.put("10.4232/1.12506", "Studiensituation und studentische Orientierungen 2000/01 (Studierenden-Survey)");

//expectedOutput.put("10.4232/1.3511", "Studiensituation und studentische Orientierungen 1997/98 (Studierenden-Survey)");
expectedOutput.put("10.4232/1.12505", "Studiensituation und studentische Orientierungen 1997/98 (Studierenden-Survey)");
}

@Test
Expand Down