Skip to content

Use map from examplemodels instead of duplicate #243

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

Merged
Entenwilli merged 3 commits into from
Feb 11, 2025
Merged

Use map from examplemodels instead of duplicate #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
93efd64
Use map from examplemodels instead of duplicate
uuqjz Feb 5, 2025
06d0879
Non static
uuqjz Feb 7, 2025
3240c06
Remove caching in build
Nicolas-Boltz Feb 7, 2025
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
6 changes: 0 additions & 6 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Cache
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml', '**/MANIFEST.MF') }}
restore-keys: ${{ runner.os }}-m2
- name: Set up JDK
uses: actions/setup-java@v4
with:
Expand Down
29 changes: 5 additions & 24 deletions ...wanalysis.analysis.tests/src/org/dataflowanalysis/analysis/tests/dfd/MicroSecEndTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,34 +23,15 @@
import org.dataflowanalysis.analysis.dfd.DFDDataFlowAnalysisBuilder;
import org.dataflowanalysis.analysis.dfd.core.DFDTransposeFlowGraphFinder;
import org.dataflowanalysis.examplemodels.Activator;
import org.dataflowanalysis.examplemodels.TuhhModels;
import org.junit.jupiter.api.Test;

import com.google.common.collect.ImmutableMap;

public class MicroSecEndTest {
public static final String PROJECT_NAME = "org.dataflowanalysis.examplemodels";
public static final String location = Paths.get("casestudies", "TUHH-Models")
.toString();
private final Logger logger = Logger.getLogger(MicroSecEndTest.class);

private static final Map<String, List<Integer>> TUHH_MODELS = ImmutableMap.<String, List<Integer>>builder()
.put("anilallewar", List.of(0, 6, 7, 8, 9, 11, 12, 18))
.put("apssouza22", List.of(0, 2, 4, 6, 7, 8, 12, 18))
.put("callistaenterprise", List.of(0, 2, 6, 11, 18))
.put("ewolff", List.of(5, 10, 12, 18))
.put("ewolff-kafka", List.of(0, 3, 4, 5, 6, 7, 8, 9, 18))
.put("fernandoabcampos", List.of(18))
.put("georgwittberger", List.of(0, 2, 3, 4, 5, 6, 7, 8, 10, 11, 12, 18))
.put("jferrater", List.of(0, 2, 3, 5, 6, 7, 8, 9, 18))
.put("koushikkothagal", List.of(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 18))
.put("mdeket", List.of(5))
.put("mudigal-technologies", List.of(0, 2, 4, 5, 7, 8, 11, 18))
.put("rohitghatol", List.of(10, 12, 18))
.put("spring-petclinic", List.of(0, 2, 3, 5, 6, 7, 8, 9, 18))
.put("sqshq", List.of(0, 6, 7, 8, 9, 10, 11, 12, 18))
.put("yidongnan", List.of(0, 2, 3, 4, 5, 6, 7, 8, 9, 18))
.build();

private DFDConfidentialityAnalysis buildAnalysis(String name) {
var dataFlowDiagramPath = name + ".dataflowdiagram";
var dataDictionaryPath = name + ".datadictionary";
Expand Down Expand Up @@ -110,10 +91,10 @@ private void performAnalysis(String model, int variant, Set<Integer> violationsS

@Test
void testConstraints() {
for (var model : TUHH_MODELS.keySet()) {
for (int variant : TUHH_MODELS.get(model)) {

var tuhhModels = TuhhModels.getTuhhModels();

for (var model : tuhhModels.keySet()) {
for (int variant : tuhhModels.get(model)) {
Set<Integer> violationSet = new TreeSet<Integer>();
String variationName = model + "_" + variant;
performAnalysis(Paths.get(location, model, variationName)
Expand Down