Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix potential NPE #296 #302

Merged
merged 1 commit into from
Oct 2, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,13 @@ private String getStringEncloser(String line) {
return null;
}

private String repairLostEscapeChars(String stringEncloser, String line) {
if (stringEncloser == null || line == null) {
String repairLostEscapeChars(String stringEncloser, String line) {
if (stringEncloser == null) {
return line;
}
if(line == null) {
return "";
}
String[] parts = line.split(stringEncloser);
StringBuilder res = new StringBuilder();
for (int i = 0; i < parts.length; i++) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You 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.
*/
package com.github.cameltooling.lsp.internal.parser;

import static org.assertj.core.api.Assertions.assertThat;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

public class CamelKYamlDSLParserTest {

@Test
void testRepairEscapeCharacterWithNullLine() throws Exception {
assertThat(new CamelKYamlDSLParser().repairLostEscapeChars("\"", null)).isEmpty();
}

@Test
void testRepairEscapeCharacterWithNoStringEncloser() throws Exception {
assertThat(new CamelKYamlDSLParser().repairLostEscapeChars(null, "myLine")).isEqualTo("myLine");
}

@Test
void testRepairEscapeCharacterWithQuote() throws Exception {
assertThat(new CamelKYamlDSLParser().repairLostEscapeChars("'", "a value with ' quote inside")).isEqualTo("a value with '' quote inside");
}

@Test
void testRepairEscapeCharacterWithDoubleQuote() throws Exception {
assertThat(new CamelKYamlDSLParser().repairLostEscapeChars("\"", "a value with double-quote \" inside")).isEqualTo("a value with double-quote \\\" inside");
}

@Test
@Disabled("see https://github.com/camel-tooling/camel-language-server/issues/301")
void testRepairEscapeCharacterWithDoubleQuoteAndSlash() throws Exception {
assertThat(new CamelKYamlDSLParser().repairLostEscapeChars("\"", "a value with backslash \\ inside")).isEqualTo("a value with double-quote \\\\ inside");
}
}