-
Notifications
You must be signed in to change notification settings - Fork 460
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1927 from jfdenise/WFCORE-1968
Fix for WFCORE-1968. Fix write-attribute completion.
- Loading branch information
Showing
4 changed files
with
169 additions
and
116 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
72 changes: 0 additions & 72 deletions
72
cli/src/main/java/org/jboss/as/cli/operation/impl/AttributeTypeDescrValueCompleter.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
123 changes: 123 additions & 0 deletions
123
...test/java/org/jboss/as/cli/operation/impl/DefaultOperationCandidatesProviderTestCase.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| /* | ||
| * JBoss, Home of Professional Open Source. | ||
| * Copyright 2016, Red Hat, Inc., and individual contributors | ||
| * as indicated by the @author tags. See the copyright.txt file in the | ||
| * distribution for a full listing of individual contributors. | ||
| * | ||
| * This is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU Lesser General Public License as | ||
| * published by the Free Software Foundation; either version 2.1 of | ||
| * the License, or (at your option) any later version. | ||
| * | ||
| * This software is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this software; if not, write to the Free | ||
| * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| * 02110-1301 USA, or see the FSF site: http://www.fsf.org. | ||
| */ | ||
| package org.jboss.as.cli.operation.impl; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.List; | ||
| import org.jboss.as.cli.CommandContext; | ||
| import org.jboss.as.cli.CommandContextFactory; | ||
| import org.jboss.as.cli.CommandLineCompleter; | ||
| import org.jboss.dmr.ModelNode; | ||
| import org.jboss.dmr.Property; | ||
| import static org.junit.Assert.assertEquals; | ||
| import org.junit.Test; | ||
|
|
||
| /** | ||
| * | ||
| * @author jdenise@redhat.com | ||
| */ | ||
| public class DefaultOperationCandidatesProviderTestCase { | ||
|
|
||
| private static final String list_content = "{\n" | ||
| + " \"type\" => LIST,\n" | ||
| + " \"value-type\" => STRING\n" | ||
| + " }"; | ||
|
|
||
| private static final String obj_content = "{\n" | ||
| + " \"type\" => OBJECT,\n" | ||
| + " \"value-type\" => { \"prop1\" => { \"type\" => STRING},\n" | ||
| + " \"prop2\" => { \"type\" => STRING}\n" | ||
| + " } }"; | ||
|
|
||
| private static final String map_content = "{\n" | ||
| + " \"type\" => OBJECT,\n" | ||
| + " \"value-type\" => STRING }"; | ||
|
|
||
| private static final String boolean_content = "{\n" | ||
| + " \"type\" => BOOLEAN,\n" | ||
| + " }"; | ||
|
|
||
| private static final String string_content = "{\n" | ||
| + " \"type\" => STRING,\n" | ||
| + " }"; | ||
|
|
||
| private static final String allowed_content = "{\n" | ||
| + " \"type\" => STRING,\n" | ||
| + " \"allowed\" => [\n" | ||
| + " \"ALL\",\n" | ||
| + " \"FINEST\",\n" | ||
| + " \"FINER\",\n" | ||
| + " ]" | ||
| + " }"; | ||
|
|
||
| @Test | ||
| public void testAttributeValueCompleter() throws Exception { | ||
| CommandContext ctx = CommandContextFactory.getInstance().newCommandContext(); | ||
| DefaultOperationRequestAddress address = new DefaultOperationRequestAddress(); | ||
| { | ||
| Property prop = new Property("arg", ModelNode.fromString(list_content)); | ||
| CommandLineCompleter completer = DefaultOperationCandidatesProvider.getCompleter(prop, ctx, address); | ||
| List<String> candidates = new ArrayList<>(); | ||
| completer.complete(ctx, "", 0, candidates); | ||
| assertEquals(Arrays.asList("["), candidates); | ||
| } | ||
|
|
||
| { | ||
| Property prop = new Property("arg", ModelNode.fromString(map_content)); | ||
| CommandLineCompleter completer = DefaultOperationCandidatesProvider.getCompleter(prop, ctx, address); | ||
| List<String> candidates = new ArrayList<>(); | ||
| completer.complete(ctx, "", 0, candidates); | ||
| assertEquals(Arrays.asList("{"), candidates); | ||
| } | ||
|
|
||
| { | ||
| Property prop = new Property("arg", ModelNode.fromString(obj_content)); | ||
| CommandLineCompleter completer = DefaultOperationCandidatesProvider.getCompleter(prop, ctx, address); | ||
| List<String> candidates = new ArrayList<>(); | ||
| completer.complete(ctx, "{", 0, candidates); | ||
| assertEquals(Arrays.asList("prop1", "prop2"), candidates); | ||
| } | ||
|
|
||
| { | ||
| Property prop = new Property("arg", ModelNode.fromString(boolean_content)); | ||
| CommandLineCompleter completer = DefaultOperationCandidatesProvider.getCompleter(prop, ctx, address); | ||
| List<String> candidates = new ArrayList<>(); | ||
| completer.complete(ctx, "", 0, candidates); | ||
| assertEquals(Arrays.asList("false", "true"), candidates); | ||
| } | ||
|
|
||
| { | ||
| Property prop = new Property("arg", ModelNode.fromString(allowed_content)); | ||
| CommandLineCompleter completer = DefaultOperationCandidatesProvider.getCompleter(prop, ctx, address); | ||
| List<String> candidates = new ArrayList<>(); | ||
| completer.complete(ctx, "", 0, candidates); | ||
| assertEquals(Arrays.asList("ALL", "FINER", "FINEST"), candidates); | ||
| } | ||
|
|
||
| { | ||
| Property prop = new Property("arg", ModelNode.fromString(string_content)); | ||
| CommandLineCompleter completer = DefaultOperationCandidatesProvider.getCompleter(prop, ctx, address); | ||
| assertEquals(null, completer); | ||
| } | ||
| } | ||
| } |