Skip to content
Snippets Groups Projects
Commit 800527ee authored by René Schöne's avatar René Schöne
Browse files

make dependency definitions deprecated

- update junit dependencies
- renamed Warnings and Errors to end with "Test"
parent 97ba4f4b
No related branches found
No related tags found
1 merge request!34Resolve "Make explicit dependency definitions deprecated"
Pipeline #14536 passed
......@@ -111,6 +111,9 @@ aspect RagConnectNavigation {
// return containedFile().getFileName();
}
// --- isFirstInList ---
inh boolean DependencyDefinition.isFirstInList();
eq ConnectSpecification.getDependencyDefinition(int index).isFirstInList() = index == 0;
//--- givenEndpointTargetList ---
syn List<EndpointTarget> RagConnect.givenEndpointTargetList() {
......
......@@ -7,6 +7,10 @@ aspect Warnings {
when ragconnect().configIncrementalOptionActive()
to RagConnect.warnings();
DependencyDefinition contributes warning("Dependency definition are deprecated since 1.0.0!")
when this.isFirstInList() // print warning only once for first dependency definition
to RagConnect.warnings();
EndpointDefinition contributes warning("No dependency definitions are given, and incremental evaluation is disabled. No messages will be sent for this!")
when getSend() && ragconnect().allDependencyDefinitionList().isEmpty() && !ragconnect().configIncrementalOptionActive()
to RagConnect.warnings();
......
/**
* @deprecated Manual dependency definitions are not fully tested any longer since 1.0.0, see <a href="https://jastadd.pages.st.inf.tu-dresden.de/ragconnect-dev/dsl/#dependency-definitions">https://jastadd.pages.st.inf.tu-dresden.de/ragconnect-dev/dsl/#dependency-definitions</a>
*/
@Deprecated(since = "1.0.0")
public void {{targetParentTypeName}}.{{dependencyMethodName}}({{sourceParentTypeName}} source) {
add{{internalRelationPrefix}}Source(source);
}
......@@ -49,9 +49,9 @@ dependencies {
implementation group: 'org.jastadd', name: 'jastadd2', version: '2.3.5-dresden-7'
relast group: 'org.jastadd', name: 'relast', version: "0.3.0-137"
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.4.0'
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.4.0'
testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.12.1'
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.9.0'
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.9.0'
testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.23.1'
testImplementation group: 'org.awaitility', name: 'awaitility', version: '4.1.1'
testImplementation group: 'io.github.artsok', name: 'rerunner-jupiter', version: '2.1.6'
......
TestSomeDependencies.connect Line 3, column 1: Dependency definition are deprecated since 1.0.0!
TestSomeDependencies.connect Line 3, column 1: Dependency definition should not be used if incremental evaluation is enabled!
TestSomeDependencies.connect Line 1, column 1: Incremental evaluation is disabled, but cache=all is set. This might lead to no messages sent!
TestSomeDependencies.connect Line 3, column 1: Dependency definition are deprecated since 1.0.0!
......@@ -2,8 +2,6 @@ package org.jastadd.ragconnect.tests;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
......@@ -22,7 +20,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
*
* @author rschoene - Initial contribution
*/
public class Errors extends RagConnectTest {
public class ErrorsTest extends RagConnectTest {
private static final String ERROR_DIRECTORY = "errors/";
private static final String OUTPUT_DIRECTORY = TestUtils.OUTPUT_DIRECTORY_PREFIX + ERROR_DIRECTORY;
......
......@@ -2,8 +2,6 @@ package org.jastadd.ragconnect.tests;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
......@@ -21,7 +19,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
*
* @author rschoene - Initial contribution
*/
public class Warnings extends RagConnectTest {
public class WarningsTest extends RagConnectTest {
private static final String WARNING_DIRECTORY = "warnings/";
private static final String OUTPUT_DIRECTORY = TestUtils.OUTPUT_DIRECTORY_PREFIX + WARNING_DIRECTORY;
......@@ -86,8 +84,8 @@ public class Warnings extends RagConnectTest {
out = out.substring(out.indexOf(startOfWarningsPattern) + startOfWarningsPattern.length());
TestUtils.assertLinesMatch(WARNING_DIRECTORY, expectedName, out);
logger.debug("ragconnect for " + expectedName + " returned:\n{}", out);
logger.info("ragconnect for " + expectedName + " returned:\n{}", out);
TestUtils.assertLinesMatch(WARNING_DIRECTORY, expectedName, out);
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment