From 49d12e430eafebf2db817216c42b991e3f068098 Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Mon, 18 Mar 2024 20:26:11 +0100 Subject: [PATCH] adapt test expectations according to the new dep-graph implementation GitOrigin-RevId: b0a8d679857d0179f5a44ce43fa307d9c3d9b6c7 --- .../multipleSources/changeTargetPackage.log | 10 ------- .../java/ClassesWithMultipleSourcesTest.kt | 29 ++++++------------- 2 files changed, 9 insertions(+), 30 deletions(-) diff --git a/jps/jps-builders/testData/incremental/multipleSources/changeTargetPackage.log b/jps/jps-builders/testData/incremental/multipleSources/changeTargetPackage.log index 989b19304c9a..0d1caa23d023 100644 --- a/jps/jps-builders/testData/incremental/multipleSources/changeTargetPackage.log +++ b/jps/jps-builders/testData/incremental/multipleSources/changeTargetPackage.log @@ -6,14 +6,4 @@ End of files Compiling files: src/a.p src/b.p -End of files -Cleaning output files: -out/production/m/PackageFacade.class -out/production/m/a.class -out/production/m/xxx/PackageFacade.class -out/production/m/xxx/b.class -End of files -Compiling files: -src/a.p -src/b.p End of files \ No newline at end of file diff --git a/jps/jps-builders/testSrc/org/jetbrains/jps/builders/java/ClassesWithMultipleSourcesTest.kt b/jps/jps-builders/testSrc/org/jetbrains/jps/builders/java/ClassesWithMultipleSourcesTest.kt index 3105524d419d..e336d2d112ea 100644 --- a/jps/jps-builders/testSrc/org/jetbrains/jps/builders/java/ClassesWithMultipleSourcesTest.kt +++ b/jps/jps-builders/testSrc/org/jetbrains/jps/builders/java/ClassesWithMultipleSourcesTest.kt @@ -1,18 +1,4 @@ -/* - * Copyright 2000-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.jps.builders.java class ClassesWithMultipleSourcesTest: IncrementalBuildTestCase() { @@ -65,11 +51,14 @@ class ClassesWithMultipleSourcesTest: IncrementalBuildTestCase() { } fun testChangeTargetPackage() { - doTest { - createFile("src/a.p") - createFile("src/b.p") - modify { - changeFile("src/b.p", "package xxx;") + // now relevant for the new implementation only + if (JavaBuilderUtil.isDepGraphEnabled()) { // todo: remove the check when the new dep-graph based implementation becomes the default one + doTest { + createFile("src/a.p") + createFile("src/b.p") + modify { + changeFile("src/b.p", "package xxx;") + } } } }