Skip to content

Commit 4d7401a

Browse files
committed
JS: Deprecate tests for deprecated APIs
Mainly adds 'deprecated' in front of a bunch of tests for deprecated APIs.
1 parent 3548544 commit 4d7401a

File tree

25 files changed

+59
-53
lines changed

25 files changed

+59
-53
lines changed

javascript/ql/test/library-tests/Arrays/DataFlow.ql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ module TestConfig implements DataFlow::ConfigSig {
1010

1111
module TestFlow = DataFlow::Global<TestConfig>;
1212

13-
class LegacyConfig extends DataFlow::Configuration {
13+
deprecated class LegacyConfig extends DataFlow::Configuration {
1414
LegacyConfig() { this = "LegacyConfig" }
1515

1616
override predicate isSource(DataFlow::Node source) { TestConfig::isSource(source) }
1717

1818
override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
1919
}
2020

21-
import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
21+
deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
2222

2323
query predicate flow = TestFlow::flow/2;

javascript/ql/test/library-tests/Arrays/TaintFlow.ql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ module TestConfig implements DataFlow::ConfigSig {
1010

1111
module TestFlow = TaintTracking::Global<TestConfig>;
1212

13-
class LegacyConfig extends TaintTracking::Configuration {
13+
deprecated class LegacyConfig extends TaintTracking::Configuration {
1414
LegacyConfig() { this = "LegacyConfig" }
1515

1616
override predicate isSource(DataFlow::Node source) { TestConfig::isSource(source) }
1717

1818
override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
1919
}
2020

21-
import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
21+
deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
2222

2323
query predicate flow = TestFlow::flow/2;

javascript/ql/test/library-tests/Barriers/SimpleBarrierGuard.ql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class SimpleBarrierGuardNode extends DataFlow::BarrierGuardNode, DataFlow::Invok
3030
}
3131
}
3232

33-
class LegacyConfig extends DataFlow::Configuration {
33+
deprecated class LegacyConfig extends DataFlow::Configuration {
3434
LegacyConfig() { this = "LegacyConfig" }
3535

3636
override predicate isSource(DataFlow::Node source) { TestConfig::isSource(source) }
@@ -42,6 +42,6 @@ class LegacyConfig extends DataFlow::Configuration {
4242
}
4343
}
4444

45-
import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
45+
deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
4646

4747
query predicate flow = TestFlow::flow/2;

javascript/ql/test/library-tests/Classes/tests.ql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@ module TestConfig implements DataFlow::ConfigSig {
6969

7070
module TestFlow = DataFlow::Global<TestConfig>;
7171

72-
class LegacyConfig extends DataFlow::Configuration {
72+
deprecated class LegacyConfig extends DataFlow::Configuration {
7373
LegacyConfig() { this = "LegacyConfig" }
7474

7575
override predicate isSource(DataFlow::Node source) { TestConfig::isSource(source) }
7676

7777
override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
7878
}
7979

80-
import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
80+
deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
8181

8282
query predicate dataflow = TestFlow::flow/2;
8383

javascript/ql/test/library-tests/CustomLoadStoreSteps/test.ql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import javascript
22

33
// Note: this test has not been ported to ConfigSig, because isAdditionalLoadStep has no equivalent there
4-
class Configuration extends TaintTracking::Configuration {
4+
deprecated class Configuration extends TaintTracking::Configuration {
55
Configuration() { this = "PromiseFlowTestingConfig" }
66

77
override predicate isSource(DataFlow::Node source) {
@@ -34,6 +34,6 @@ class Configuration extends TaintTracking::Configuration {
3434
}
3535
}
3636

37-
from DataFlow::Node pred, DataFlow::Node succ, Configuration cfg
38-
where cfg.hasFlow(pred, succ)
39-
select pred, succ
37+
deprecated query predicate flow(DataFlow::Node source, DataFlow::Node sink) {
38+
any(Configuration cfg).hasFlow(source, sink)
39+
}

javascript/ql/test/library-tests/Generators/DataFlow.ql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ module TestConfig implements DataFlow::ConfigSig {
1111

1212
module TestFlow = DataFlow::Global<TestConfig>;
1313

14-
class LegacyConfig extends DataFlow::Configuration {
14+
deprecated class LegacyConfig extends DataFlow::Configuration {
1515
LegacyConfig() { this = "GeneratorFlowConfig" }
1616

1717
override predicate isSource(DataFlow::Node source) { TestConfig::isSource(source) }
1818

1919
override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
2020
}
2121

22-
import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
22+
deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
2323

2424
class Consistency extends ConsistencyConfiguration {
2525
Consistency() { this = "Consistency" }

javascript/ql/test/library-tests/Promises/flow.qll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import javascript
22
private import semmle.javascript.dataflow.internal.StepSummary
3-
import testUtilities.LegacyDataFlowDiff
3+
deprecated import testUtilities.LegacyDataFlowDiff
44

55
module ValueFlowConfig implements DataFlow::ConfigSig {
66
predicate isSource(DataFlow::Node source) {
@@ -45,7 +45,7 @@ class LegacyValueConfig extends DataFlow::Configuration {
4545
override predicate isSink(DataFlow::Node sink) { ValueFlowConfig::isSink(sink) }
4646
}
4747

48-
query predicate valueFlowDifference =
48+
deprecated query predicate valueFlowDifference =
4949
DataFlowDiff<ValueFlow, LegacyValueConfig>::legacyDataFlowDifference/3;
5050

5151
class LegacyTaintConfig extends TaintTracking::Configuration {
@@ -56,5 +56,5 @@ class LegacyTaintConfig extends TaintTracking::Configuration {
5656
override predicate isSink(DataFlow::Node sink) { TaintConfig::isSink(sink) }
5757
}
5858

59-
query predicate taintFlowDifference =
59+
deprecated query predicate taintFlowDifference =
6060
DataFlowDiff<TaintFlow, LegacyTaintConfig>::legacyDataFlowDifference/3;

javascript/ql/test/library-tests/Routing/test.ql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ class Consistency extends ConsistencyConfiguration {
2525
override DataFlow::Node getAnAlert() { TestFlow::flowTo(result) }
2626
}
2727

28-
class LegacyConfig extends TaintTracking::Configuration {
28+
deprecated class LegacyConfig extends TaintTracking::Configuration {
2929
LegacyConfig() { this = "LegacyConfig" }
3030

3131
override predicate isSource(DataFlow::Node source) { TestConfig::isSource(source) }
3232

3333
override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
3434
}
3535

36-
import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
36+
deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>

javascript/ql/test/library-tests/Security/heuristics/HeuristicSource.ql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ class Consistency extends ConsistencyConfiguration {
1818
override DataFlow::Node getAnAlert() { TestFlow::flowTo(result) }
1919
}
2020

21-
class LegacyConfig extends TaintTracking::Configuration {
21+
deprecated class LegacyConfig extends TaintTracking::Configuration {
2222
LegacyConfig() { this = "LegacyConfig" }
2323

2424
override predicate isSource(DataFlow::Node source) { TestConfig::isSource(source) }
2525

2626
override predicate isSink(DataFlow::Node sink) { TestConfig::isSink(sink) }
2727
}
2828

29-
import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>
29+
deprecated import testUtilities.LegacyDataFlowDiff::DataFlowDiff<TestFlow, LegacyConfig>

javascript/ql/test/library-tests/TaintBarriers/ExampleConfiguration.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ module TestConfig implements DataFlow::ConfigSig {
4242

4343
module TestFlow = TaintTracking::Global<TestConfig>;
4444

45-
class ExampleConfiguration extends TaintTracking::Configuration {
45+
deprecated class ExampleConfiguration extends TaintTracking::Configuration {
4646
ExampleConfiguration() { this = "ExampleConfiguration" }
4747

4848
override predicate isSource(DataFlow::Node source) { TestConfig::isSource(source) }

0 commit comments

Comments
 (0)