This is the codeAbility Sharing Platform! Learn more about the codeAbility Sharing Platform.

Skip to content
Snippets Groups Projects
Commit 4eb761e5 authored by Michael Breu's avatar Michael Breu
Browse files

Fixing Tests

parent bc1ebd32
2 merge requests!211Merge new meta data indexing,!205415 download von resourcen bugs
Hide whitespace changes
Inline Side-by-side
src/main/java/at/ac/uibk/gitsearch/service/ZipRepackagingService.java
+ 32
− 25
View file @ 4eb761e5
......@@ -230,12 +230,14 @@ public class ZipRepackagingService {
/**
* gets all applicable filters for all nodes within current path
*
* @param exercisePath the path to current exercise ( the item path is
* @param exercisePathF the path to current exercise ( the item path is
* absolute (i.e.
* relativ to project root) and may or not start with a
* relative to project root) and may or not start with a
* slash)
* @param currentTreeNode (path to exercise). The path to the meta data file
* must be absolute relative to git project root. The exclusion pathes inside the current Treenode may be absolute (to current Exercise Path, or relative)
* must be absolute relative to git project root. The
* exclusion pathes inside the current Treenode may be
* absolute (to current Exercise Path, or relative)
* @return
*/
......@@ -314,30 +316,35 @@ public class ZipRepackagingService {
}
}
//
// if (currentTreeNode.getData().getMetadata().getPublicVisibility().getExcept() != null) {
// if ("".equals(dirPath)) {
// // if in root, just use the current filters
// Arrays.stream(currentTreeNode.getData().getMetadata().getPublicVisibility().getExcept()).forEach(result::add);
// } else {
// // if not in root, check prepending path
// Arrays
// .stream(currentTreeNode.getData().getMetadata().getPublicVisibility().getExcept())
// .forEach(filterString -> {
// if (filterString.startsWith(Character.toString(FastIgnoreRule.PATH_SEPARATOR))) {
// result.add(FastIgnoreRule.PATH_SEPARATOR + dirPath + filterString);
// } else if (!filterString.startsWith("**") && filterString.indexOf(FastIgnoreRule.PATH_SEPARATOR) >= 0) {
// result.add(FastIgnoreRule.PATH_SEPARATOR + dirPath + FastIgnoreRule.PATH_SEPARATOR + filterString);
// } else {
// result.add(filterString);
// }
// });
// }
// }
// if (currentTreeNode.getData().getMetadata().getPublicVisibility().getExcept()
// != null) {
// if ("".equals(dirPath)) {
// // if in root, just use the current filters
// Arrays.stream(currentTreeNode.getData().getMetadata().getPublicVisibility().getExcept()).forEach(result::add);
// } else {
// // if not in root, check prepending path
// Arrays
// .stream(currentTreeNode.getData().getMetadata().getPublicVisibility().getExcept())
// .forEach(filterString -> {
// if
// (filterString.startsWith(Character.toString(FastIgnoreRule.PATH_SEPARATOR)))
// {
// result.add(FastIgnoreRule.PATH_SEPARATOR + dirPath + filterString);
// } else if (!filterString.startsWith("**") &&
// filterString.indexOf(FastIgnoreRule.PATH_SEPARATOR) >= 0) {
// result.add(FastIgnoreRule.PATH_SEPARATOR + dirPath +
// FastIgnoreRule.PATH_SEPARATOR + filterString);
// } else {
// result.add(filterString);
// }
// });
// }
// }
currentTreeNode.getChildren().forEach(childNode -> result.addAll(getApplicableFilters(exercisePath, childNode)));
return result;
// } else {
// return java.util.Collections.emptyList();
// }
// } else {
// return java.util.Collections.emptyList();
// }
}
protected static List<String> getApplicableOfCurrentAsParent(String exercisePath, TreeNode<SearchResultDTO> currentTreeNode) {
......
src/test/java/at/ac/uibk/gitsearch/service/ZipRepackagingServiceIT.java
+ 75
− 86
View file @ 4eb761e5
......@@ -4,7 +4,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import at.ac.uibk.gitsearch.GitsearchApp;
import at.ac.uibk.gitsearch.service.ZipRepackagingServiceTest.MockedSingletonTreeNodeForFiltering;
import io.netty.util.internal.StringUtil;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
......@@ -14,6 +14,9 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import io.netty.util.internal.StringUtil;
import org.junit.Assert;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
......@@ -44,7 +47,7 @@ public class ZipRepackagingServiceIT {
void testSimpleRepackage() throws IOException {
final List<String> zippedEntries = getZippedEntries(new ZipInputStream(this.getClass().getResourceAsStream(TEST_ZIP_LOCATION)))
.stream()
.map(s -> "/" + s.substring("junit-quality-tests-exercise-master".length() + 1))
.map(s -> s.substring("junit-quality-tests-exercise-master".length() + 1))
.filter(s -> !StringUtil.isNullOrEmpty(s))
.collect(Collectors.toList());
......@@ -152,33 +155,33 @@ public class ZipRepackagingServiceIT {
MockedSingletonTreeNodeForFiltering root = new MockedSingletonTreeNodeForFiltering(
"metadata.yml",
true,
"/infrastructure",
"/SS21_Assignment1/SimplePrograms_HelloWorld/SimplePrograms_HelloWorld_mit_musterloesung.ipynb",
"/SS21_Assignment1/SimplePrograms_Variables/SimplePrograms_Variables_mit_musterloesung.ipynb",
"/SS21_Assignment1/SimplePrograms_AddedValueTax/SimplePrograms_AddedValueTax_mit_musterloesung.ipynb",
"/SS21_Assignment1/SimplePrograms_Calculations/SimplePrograms_Calculations_mit_musterloesung.ipynb",
"/SS21_Assignment1/SimplePrograms_OfferCreator/SimplePrograms_OfferCreator_mit_musterloesung.ipynb",
"/SS23_Assignment2/Conditions_LargestNumber/Conditions_LargestNumber_mit_musterloesung.ipynb",
"/SS23_Assignment2/Conditions_NegativePositiveZero/Conditions_NegativePositiveZero_mit_musterloesung.ipynb",
"/SS23_Assignment2/Conditions_DiscountCalculator/Conditions_DiscountCalculator_mit_musterloesung.ipynb",
"/SS23_Assignment2/Conditions_Quarter/Conditions_Quarter_mit_musterloesung.ipynb",
"/SS23_Assignment2/Conditions_Calculator/Conditions_Calculator_mit_musterloesung.ipynb",
"/SS23_Assignment2/Conditions_WageTax/Conditions_WageTax_mit_musterloesung.ipynb"
"infrastructure",
"SS21_Assignment1/SimplePrograms_HelloWorld/SimplePrograms_HelloWorld_mit_musterloesung.ipynb",
"SS21_Assignment1/SimplePrograms_Variables/SimplePrograms_Variables_mit_musterloesung.ipynb",
"SS21_Assignment1/SimplePrograms_AddedValueTax/SimplePrograms_AddedValueTax_mit_musterloesung.ipynb",
"SS21_Assignment1/SimplePrograms_Calculations/SimplePrograms_Calculations_mit_musterloesung.ipynb",
"SS21_Assignment1/SimplePrograms_OfferCreator/SimplePrograms_OfferCreator_mit_musterloesung.ipynb",
"SS23_Assignment2/Conditions_LargestNumber/Conditions_LargestNumber_mit_musterloesung.ipynb",
"SS23_Assignment2/Conditions_NegativePositiveZero/Conditions_NegativePositiveZero_mit_musterloesung.ipynb",
"SS23_Assignment2/Conditions_DiscountCalculator/Conditions_DiscountCalculator_mit_musterloesung.ipynb",
"SS23_Assignment2/Conditions_Quarter/Conditions_Quarter_mit_musterloesung.ipynb",
"SS23_Assignment2/Conditions_Calculator/Conditions_Calculator_mit_musterloesung.ipynb",
"SS23_Assignment2/Conditions_WageTax/Conditions_WageTax_mit_musterloesung.ipynb"
);
MockedSingletonTreeNodeForFiltering assignment1 = new MockedSingletonTreeNodeForFiltering(
"SS21_Assignment1/metadata.yml",
true,
"/SimplePrograms_HelloWorld/SimplePrograms_HelloWorld_mit_musterloesung.ipynb",
"/SimplePrograms_Variables/SimplePrograms_Variables_mit_musterloesung.ipynb",
"/SimplePrograms_AddedValueTax/SimplePrograms_AddedValueTax_mit_musterloesung.ipynb",
"/SimplePrograms_Calculations/SimplePrograms_Calculations_mit_musterloesung.ipynb",
"/SimplePrograms_OfferCreator/SimplePrograms_OfferCreator_mit_musterloesung.ipynb"
"SimplePrograms_HelloWorld/SimplePrograms_HelloWorld_mit_musterloesung.ipynb",
"SimplePrograms_Variables/SimplePrograms_Variables_mit_musterloesung.ipynb",
"SimplePrograms_AddedValueTax/SimplePrograms_AddedValueTax_mit_musterloesung.ipynb",
"SimplePrograms_Calculations/SimplePrograms_Calculations_mit_musterloesung.ipynb",
"SimplePrograms_OfferCreator/SimplePrograms_OfferCreator_mit_musterloesung.ipynb"
);
MockedSingletonTreeNodeForFiltering helloWorld = new MockedSingletonTreeNodeForFiltering(
"SS21_Assignment1/SimplePrograms_HelloWorld/metadata.yml",
true,
"/SimplePrograms_HelloWorld_mit_musterloesung.ipynb",
"/SS21_Assignment1/SimplePrograms_HelloWorld/SimplePrograms_HelloWorld_mit_musterloesung.ipynb"
"SimplePrograms_HelloWorld_mit_musterloesung.ipynb",
"SS21_Assignment1/SimplePrograms_HelloWorld/SimplePrograms_HelloWorld_mit_musterloesung.ipynb"
);
assignment1.addChild(helloWorld);
root.addChild(assignment1);
......@@ -187,69 +190,53 @@ public class ZipRepackagingServiceIT {
}
private static List<String> expectedEntriesAll = List.of(
"/README.md",
"/SS21_Assignment1/",
"/SS21_Assignment1/SimplePrograms_AddedValueTax/",
"/SS21_Assignment1/SimplePrograms_AddedValueTax/SimplePrograms_AddedValueTax.ipynb",
"/SS21_Assignment1/SimplePrograms_AddedValueTax/metadata.yaml",
"/SS21_Assignment1/SimplePrograms_Calculations/",
"/SS21_Assignment1/SimplePrograms_Calculations/SimplePrograms_Calculations.ipynb",
"/SS21_Assignment1/SimplePrograms_Calculations/metadata.yaml",
"/SS21_Assignment1/SimplePrograms_HelloWorld/",
"/SS21_Assignment1/SimplePrograms_HelloWorld/SimplePrograms_HelloWorld.ipynb",
"/SS21_Assignment1/SimplePrograms_HelloWorld/metadata.yaml",
"/SS21_Assignment1/SimplePrograms_OfferCreator/",
"/SS21_Assignment1/SimplePrograms_OfferCreator/SimplePrograms_OfferCreator.ipynb",
"/SS21_Assignment1/SimplePrograms_OfferCreator/metadata.yaml",
"/SS21_Assignment1/SimplePrograms_Variables/",
"/SS21_Assignment1/SimplePrograms_Variables/SimplePrograms_Variables.ipynb",
"/SS21_Assignment1/SimplePrograms_Variables/metadata.yaml",
"/SS21_Assignment1/metadata.yaml",
"/SS23_Assignment2/",
"/SS23_Assignment2/Conditions_Calculator/",
"/SS23_Assignment2/Conditions_Calculator/Conditions_Calculator.ipynb",
"/SS23_Assignment2/Conditions_Calculator/metadata.yaml",
"/SS23_Assignment2/Conditions_DiscountCalculator/",
"/SS23_Assignment2/Conditions_DiscountCalculator/Conditions_DiscountCalculator.ipynb",
"/SS23_Assignment2/Conditions_DiscountCalculator/metadata.yaml",
"/SS23_Assignment2/Conditions_LargestNumber/",
"/SS23_Assignment2/Conditions_LargestNumber/Conditions_LargestNumber.ipynb",
"/SS23_Assignment2/Conditions_LargestNumber/metadata.yaml",
"/SS23_Assignment2/Conditions_NegativePositiveZero/",
"/SS23_Assignment2/Conditions_NegativePositiveZero/Conditions_NegativePositiveZero.ipynb",
"/SS23_Assignment2/Conditions_NegativePositiveZero/metadata.yaml",
"/SS23_Assignment2/Conditions_Quarter/",
"/SS23_Assignment2/Conditions_Quarter/Conditions_Quarter.ipynb",
"/SS23_Assignment2/Conditions_Quarter/metadata.yaml",
"/SS23_Assignment2/Conditions_WageTax/",
"/SS23_Assignment2/Conditions_WageTax/Conditions_WageTax.ipynb",
"/SS23_Assignment2/Conditions_WageTax/metadata.yaml",
"/SS23_Assignment2/metadata.yaml",
"/jku.png",
"/jku.svg",
"/metadata.yaml",
"/requirements.txt"
"README.md",
"SS21_Assignment1/",
"SS21_Assignment1/SimplePrograms_AddedValueTax/SimplePrograms_AddedValueTax.ipynb",
"SS21_Assignment1/SimplePrograms_AddedValueTax/metadata.yaml",
"SS21_Assignment1/SimplePrograms_Calculations/SimplePrograms_Calculations.ipynb",
"SS21_Assignment1/SimplePrograms_Calculations/metadata.yaml",
"SS21_Assignment1/SimplePrograms_HelloWorld/SimplePrograms_HelloWorld.ipynb",
"SS21_Assignment1/SimplePrograms_HelloWorld/metadata.yaml",
"SS21_Assignment1/SimplePrograms_OfferCreator/SimplePrograms_OfferCreator.ipynb",
"SS21_Assignment1/SimplePrograms_OfferCreator/metadata.yaml",
"SS21_Assignment1/SimplePrograms_Variables/SimplePrograms_Variables.ipynb",
"SS21_Assignment1/SimplePrograms_Variables/metadata.yaml",
"SS21_Assignment1/metadata.yaml",
"SS23_Assignment2/",
"SS23_Assignment2/Conditions_Calculator/Conditions_Calculator.ipynb",
"SS23_Assignment2/Conditions_Calculator/metadata.yaml",
"SS23_Assignment2/Conditions_DiscountCalculator/Conditions_DiscountCalculator.ipynb",
"SS23_Assignment2/Conditions_DiscountCalculator/metadata.yaml",
"SS23_Assignment2/Conditions_LargestNumber/Conditions_LargestNumber.ipynb",
"SS23_Assignment2/Conditions_LargestNumber/metadata.yaml",
"SS23_Assignment2/Conditions_NegativePositiveZero/Conditions_NegativePositiveZero.ipynb",
"SS23_Assignment2/Conditions_NegativePositiveZero/metadata.yaml",
"SS23_Assignment2/Conditions_Quarter/Conditions_Quarter.ipynb",
"SS23_Assignment2/Conditions_Quarter/metadata.yaml",
"SS23_Assignment2/Conditions_WageTax/Conditions_WageTax.ipynb",
"SS23_Assignment2/Conditions_WageTax/metadata.yaml",
"SS23_Assignment2/metadata.yaml",
"jku.png",
"jku.svg",
"metadata.yaml",
"requirements.txt"
);
private static List<String> expectedEntriesAssignment1 = List.of(
"/SimplePrograms_AddedValueTax/",
"/SimplePrograms_AddedValueTax/SimplePrograms_AddedValueTax.ipynb",
"/SimplePrograms_AddedValueTax/metadata.yaml",
"/SimplePrograms_Calculations/",
"/SimplePrograms_Calculations/SimplePrograms_Calculations.ipynb",
"/SimplePrograms_Calculations/metadata.yaml",
"/SimplePrograms_HelloWorld/",
"/SimplePrograms_HelloWorld/SimplePrograms_HelloWorld.ipynb",
"/SimplePrograms_HelloWorld/metadata.yaml",
"/SimplePrograms_OfferCreator/",
"/SimplePrograms_OfferCreator/SimplePrograms_OfferCreator.ipynb",
"/SimplePrograms_OfferCreator/metadata.yaml",
"/SimplePrograms_Variables/",
"/SimplePrograms_Variables/SimplePrograms_Variables.ipynb",
"/SimplePrograms_Variables/metadata.yaml",
"/metadata.yaml"
"SimplePrograms_AddedValueTax/SimplePrograms_AddedValueTax.ipynb",
"SimplePrograms_AddedValueTax/metadata.yaml",
"SimplePrograms_Calculations/SimplePrograms_Calculations.ipynb",
"SimplePrograms_Calculations/metadata.yaml",
"SimplePrograms_HelloWorld/SimplePrograms_HelloWorld.ipynb",
"SimplePrograms_HelloWorld/metadata.yaml",
"SimplePrograms_OfferCreator/SimplePrograms_OfferCreator.ipynb",
"SimplePrograms_OfferCreator/metadata.yaml",
"SimplePrograms_Variables/SimplePrograms_Variables.ipynb",
"SimplePrograms_Variables/metadata.yaml",
"metadata.yaml"
);
private static List<String> expectedEntriesHelloWorld = List.of("/SimplePrograms_HelloWorld.ipynb", "/metadata.yaml");
private static List<String> expectedEntriesHelloWorld = List.of("SimplePrograms_HelloWorld.ipynb", "metadata.yaml");
static Stream<Arguments> checkExplicitMethodSourceArgs() {
return Stream.of(
......@@ -270,22 +257,24 @@ public class ZipRepackagingServiceIT {
);
assertThat(applicableFiltersAll)
.containsAll(
List.of("/infrastructure", "/SS21_Assignment1/SimplePrograms_HelloWorld/SimplePrograms_HelloWorld_mit_musterloesung.ipynb")
List.of("**/infrastructure",
"/SS21_Assignment1/SimplePrograms_HelloWorld/SimplePrograms_HelloWorld_mit_musterloesung.ipynb")
);
assertThat(applicableFiltersAssignment)
.containsAll(
List.of(
"/infrastructure",
"**/infrastructure",
"/SS21_Assignment1/SimplePrograms_HelloWorld/SimplePrograms_HelloWorld_mit_musterloesung.ipynb",
"/SS21_Assignment1/SimplePrograms_Variables/SimplePrograms_Variables_mit_musterloesung.ipynb"
"**/SS21_Assignment1/SimplePrograms_Variables/SimplePrograms_Variables_mit_musterloesung.ipynb"
)
);
assertThat(applicableFiltersHelloWorld)
.containsAll(
List.of(
"/infrastructure",
"/SS21_Assignment1/SimplePrograms_HelloWorld/SimplePrograms_HelloWorld_mit_musterloesung.ipynb",
"/SS21_Assignment1/SimplePrograms_Variables/SimplePrograms_Variables_mit_musterloesung.ipynb"
"**/infrastructure",
"**/SS21_Assignment1/SimplePrograms_HelloWorld/SimplePrograms_HelloWorld_mit_musterloesung.ipynb",
"/SS21_Assignment1/**/SimplePrograms_Variables/SimplePrograms_Variables_mit_musterloesung.ipynb",
"**/SS21_Assignment1/SimplePrograms_Variables/SimplePrograms_Variables_mit_musterloesung.ipynb"
)
);
}
......
src/test/java/at/ac/uibk/gitsearch/service/ZipRepackagingServiceTest.java
+ 7
− 9
View file @ 4eb761e5
......@@ -5,8 +5,10 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import at.ac.uibk.gitsearch.domain.util.TreeNode;
import java.util.List;
import java.util.Optional;
import org.codeability.sharing.plugins.api.search.SearchResultDTO;
import org.codeability.sharing.plugins.api.search.UserProvidedMetadataDTO;
import org.codeability.sharing.plugins.api.search.UserProvidedMetadataDTO.PublicVisibility;
......@@ -60,15 +62,11 @@ class ZipRepackagingServiceTest {
public String[] getFilterStrings() {
return filterStrings;
}
// Käse
// void addChild(String subPath, TreeNode<SearchResultDTO> nodeData) {
// super.addChild(nodeData);
// if(StringUtils.isEmpty(subPath)) {
// this.getData().getFile().setPath("metadata.yaml");
// } else {
// this.getData().getFile().setPath(subPath + "/metadata.yaml");
// }
//
@Override
public String toString() {
return "MockedTreeNode[" + this.getData().getFile().getPath() + "]";
}
}
private Optional<TreeNode<SearchResultDTO>> getMockedFilterTreeNode(String... filters) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment