view launcher/src/test/java/com/redhat/thermostat/launcher/internal/CommonOptionsTest.java @ 915:0f4271d4e334

Change common options implementation. This patch removes the old CommonCommandOptions class. Common options - dbUrl, logLevel, username, password - are now automatically added if the "options" list in command.properties contains "special" option names such as AUTO_DB_OPTIONS (dbUrl, username, password) and AUTO_LOG_OPTION (logLevel). If these are present thermostat adds options as requested automatically. Note that all automatic options are optional. The required property can be changed/overridden by using a <option-name>.required key in command.properties and adding <option-name> to the "options" list AFTER the AUTO_* option. I've also cleaned up the command.properties files and help command output. command.properties don't need to maintain "thermostat" any longer. Moreover, help output contains the description of the command as well. Example: $ ./distribution/target/bin/thermostat help agent usage: thermostat agent [-d <url> [-u <user> -p <password>]] [-s] [--debug] [-l <level>] starts and stops the thermostat agent thermostat agent -d,--dbUrl <dbUrl> connect to the given URL -l,--logLevel <logLevel> sets the log level for this invocation. Possible values for <level> in decreasing severity are: SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST and OFF. -p,--password <password> the password to use for authentication -s,--saveOnExit save the data on exit -u,--username <username> the username to use for authentication -v,--debug launch with debug console enabled Finally, this should be the last patch required in order to drop the storage-core dependency of common-core, since it removes the need for client-cli to depend on the launcher bundle. It fixes PR1200 too. Reviewed-by: ebaron, vanaltj Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2013-January/005118.html
author Severin Gehwolf <sgehwolf@redhat.com>
date Fri, 11 Jan 2013 19:23:03 +0100
parents
children ccac9bcabaa0
line wrap: on
line source

/*
 * Copyright 2013 Red Hat, Inc.
 *
 * This file is part of Thermostat.
 *
 * Thermostat is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published
 * by the Free Software Foundation; either version 2, or (at your
 * option) any later version.
 *
 * Thermostat 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
 * General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with Thermostat; see the file COPYING.  If not see
 * <http://www.gnu.org/licenses/>.
 *
 * Linking this code with other modules is making a combined work
 * based on this code.  Thus, the terms and conditions of the GNU
 * General Public License cover the whole combination.
 *
 * As a special exception, the copyright holders of this code give
 * you permission to link this code with independent modules to
 * produce an executable, regardless of the license terms of these
 * independent modules, and to copy and distribute the resulting
 * executable under terms of your choice, provided that you also
 * meet, for each linked independent module, the terms and conditions
 * of the license of that module.  An independent module is a module
 * which is not derived from or based on this code.  If you modify
 * this code, you may extend this exception to your version of the
 * library, but you are not obligated to do so.  If you do not wish
 * to do so, delete this exception statement from your version.
 */

package com.redhat.thermostat.launcher.internal;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

import java.util.List;

import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.junit.Test;


public class CommonOptionsTest {

    @Test
    public void canGetLogLevel() {
        Option logOption = CommonOptions.getLogOption();
        Options options = new Options();
        options.addOption(logOption);
        assertTrue(options.hasOption("logLevel"));
        assertTrue(options.hasOption("l"));
        assertFalse(logOption.isRequired());
        assertTrue(logOption.hasArg());
    }
    
    @Test
    public void canGetDbOptions() {
        List<Option> opts = CommonOptions.getDbOptions();
        Options options = new Options();
        for (Option opt: opts) {
            options.addOption(opt);
        }
        assertTrue(options.hasOption("dbUrl"));
        assertTrue(options.hasOption("username"));
        assertTrue(options.hasOption("password"));
        assertFalse(options.getOption("dbUrl").isRequired());
        assertFalse(options.getOption("username").isRequired());
        assertFalse(options.getOption("password").isRequired());
        assertTrue(options.getOption("dbUrl").hasArg());
        assertTrue(options.getOption("username").hasArg());
        assertTrue(options.getOption("password").hasArg());
        Option dbUrlOption = options.getOption("dbUrl");
        assertEquals(CommonOptions.DB_URL_ARG, dbUrlOption.getArgName());
        assertEquals(CommonOptions.USERNAME_ARG, options.getOption(CommonOptions.USERNAME_ARG).getArgName());
    }
}