Skip to content

Commit 2221f20

Browse files
EntenwilliEntenwilli
committed
refactor(results): move results to their respective package (e.g. models or scenarios)
1 parent 0094f64 commit 2221f20

40 files changed

+85
-273
lines changed

‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/ComplexPseudoCycleResult.java

-31
This file was deleted.

‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DeadOutPinResult.java

-32
This file was deleted.

‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/MinimalResult.java

-31
This file was deleted.

‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleLoopResult.java

-32
This file was deleted.

‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/UnusedInputResult.java

-32
This file was deleted.

‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/WrongFlowNameResult.java

-32
This file was deleted.

‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/BranchingResult.java renamed to ‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/models/BranchingResult.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
package org.dataflowanalysis.examplemodels.results.dfd;
1+
package org.dataflowanalysis.examplemodels.results.dfd.models;
22

33
import org.dataflowanalysis.analysis.dsl.AnalysisConstraint;
44
import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL;
55
import org.dataflowanalysis.examplemodels.results.ExpectedViolation;
6+
import org.dataflowanalysis.examplemodels.results.dfd.DFDExampleModelResult;
67

78
import java.util.List;
89

‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/OnlineShopResult.java renamed to ‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/scenarios/OnlineShopResult.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
package org.dataflowanalysis.examplemodels.results.dfd;
1+
package org.dataflowanalysis.examplemodels.results.dfd.scenarios;
22

33
import org.dataflowanalysis.analysis.dsl.AnalysisConstraint;
44
import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL;
55
import org.dataflowanalysis.examplemodels.results.ExpectedCharacteristic;
66
import org.dataflowanalysis.examplemodels.results.ExpectedViolation;
7+
import org.dataflowanalysis.examplemodels.results.dfd.DFDExampleModelResult;
8+
import org.dataflowanalysis.examplemodels.results.dfd.DFDIdentifier;
79

810
import java.util.List;
911
import java.util.Map;

‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleOnlineShopResult.java renamed to ‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/scenarios/SimpleOnlineShopResult.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
package org.dataflowanalysis.examplemodels.results.dfd;
1+
package org.dataflowanalysis.examplemodels.results.dfd.scenarios;
22

33
import org.dataflowanalysis.analysis.dsl.AnalysisConstraint;
44
import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL;
55
import org.dataflowanalysis.examplemodels.results.ExpectedCharacteristic;
66
import org.dataflowanalysis.examplemodels.results.ExpectedViolation;
7+
import org.dataflowanalysis.examplemodels.results.dfd.DFDExampleModelResult;
8+
import org.dataflowanalysis.examplemodels.results.dfd.DFDIdentifier;
79

810
import java.util.List;
911
import java.util.Map;

‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/BankBranchesResult.java

-5
This file was deleted.

‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/ContactSMSResult.java

-5
This file was deleted.

‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/DistanceTrackerResult.java

-5
This file was deleted.

‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/FlightControlResult.java

-5
This file was deleted.

‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/FriendMapResult.java

-5
This file was deleted.

‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/HealthRecordResult.java

-5
This file was deleted.

‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/HospitalResult.java

-5
This file was deleted.

‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/ImageSharingResult.java

-5
This file was deleted.

‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/LoyaltyCardResult.java

-5
This file was deleted.

‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/PrivateTaxiResult.java

-5
This file was deleted.

‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CompositeResult.java renamed to ‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/CompositeResult.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package org.dataflowanalysis.examplemodels.results.pcm;
1+
package org.dataflowanalysis.examplemodels.results.pcm.models;
22

33
import org.dataflowanalysis.analysis.dsl.AnalysisConstraint;
44
import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL;
55
import org.dataflowanalysis.analysis.pcm.core.seff.SEFFPCMVertex;
66
import org.dataflowanalysis.analysis.pcm.core.user.UserPCMVertex;
7-
import org.dataflowanalysis.analysis.pcm.dsl.PCMVertexType;
87
import org.dataflowanalysis.examplemodels.results.ExpectedViolation;
8+
import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult;
99

1010
import java.util.ArrayList;
1111
import java.util.List;

‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/IgnoredNodesResult.java renamed to ‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/IgnoredNodesResult.java

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
1-
package org.dataflowanalysis.examplemodels.results.pcm;
1+
package org.dataflowanalysis.examplemodels.results.pcm.models;
22

