From 2e24f39d5ff54a537c33f3c164241de43f8cce64 Mon Sep 17 00:00:00 2001
From: yo-h <55373593+yo-h@users.noreply.github.com>
Date: Fri, 26 Nov 2021 17:22:05 -0500
Subject: [PATCH] Java 17: exclude non-source locations in some tests

---
 .../dataflow/modulus-analysis/ModulusAnalysis.ql          | 2 +-
 .../dataflow/range-analysis/RangeAnalysis.ql              | 2 +-
 .../library-tests/literals/floatLiterals/floatLiterals.ql | 6 ++++++
 .../literals/integerLiterals/integerLiterals.ql           | 8 +++++++-
 .../literals/literals-numeric/negativeNumericLiterals.ql  | 8 +++++++-
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/java/ql/test/library-tests/dataflow/modulus-analysis/ModulusAnalysis.ql b/java/ql/test/library-tests/dataflow/modulus-analysis/ModulusAnalysis.ql
index b9a71b74412..93e95da4bbe 100644
--- a/java/ql/test/library-tests/dataflow/modulus-analysis/ModulusAnalysis.ql
+++ b/java/ql/test/library-tests/dataflow/modulus-analysis/ModulusAnalysis.ql
@@ -3,5 +3,5 @@ import semmle.code.java.dataflow.ModulusAnalysis
 import semmle.code.java.dataflow.Bound
 
 from Expr e, Bound b, int delta, int mod
-where exprModulus(e, b, delta, mod)
+where exprModulus(e, b, delta, mod) and e.getCompilationUnit().fromSource()
 select e, b.toString(), delta, mod
diff --git a/java/ql/test/library-tests/dataflow/range-analysis/RangeAnalysis.ql b/java/ql/test/library-tests/dataflow/range-analysis/RangeAnalysis.ql
index f5f84a58d1f..56a9c81b5f9 100644
--- a/java/ql/test/library-tests/dataflow/range-analysis/RangeAnalysis.ql
+++ b/java/ql/test/library-tests/dataflow/range-analysis/RangeAnalysis.ql
@@ -8,5 +8,5 @@ private string getDirectionString(boolean d) {
 }
 
 from Expr e, Bound b, int delta, boolean upper, Reason reason
-where bounded(e, b, delta, upper, reason)
+where bounded(e, b, delta, upper, reason) and e.getCompilationUnit().fromSource()
 select e, b.toString(), delta, getDirectionString(upper), reason
diff --git a/java/ql/test/library-tests/literals/floatLiterals/floatLiterals.ql b/java/ql/test/library-tests/literals/floatLiterals/floatLiterals.ql
index 6a4a9093225..50011c8fa03 100644
--- a/java/ql/test/library-tests/literals/floatLiterals/floatLiterals.ql
+++ b/java/ql/test/library-tests/literals/floatLiterals/floatLiterals.ql
@@ -1,4 +1,10 @@
 import semmle.code.java.Expr
 
+class SrcFloatingPointLiteral extends FloatingPointLiteral {
+  SrcFloatingPointLiteral() {
+    this.getCompilationUnit().fromSource()
+  }
+}
+
 from FloatingPointLiteral lit
 select lit, lit.getValue(), lit.getFloatValue()
diff --git a/java/ql/test/library-tests/literals/integerLiterals/integerLiterals.ql b/java/ql/test/library-tests/literals/integerLiterals/integerLiterals.ql
index 264f5b77b99..aa0d68d6c55 100644
--- a/java/ql/test/library-tests/literals/integerLiterals/integerLiterals.ql
+++ b/java/ql/test/library-tests/literals/integerLiterals/integerLiterals.ql
@@ -1,4 +1,10 @@
 import semmle.code.java.Expr
 
-from IntegerLiteral lit
+class SrcIntegerLiteral extends IntegerLiteral {
+  SrcIntegerLiteral() {
+    this.getCompilationUnit().fromSource()
+  }
+}
+
+from SrcIntegerLiteral lit
 select lit, lit.getValue(), lit.getIntValue()
diff --git a/java/ql/test/library-tests/literals/literals-numeric/negativeNumericLiterals.ql b/java/ql/test/library-tests/literals/literals-numeric/negativeNumericLiterals.ql
index 0fbb3989c7a..ecc36ac2609 100644
--- a/java/ql/test/library-tests/literals/literals-numeric/negativeNumericLiterals.ql
+++ b/java/ql/test/library-tests/literals/literals-numeric/negativeNumericLiterals.ql
@@ -1,6 +1,12 @@
 import java
 
-from Literal l
+class SrcLiteral extends Literal {
+  SrcLiteral() {
+    this.getCompilationUnit().fromSource()
+  }
+}
+
+from SrcLiteral l
 where
   l instanceof IntegerLiteral or
   l instanceof LongLiteral or