From 78201a2c5fb05b219c0fc855af5651f38bd4b9d6 Mon Sep 17 00:00:00 2001
From: Max Schaefer <max@semmle.com>
Date: Mon, 11 May 2020 10:47:00 +0100
Subject: [PATCH] Rename `ConditionBypass*` to `ConditionalBypass*` for
 consistency with other languages.

---
 .../{ConditionBypass.qhelp => ConditionalBypass.qhelp}        | 4 ++--
 .../CWE-840/{ConditionBypass.ql => ConditionalBypass.ql}      | 0
 .../{ConditionBypassBad.go => ConditionalBypassBad.go}        | 0
 .../{ConditionBypassGood.go => ConditionalBypassGood.go}      | 0
 ql/test/experimental/CWE-840/ConditionBypass.qlref            | 1 -
 .../{ConditionBypass.expected => ConditionalBypass.expected}  | 0
 ql/test/experimental/CWE-840/ConditionalBypass.qlref          | 1 +
 7 files changed, 3 insertions(+), 3 deletions(-)
 rename ql/src/experimental/CWE-840/{ConditionBypass.qhelp => ConditionalBypass.qhelp} (88%)
 rename ql/src/experimental/CWE-840/{ConditionBypass.ql => ConditionalBypass.ql} (100%)
 rename ql/src/experimental/CWE-840/{ConditionBypassBad.go => ConditionalBypassBad.go} (100%)
 rename ql/src/experimental/CWE-840/{ConditionBypassGood.go => ConditionalBypassGood.go} (100%)
 delete mode 100644 ql/test/experimental/CWE-840/ConditionBypass.qlref
 rename ql/test/experimental/CWE-840/{ConditionBypass.expected => ConditionalBypass.expected} (100%)
 create mode 100644 ql/test/experimental/CWE-840/ConditionalBypass.qlref

diff --git a/ql/src/experimental/CWE-840/ConditionBypass.qhelp b/ql/src/experimental/CWE-840/ConditionalBypass.qhelp
similarity index 88%
rename from ql/src/experimental/CWE-840/ConditionBypass.qhelp
rename to ql/src/experimental/CWE-840/ConditionalBypass.qhelp
index 70525e1b0d9..5151c402cef 100644
--- a/ql/src/experimental/CWE-840/ConditionBypass.qhelp
+++ b/ql/src/experimental/CWE-840/ConditionalBypass.qhelp
@@ -18,10 +18,10 @@ Instead, use a configuration to store and access the values required.
 The following example shows a comparison where both the sides 
 are from attacker-controlled request headers. This should be avoided.:
 </p>
-        <sample src="ConditionBypassBad.go" />
+        <sample src="ConditionalBypassBad.go" />
         <p>
 One way to remedy the problem is to test against a value stored in a configuration:
 </p>
-        <sample src="ConditionBypassGood.go" />
+        <sample src="ConditionalBypassGood.go" />
     </example>
 </qhelp>
\ No newline at end of file
diff --git a/ql/src/experimental/CWE-840/ConditionBypass.ql b/ql/src/experimental/CWE-840/ConditionalBypass.ql
similarity index 100%
rename from ql/src/experimental/CWE-840/ConditionBypass.ql
rename to ql/src/experimental/CWE-840/ConditionalBypass.ql
diff --git a/ql/src/experimental/CWE-840/ConditionBypassBad.go b/ql/src/experimental/CWE-840/ConditionalBypassBad.go
similarity index 100%
rename from ql/src/experimental/CWE-840/ConditionBypassBad.go
rename to ql/src/experimental/CWE-840/ConditionalBypassBad.go
diff --git a/ql/src/experimental/CWE-840/ConditionBypassGood.go b/ql/src/experimental/CWE-840/ConditionalBypassGood.go
similarity index 100%
rename from ql/src/experimental/CWE-840/ConditionBypassGood.go
rename to ql/src/experimental/CWE-840/ConditionalBypassGood.go
diff --git a/ql/test/experimental/CWE-840/ConditionBypass.qlref b/ql/test/experimental/CWE-840/ConditionBypass.qlref
deleted file mode 100644
index d107d9110d5..00000000000
--- a/ql/test/experimental/CWE-840/ConditionBypass.qlref
+++ /dev/null
@@ -1 +0,0 @@
-experimental/CWE-840/ConditionBypass.ql
diff --git a/ql/test/experimental/CWE-840/ConditionBypass.expected b/ql/test/experimental/CWE-840/ConditionalBypass.expected
similarity index 100%
rename from ql/test/experimental/CWE-840/ConditionBypass.expected
rename to ql/test/experimental/CWE-840/ConditionalBypass.expected
diff --git a/ql/test/experimental/CWE-840/ConditionalBypass.qlref b/ql/test/experimental/CWE-840/ConditionalBypass.qlref
new file mode 100644
index 00000000000..6d167616055
--- /dev/null
+++ b/ql/test/experimental/CWE-840/ConditionalBypass.qlref
@@ -0,0 +1 @@
+experimental/CWE-840/ConditionalBypass.ql