33
import org.dataflowanalysis.analysis.dsl.AnalysisConstraint;
44
import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL;
5-
import org.dataflowanalysis.analysis.dsl.selectors.Intersection;
6-
import org.dataflowanalysis.analysis.dsl.variable.ConstraintVariable;
75
import org.dataflowanalysis.analysis.pcm.dsl.PCMVertexType;
86
import org.dataflowanalysis.examplemodels.results.ExpectedCharacteristic;
97
import org.dataflowanalysis.examplemodels.results.ExpectedViolation;
8+
import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult;
9+
import org.dataflowanalysis.examplemodels.results.pcm.PCMIdentifier;
1010

1111
import java.util.List;
1212
import java.util.Map;
1313

14-
/**
15-
* TODO: This test model tests a specific feature not a integration/E2E test
16-
*/
1714
public class IgnoredNodesResult implements PCMExampleModelResult {
1815
@Override
1916
public String getModelName() {

‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/MultipleDeploymentsResult.java renamed to ‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/MultipleDeploymentsResult.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
package org.dataflowanalysis.examplemodels.results.pcm;
1+
package org.dataflowanalysis.examplemodels.results.pcm.models;
22

33
import org.dataflowanalysis.analysis.dsl.AnalysisConstraint;
44
import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL;
55
import org.dataflowanalysis.examplemodels.results.ExpectedCharacteristic;
66
import org.dataflowanalysis.examplemodels.results.ExpectedViolation;
7+
import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult;
8+
import org.dataflowanalysis.examplemodels.results.pcm.PCMIdentifier;
79

810
import java.util.List;
911
import java.util.Map;
10-
import java.util.UUID;
1112

1213
public class MultipleDeploymentsResult implements PCMExampleModelResult {
1314
@Override

‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/NodeCharacteristicsResult.java renamed to ‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/NodeCharacteristicsResult.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
package org.dataflowanalysis.examplemodels.results.pcm;
1+
package org.dataflowanalysis.examplemodels.results.pcm.models;
22

33
import org.dataflowanalysis.analysis.dsl.AnalysisConstraint;
44
import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL;
5-
import org.dataflowanalysis.analysis.dsl.selectors.Intersection;
6-
import org.dataflowanalysis.analysis.dsl.variable.ConstraintVariable;
75
import org.dataflowanalysis.analysis.pcm.core.seff.SEFFPCMVertex;
86
import org.dataflowanalysis.analysis.pcm.core.user.UserPCMVertex;
97
import org.dataflowanalysis.examplemodels.results.ExpectedViolation;
8+
import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult;
109

1110
import java.util.ArrayList;
1211
import java.util.List;

‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/VariableReturnResult.java renamed to ‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/VariableReturnResult.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
package org.dataflowanalysis.examplemodels.results.pcm;
1+
package org.dataflowanalysis.examplemodels.results.pcm.models;
22

33
import org.dataflowanalysis.analysis.dsl.AnalysisConstraint;
44
import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL;
55
import org.dataflowanalysis.analysis.dsl.selectors.Intersection;
66
import org.dataflowanalysis.analysis.dsl.variable.ConstraintVariable;
77
import org.dataflowanalysis.examplemodels.results.ExpectedCharacteristic;
88
import org.dataflowanalysis.examplemodels.results.ExpectedViolation;
9+
import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult;
10+
import org.dataflowanalysis.examplemodels.results.pcm.PCMIdentifier;
911

1012
import java.util.List;
1113
import java.util.Map;
12-
import java.util.UUID;
1314

1415
public class VariableReturnResult implements PCMExampleModelResult {
1516
@Override

‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/BankBranchesResult.java

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package org.dataflowanalysis.examplemodels.results.pcm.scenarios;
2+
3+
public class BankBranchesResult {
4+
//TODO
5+
}

‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/BranchingOnlineShopResult.java renamed to ‎bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/BranchingOnlineShopResult.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
package org.dataflowanalysis.examplemodels.results.pcm;
1+
package org.dataflowanalysis.examplemodels.results.pcm.scenarios;
22

33
import org.dataflowanalysis.analysis.dsl.AnalysisConstraint;
44
import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL;
55
import org.dataflowanalysis.examplemodels.results.ExpectedViolation;
6+
import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult;
67

78
import java.util.List;
89

0 commit comments

Comments
 (0)