Conan 2 battery tests (#1012)

* Conan 2 lockfile battery test

* Moving test files around

* More conan 2 battery tests

src/test/java/com/synopsys/integration/detect/battery/detector/ConanCliBattery.java

@@ -9,6 +9,7 @@
 @Tag("battery")
 public class ConanCliBattery {
     private static final String CONAN1_VERSION_OUTPUT_RESOURCE = "../conan1-version.xout";
+    private static final String CONAN2_VERSION_OUTPUT_RESOURCE = "../conan2-version.xout";
 
     @Test
     void conanMinimal() {
@@ -64,6 +65,28 @@ void conanPkgRevOnly() {
         test.run();
     }
 
+    @Test
+    void conan2Minimal() {
+        DetectorBatteryTestRunner test = new DetectorBatteryTestRunner("conan2-minimal", "conan-cli/conan2minimal");
+        setTestExecutableOutputForConan2(test, "conan-graph-info-minimal.xout");
+        test.sourceDirectoryNamed("md5");
+        test.sourceFileNamed("conanfile.txt");
+        test.property("detect.conan.attempt.package.revision.match", "false");
+        test.expectBdioResources();
+        test.run();
+    }
+
+    @Test
+    void conan2RevisionMatch() {
+        DetectorBatteryTestRunner test = new DetectorBatteryTestRunner("conan2-revisionmatch", "conan-cli/conan2revisionmatch");
+        setTestExecutableOutputForConan2(test, "conan-graph-info-minimal.xout");
+        test.sourceDirectoryNamed("md5");
+        test.sourceFileNamed("conanfile.txt");
+        test.property("detect.conan.attempt.package.revision.match", "true");
+        test.expectBdioResources();
+        test.run();
+    }
+
     private void setTestExecutableOutputForConan1(DetectorBatteryTestRunner test, String resource) {
         test.executableFromResourceFiles(
             DetectProperties.DETECT_CONAN_PATH,
@@ -72,4 +95,12 @@ private void setTestExecutableOutputForConan1(DetectorBatteryTestRunner test, St
             resource
         );
     }
+
+    private void setTestExecutableOutputForConan2(DetectorBatteryTestRunner test, String resource) {
+        test.executableFromResourceFiles(
+            DetectProperties.DETECT_CONAN_PATH,
+            CONAN2_VERSION_OUTPUT_RESOURCE,
+            resource
+        );
+    }
 }

src/test/java/com/synopsys/integration/detect/battery/detector/ConanLockfileBattery.java

@@ -27,4 +27,27 @@ void conanLockLongFormExternalId() {
         test.expectBdioResources();
         test.run();
     }
+
+    @Test
+    void conan2LockPackageRevisionMatchFalse() {
+        DetectorBatteryTestRunner test = new DetectorBatteryTestRunner("conan2-lock-simple", "conan2-lock/simple");
+        test.sourceDirectoryNamed("conan2-lock");
+        test.sourceFileFromResource("conan.lock");
+        test.property("detect.conan.attempt.package.revision.match", "false");
+        test.expectBdioResources();
+        test.run();
+    }
+
+    @Test
+    void conan2LockPackageRevisionMatchTrue() {
+        DetectorBatteryTestRunner test = new DetectorBatteryTestRunner("conan2-lock-simple", "conan2-lock/simple");
+        test.sourceDirectoryNamed("conan2-lock");
+        test.sourceFileFromResource("conan.lock");
+
+        // in this test case this setting should make not difference in the output as lock files in Conan 2 do not contain package revisions
+        test.property("detect.conan.attempt.package.revision.match", "true");
+
+        test.expectBdioResources();
+        test.run();
+    }
 }

src/test/resources/battery/conan-cli/conan2-version.xout

@@ -0,0 +1 @@
+Conan version 2.0.14