From 30adb975c9000ef953cc4218e40808492f48c913 Mon Sep 17 00:00:00 2001 From: "Ilya.Kazakevich" Date: Tue, 27 Mar 2018 18:08:00 +0300 Subject: [PATCH] test fix: remove comments that depend on .net version --- .../jetbrains/env/python/dotNet/SkeletonTestTask.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/python/testSrc/com/jetbrains/env/python/dotNet/SkeletonTestTask.java b/python/testSrc/com/jetbrains/env/python/dotNet/SkeletonTestTask.java index fee09aaa5f22..2bd39208fbfa 100644 --- a/python/testSrc/com/jetbrains/env/python/dotNet/SkeletonTestTask.java +++ b/python/testSrc/com/jetbrains/env/python/dotNet/SkeletonTestTask.java @@ -136,20 +136,20 @@ class SkeletonTestTask extends PyExecutionFixtureTestTask { StreamUtil.readText(new FileInputStream(new File(getTestDataPath(), myExpectedSkeletonFile)), Charset.defaultCharset()); - Assert.assertThat("Wrong skeleton generated", removeGeneratorVersion(actual), - Matchers.equalToIgnoringCase(removeGeneratorVersion(skeletonText))); + Assert.assertThat("Wrong skeleton generated", removeComments(actual), + Matchers.equalToIgnoringCase(removeComments(skeletonText))); } myFixture.configureByFile(skeletonFile.getName()); } /** - * Removes strings that starts with "#", because generator version and other stuff may change + * Removes strings that starts with "#" and """, because generator version and other stuff may change * * @param textToClean text to remove strings from * @return text after cleanup */ - private static String removeGeneratorVersion(@NotNull final String textToClean) { - return textToClean.replaceAll("#.+", ""); + private static String removeComments(@NotNull final String textToClean) { + return textToClean.replaceAll("(#|\"\"\").+", ""); }