Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9783F200CE5 for ; Sun, 6 Aug 2017 22:52:37 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 960B11640E9; Sun, 6 Aug 2017 20:52:37 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id DA4A91640E8 for ; Sun, 6 Aug 2017 22:52:36 +0200 (CEST) Received: (qmail 89588 invoked by uid 500); 6 Aug 2017 20:52:36 -0000 Mailing-List: contact notifications-help@asterixdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@asterixdb.apache.org Delivered-To: mailing list notifications@asterixdb.apache.org Received: (qmail 89579 invoked by uid 99); 6 Aug 2017 20:52:36 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Aug 2017 20:52:36 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 8B6D018070B for ; Sun, 6 Aug 2017 20:52:35 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 2.126 X-Spam-Level: ** X-Spam-Status: No, score=2.126 tagged_above=-999 required=6.31 tests=[MISSING_HEADERS=1.207, SPF_FAIL=0.919] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id WVdNipGIrRE9 for ; Sun, 6 Aug 2017 20:52:34 +0000 (UTC) Received: from unhygienix.ics.uci.edu (unhygienix.ics.uci.edu [128.195.14.130]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id BDBEB5F30C for ; Sun, 6 Aug 2017 20:52:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by unhygienix.ics.uci.edu (Postfix) with ESMTP id 305FC2420AC; Sun, 6 Aug 2017 13:52:33 -0700 (PDT) Date: Sun, 6 Aug 2017 13:52:33 -0700 From: "Michael Blow (Code Review)" CC: Jenkins , Till Westmann , Murtadha Hubail Reply-To: mblow@apache.org X-Gerrit-MessageType: merged Subject: Change in asterixdb[master]: [ASTERIXDB-2024][TEST] Test fwk comment patterns X-Gerrit-Change-Id: I4c317ccee242bd5fa2f5ec5bed85a69f0a47cf11 X-Gerrit-ChangeURL: X-Gerrit-Commit: 68f7e43d884ed7ad47a4cc923a6f5518425ac26b In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Content-Disposition: inline User-Agent: Gerrit/2.12.7 Message-Id: <20170806205233.305FC2420AC@unhygienix.ics.uci.edu> archived-at: Sun, 06 Aug 2017 20:52:37 -0000 Michael Blow has submitted this change and it was merged. Change subject: [ASTERIXDB-2024][TEST] Test fwk comment patterns ...................................................................... [ASTERIXDB-2024][TEST] Test fwk comment patterns Update the test framework to match comment patterns only at head of line, to avoid truncating other instances of these characters i.e. http://foobar.com -> http: Change-Id: I4c317ccee242bd5fa2f5ec5bed85a69f0a47cf11 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1919 Reviewed-by: Michael Blow Integration-Tests: Michael Blow Tested-by: Michael Blow --- M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Michael Blow: Looks good to me, approved; Verified; Verified diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java index 1079832..1c29e86 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java @@ -105,8 +105,8 @@ private static final long MAX_URL_LENGTH = 2000l; private static final Pattern JAVA_BLOCK_COMMENT_PATTERN = Pattern.compile("/\\*.*\\*/", Pattern.MULTILINE | Pattern.DOTALL); - private static final Pattern JAVA_LINE_COMMENT_PATTERN = Pattern.compile("//.*$", Pattern.MULTILINE); - private static final Pattern SHELL_LINE_COMMENT_PATTERN = Pattern.compile("#.*$", Pattern.MULTILINE); + private static final Pattern JAVA_LINE_COMMENT_PATTERN = Pattern.compile("^//.*$", Pattern.MULTILINE); + private static final Pattern SHELL_LINE_COMMENT_PATTERN = Pattern.compile("^#.*$", Pattern.MULTILINE); private static final Pattern REGEX_LINES_PATTERN = Pattern.compile("^(-)?/(.*)/([im]*)$"); private static final Pattern POLL_TIMEOUT_PATTERN = Pattern.compile("polltimeoutsecs=(\\d+)(\\D|$)", Pattern.MULTILINE); -- To view, visit https://asterix-gerrit.ics.uci.edu/1919 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4c317ccee242bd5fa2f5ec5bed85a69f0a47cf11 Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Michael Blow Gerrit-Reviewer: Murtadha Hubail Gerrit-Reviewer: Till Westmann