[rfc][icedtea-web] read properties values from C part - library edition :)
Jiri Vanek
jvanek at redhat.com
Thu Mar 21 11:06:11 PDT 2013
On 03/21/2013 06:08 PM, Adam Domurad wrote:
> On 03/21/2013 12:41 PM, Jiri Vanek wrote:
>> Here we go.
>>
>> Included are also Omair's suggestions.
>>
>>
>> [..snipped..]
>>> Looks good otherwise, go ahead and start testing+integration if you'd like.
>>> -Adam
>>
>
>> diff -r 76930f38dddf Makefile.am
>> --- a/Makefile.am Wed Mar 20 15:35:22 2013 +0100
>> +++ b/Makefile.am Thu Mar 21 17:40:23 2013 +0100
>> @@ -284,11 +284,11 @@
>>
>> PLUGIN_SRC=IcedTeaNPPlugin.cc IcedTeaScriptablePluginObject.cc \
>> IcedTeaJavaRequestProcessor.cc IcedTeaPluginRequestProcessor.cc \
>> - IcedTeaPluginUtils.cc
>> + IcedTeaPluginUtils.cc IcedTeaParseProperties.cc
>>
>> PLUGIN_OBJECTS=IcedTeaNPPlugin.o IcedTeaScriptablePluginObject.o \
>> IcedTeaJavaRequestProcessor.o IcedTeaPluginRequestProcessor.o \
>> - IcedTeaPluginUtils.o
>> + IcedTeaPluginUtils.o IcedTeaParseProperties.o
>
> Looks right
>
>>
>> $(PLUGIN_DIR)/%.o: $(PLUGIN_SRCDIR)/%.cc
>> mkdir -p $(PLUGIN_DIR) && \
>> diff -r 76930f38dddf plugin/icedteanp/IcedTeaParseProperties.cc
>> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
>> +++ b/plugin/icedteanp/IcedTeaParseProperties.cc Thu Mar 21 17:40:23 2013 +0100
>> @@ -0,0 +1,260 @@
>> +/* IcedTeaRunnable.cc
>> +
>> + Copyright (C) 2013 Red Hat
>> +
>> +This file is part of IcedTea.
>> +
>> +IcedTea 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.
>> +
>> +IcedTea 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 IcedTea; see the file COPYING. If not, write to the
>> +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
>> +02110-1301 USA.
>> +
>> +Linking this library statically or dynamically with other modules is
>> +making a combined work based on this library. Thus, the terms and
>> +conditions of the GNU General Public License cover the whole
>> +combination.
>> +
>> +As a special exception, the copyright holders of this library give you
>> +permission to link this library 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 library. If you modify this library, 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. */
>> +
>> +#include <unistd.h>
>> +#include <sys/types.h>
>> +#include <pwd.h>
>> +#include <cstdio>
>> +#include <cstdlib>
>> +#include <string>
>> +#include <functional>
>> +#include <cctype>
>> +#include <locale>
>> +#include <iostream>
>> +#include <fstream>
>> +
>> +#include "IcedTeaParseProperties.h"
>> +/*
>> + The public api is nearly impossible to test due to "hardcoded paths"
>> + All public methods have theirs equivalents wit set-up-able files, and those are
>> + tested.
>> +*/
>> +
>> +using namespace std;
>> +//private api
>> +void trim(string& str);
>> +void remove_all_spaces(string& str);
>> +bool get_property_value(string c, string& dest);
>> +bool starts_with(string c1, string c2);
>> +bool file_exists(string filename);
>> +string user_properties_file();
>> +string main_properties_file();
>> +string default_java_properties_file();
>> +//for passing three dummy files
>> +bool find_system_config_file(string main_file, string custom_jre_file, bool usecustom_jre, string
>> default_java_file, string& dest);
>> +bool find_property(string filename, string property, string& dest);
>> +//for passing two dummy files
>> +bool read_deploy_property_value(string user_file, string system_file, bool usesystem_file,
>> string property, string& dest);
>> +//for passing two dummy files
>> +bool find_custom_jre(string user_file, string main_file,string& dest);
>> +//end of non-public IcedTeaParseProperties api
>
> [nit] You do not need to forward declare anything here if you order the function definitions so that
> earlier functions do not use later functions.
>
>> +
>> +
>> +
>> +void trim(string& str) {
>> + size_t start = str.find_first_not_of(" \t\n"), end = str.find_last_not_of(" \t\n");
>> + if (start == std::string::npos) {
>> + return;
>> + }
>> + str = str.substr(start, end - start + 1);
>> +}
>
> I thought this was headed to IcedTeaPluginUtils?
>
>> +
>> +
>> +
>> +
>> +void remove_all_spaces(string& str)
>> +{
>> + for(int i=0; i<str.length(); i++){
>> + if(str[i] == ' ' || str[i] == '\n' || str[i] == '\t') {
>> + str.erase(i,1);
>> + i--;
>> + }
>> + }
>> +}
>> +
>> +bool get_property_value(string c, string& dest){
>> + int i = c.find("=");
>> + if (i < 0) return false;
>> + int l = c.length();
>> + dest = c.substr(i+1, l-i);
>> + trim(dest);
>> + return true;
>> +}
>> +
>> +
>> +bool starts_with(string c1, string c2){
>> + return (c1.find(c2) == 0);
>> +}
>> +
>> +bool file_exists(string filename)
>> +{
>> + ifstream infile(filename.c_str());
>> + return infile.good();
>> +}
>> +
>> +
>> +string user_properties_file(){
>> + int myuid = getuid();
>> + struct passwd *mypasswd = getpwuid(myuid);
>> + return string(mypasswd->pw_dir)+"/.icedtea/"+default_file_name;
>> +}
>> +
>> +
>> +string main_properties_file(){
>> + return "/etc/.java/deployment/"+default_file_name;
>> +}
>> +
>> +string default_java_properties_file(){
>> + return ICEDTEA_WEB_JRE "/lib/"+default_file_name;
>> +}
>> +
>> +
>> +/* this is the same search done by icedtea-web settings:
>> + try the main file in /etc/.java/deployment
>> + if found, then return this file
>> + try to find setUp jre
>> + if found, then try if this file exists and end
>> + if no jre custom jvm is set, then tries default jre
>> + if its deploy file exists, then return
>> + not found otherwise*/
>> +bool find_system_config_file(string& dest){
>> + string jdest;
>> + bool found = find_custom_jre(jdest);
>> + if (found) {
>> + jdest = jdest + "/lib/"+default_file_name;
>> + }
>> + return find_system_config_file(main_properties_file(), jdest, found,
>> default_java_properties_file(), dest);
>> +}
>> +//abstraction for testing purposes
>> +bool find_system_config_file(string main_file, string custom_jre_file, bool usecustom_jre, string
>> default_java_file, string& dest){
>> + if (file_exists(main_file)) {
>> + dest = main_file;
>> + return true;
>> + } else {
>> + if (usecustom_jre){
>> + if(file_exists(custom_jre_file) ) {
>> + dest = custom_jre_file;
>> + return true;
>> + }
>> + } else {
>> + if(file_exists(default_java_file)) {
>> + dest = default_java_file;
>> + return true;
>> + }
>> + }
>> + }
>> +return false; //nothing of above found
>> +}
>> +
>> +//Returns whether property was found, if found stores result in 'dest'
>> +bool find_property(string filename, string property, string& dest){
>> + string property_matcher(property);
>> + trim( property_matcher);
>> + property_matcher= property_matcher+"=";
>> + ifstream input( filename.c_str() );
>
> [nit] Both ifstream & ofstream are deprecated, to some extent. fstream is better C++ style.
>
>> + for( string line; getline( input, line ); ){ /* read a line */
>> + string copy = line;
>> + //java tolerates spaces around = char, remove them for matching
>> + remove_all_spaces(copy);
>> + if (starts_with(copy, property_matcher)) {
>> + //provide non-spaced value, trimming is done in get_property_value
>> + get_property_value(line, dest);
>> + return true;
>> + }
>> + }
>> +
>> + return false;
>> + }
>> +
>> +
>> +/* this is reimplementation of itw-settings operations
>> + first check in user's settings, if found, return
>> + then check in global file (see the magic of find_system_config_file)*/
>> +bool read_deploy_property_value(string property, string& dest){
>> + string futurefile;
>> + bool b = find_system_config_file(futurefile);
>
> [nit] 'b' is not a descriptive name
>
>> + return read_deploy_property_value(user_properties_file(), futurefile, b, property, dest);
>> +}
>> +//abstraction for testing purposes
>> +bool read_deploy_property_value(string user_file, string system_file, bool usesystem_file,
>> string property, string& dest){
>> + //is it in user's file?
>> + bool found = find_property(user_file, property, dest);
>> + if (found) {
>> + return true;
>> + }
>> + //is it in global file?
>> + if (usesystem_file) {
>> + return find_property(system_file, property, dest);
>> + }
>> + return false;
>> +}
>> +
>> +//This is different from common get property, as it is avoiding to search in *java*
>> +//properties files
>> +bool find_custom_jre(string& dest){
>> + return find_custom_jre(user_properties_file(), main_properties_file(), dest);
>> +}
>> +//abstraction for testing purposes
>> +bool find_custom_jre(string user_file, string main_file,string& dest){
>> + string key = custom_jre_key;
>> + if(file_exists(user_file)) {
>> + bool a = find_property(user_file, key, dest);
>> + if (a) {
>> + return true;
>> + }
>> + }
>> + if(file_exists(main_file)) {
>> + return find_property(main_file, key, dest);
>> + }
>> +return false;
>> +}
>> +
>> +
>> +
>> +int mainForFun(void){
>
> [nit] test_main :-)
>
>> + cout << ("user's settings file\n");
>> + cout << user_properties_file();
>> + cout << ("\nmain settings file:\n");
>> + cout << (main_properties_file());
>> + cout << ("\njava settings file \n");
>> + cout << (default_java_properties_file());
>> + cout << ("\nsystem config file\n");
>> + string a1;
>> + find_system_config_file(a1);
>> + cout << a1;
>> + cout << ("\ncustom jre\n");
>> + string a2;
>> + find_custom_jre(a2);
>> + cout << a2;
>> + cout << ("\nsome custom property\n");
>> + string a3;
>> + read_deploy_property_value("deployment.security.level", a3);
>> + cout << a3;
>> + cout << ("\n");
>> + return 0;
>> +}
>> diff -r 76930f38dddf plugin/icedteanp/IcedTeaParseProperties.h
>> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
>> +++ b/plugin/icedteanp/IcedTeaParseProperties.h Thu Mar 21 17:40:23 2013 +0100
>> @@ -0,0 +1,53 @@
>> +/* IcedTeaPluginUtils.h
>> +
>> + Copyright (C) 2013 Red Hat
>> +
>> +This file is part of IcedTea.
>> +
>> +IcedTea 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.
>> +
>> +IcedTea 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 IcedTea; see the file COPYING. If not, write to the
>> +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
>> +02110-1301 USA.
>> +
>> +Linking this library statically or dynamically with other modules is
>> +making a combined work based on this library. Thus, the terms and
>> +conditions of the GNU General Public License cover the whole
>> +combination.
>> +
>> +As a special exception, the copyright holders of this library give you
>> +permission to link this library 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 library. If you modify this library, 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. */
>> +
>> +/**
>> + * Utility classes for parsing values from properties files
>> + */
>> +#include <string>
>> +
>> +
>> +//public api
>> +std::string user_properties_file();
>> +bool find_system_config_file(std::string& dest);
>> +bool find_custom_jre(std::string& dest);
>> +bool read_deploy_property_value(std::string property, std::string& dest);
>> +//half public api
>> +const std::string default_file_name = "deployment.properties";
>
> It is ill-advisable to have a global constant called 'default_file_name' (remember what I said about
> C/++ having just one global namespace)
>
>> +const std::string custom_jre_key = "deployment.jre.dir";
>> +//end of public api
>> diff -r 76930f38dddf tests/cpp-unit-tests/IcedTeaParsePropertiesTest.cc
>> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
>> +++ b/tests/cpp-unit-tests/IcedTeaParsePropertiesTest.cc Thu Mar 21 17:40:23 2013 +0100
>> @@ -0,0 +1,552 @@
>> +/* Copyright (C) 2012 Red Hat
>> +
>> + This file is part of IcedTea.
>> +
>> + IcedTea 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.
>> +
>> + IcedTea 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 IcedTea; see the file COPYING. If not, write to the
>> + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
>> + 02110-1301 USA.
>> +
>> + Linking this library statically or dynamically with other modules is
>> + making a combined work based on this library. Thus, the terms and
>> + conditions of the GNU General Public License cover the whole
>> + combination.
>> +
>> + As a special exception, the copyright holders of this library give you
>> + permission to link this library 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 library. If you modify this library, 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. */
>> +
>> +#include <UnitTest++.h>
>> +#include <unistd.h>
>> +#include <sys/types.h>
>> +#include <pwd.h>
>> +#include <cstdio>
>> +#include <cstdlib>
>> +#include <string>
>> +#include <functional>
>> +#include <cctype>
>> +#include <locale>
>> +#include <iostream>
>> +#include <fstream>
>> +#include "IcedTeaParseProperties.h"
>> +
>> +using namespace std;
>> +
>> +//not exposed via IcedTeaParseProperties but needed
>> +extern void trim(string& str);
>> +extern void remove_all_spaces(string& str);
>> +extern bool get_property_value(string c, string& dest);
>> +extern bool starts_with(string c1, string c2);
>> +extern bool file_exists(string filename);
>> +extern string user_properties_file();
>> +extern string main_properties_file();
>> +extern string default_java_properties_file();
>> +//for passing three dummy files
>> +bool find_system_config_file(string main_file, string custom_jre_file, bool usecustom_jre, string
>> default_java_file, string& dest);
>> +bool find_property(string filename, string property, string& dest);
>> +//for passing two dummy files
>> +bool read_deploy_property_value(string user_file, string system_file, bool usesystem_file,
>> string property, string& dest);
>> +//for passing two dummy files
>> +bool find_custom_jre(string user_file, string main_file,string& dest);
>> +//end of non-public IcedTeaParseProperties api
>> +
>> +/* Creates a temporary file with the specified contents */
>> +static string temporary_file(const string& contents) {
>> + string path = tmpnam(NULL); /* POSIX function, fine for test suite */
>> + ofstream myfile;
>> + myfile.open (path.c_str());
>> + myfile << contents;
>> + myfile.close();
>> + return path;
>> +}
>
> [nit] You actually replaced my suggestion with a version that uses a deprecated class :-)
>
Yah, sorry, your was not working :((
>> +
>> +
>> +
>> +/*private api fundamental tests*/
>> +
>> +TEST(trim) {
>> + string toBeTrimmed = string(" testX ");
>> + trim (toBeTrimmed);
>> + CHECK_EQUAL("testX", toBeTrimmed);
>> +
>> + string toBeTrimmed2 = string(" \t testX\n");
>> + trim (toBeTrimmed2);
>> + CHECK_EQUAL("testX", toBeTrimmed2);
>> +
>> + string toBeTrimmed3 = string(" \t \n te \n stX\n");
>> + trim (toBeTrimmed3);
>> + CHECK_EQUAL("te \n stX", toBeTrimmed3);
>> +}
>> +
>> +TEST(RemoveAllSpaces) {
>> + string toBeTrimmed = string(" te st X ");
>> + remove_all_spaces (toBeTrimmed);
>> + CHECK_EQUAL("testX", toBeTrimmed);
>> +
>> + string toBeTrimmed1 = string(" te st X ");
>> + remove_all_spaces (toBeTrimmed1);
>> + CHECK_EQUAL("testX", toBeTrimmed1);
>> +
>> + string toBeTrimmed2 = string(" \t t e\nst\tX\n");
>> + remove_all_spaces (toBeTrimmed2);
>> + CHECK_EQUAL("testX", toBeTrimmed2);
>> +
>> + string toBeTrimmed3 = string(" \t \n te \n stX\n");
>> + remove_all_spaces (toBeTrimmed3);
>> + CHECK_EQUAL("testX", toBeTrimmed3);
>> +
>> +}
>> +
>> +
>> +TEST(get_property_value) {
>> + string dest = string("");
>> + bool a = get_property_value("key.key=value+eulav ",dest);
>> + CHECK_EQUAL("value+eulav", dest);
>> + CHECK_EQUAL(a, true);
>> +
>> + dest = string("");
>> + a = get_property_value("horrible key = value/value",dest);
>> + CHECK_EQUAL("value/value", dest);
>> + CHECK_EQUAL(a, true);
>> +
>> + dest = string("");
>> + a = get_property_value("better.key = but very horrible value ",dest);
>> + CHECK_EQUAL("but very horrible value", dest);
>> + CHECK_EQUAL(a, true);
>> +
>> + dest = string("");
>> + a = get_property_value("better.key but errornous value ",dest);
>> + CHECK_EQUAL("", dest);
>> + CHECK_EQUAL(a, false);
>> +}
>> +
>> +TEST(starts_with) {
>> + bool a = starts_with("aa bb cc","aa b");
>> + CHECK_EQUAL(a, true);
>> +
>> + a = starts_with("aa bb cc","aab");
>> + CHECK_EQUAL(a, false);
>> +}
>> +
>> +TEST(file_exists) {
>> + string f1 = temporary_file("dummy content");
>> + bool a = file_exists(f1);
>> + CHECK_EQUAL(a, true);
>> +
>> + remove(f1.c_str());
>> + bool b = file_exists(f1);
>> + CHECK_EQUAL(b, false);
>> +}
>> +
>> +
>> +TEST(user_properties_file) {
>> + string f = user_properties_file();
>> + CHECK_EQUAL(f.find(".icedtea") >= 0, true);
>> + CHECK_EQUAL(f.find(default_file_name) >= 0, true);
>> +}
>> +
>> +TEST(main_properties_file) {
>> + string f = main_properties_file();
>> + CHECK_EQUAL(f.find(default_file_name) >= 0, true);
>> + CHECK_EQUAL(f.find(".java") >= 0, true);
>> +}
>> +
>> +TEST(default_java_properties_file) {
>> + string f = default_java_properties_file();
>> + CHECK_EQUAL(f.find(default_file_name) >= 0, true);
>> + CHECK_EQUAL(f.find("lib") >= 0, true);
>> +}
>> +
>> +
>> +TEST(find_system_config_file) {
>> + string f1 = temporary_file("key1=value1");
>> + string f2 = temporary_file("key2=value2");
>> + string f3 = temporary_file("key3=value3");
>> + string dest=string("");
>> + find_system_config_file(f1, f2, true, f3, dest);
>> + CHECK_EQUAL(f1, dest);
>> + dest=string("");
>> + find_system_config_file(f1, f2, false, f3, dest);
>> + CHECK_EQUAL(f1, dest);
>> +
>> + remove(f1.c_str());
>> + dest=string("");
>> + find_system_config_file(f1, f2, true, f3, dest);
>> + CHECK_EQUAL(f2, dest);
>> + dest=string("");
>> + find_system_config_file(f1, f2, false, f3, dest);
>> + CHECK_EQUAL(f3, dest);
>> +
>> + remove(f2.c_str());
>> + dest=string("");
>> + find_system_config_file(f1, f2, true, f3, dest);
>> + CHECK_EQUAL("", dest); //forcing not existing f2
>> + dest=string("");
>> + find_system_config_file(f1, f2, false, f3, dest);
>> + CHECK_EQUAL(f3, dest);
>> +
>> + remove(f3.c_str());
>> + dest=string("");
>> + find_system_config_file(f1, f2, true, f3, dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + find_system_config_file(f1, f2, true, f3, dest);
>> + CHECK_EQUAL("", dest);
>> +}
>> +
>> +TEST(find_property) {
>> + string f1 = temporary_file("key1=value1");
>> + string dest=string("");
>> + find_property(f1, "key1", dest);
>> + CHECK_EQUAL("value1", dest);
>> + dest=string("");
>> + find_property(f1, "key2", dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + find_property(f1, "value1", dest);
>> + CHECK_EQUAL("", dest);
>> + remove(f1.c_str());
>> +
>> + string f2 = temporary_file("key2 =value2 key3=value3\n key5 = value5");
>> + dest=string("");
>> + find_property(f2, "key2", dest);
>> + CHECK_EQUAL("value2 key3=value3", dest);
>> + dest=string("");
>> + find_property(f2, "key1", dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + find_property(f2, "key3", dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + find_property(f2, "key5", dest);
>> + CHECK_EQUAL("value5", dest);
>> + remove(f2.c_str());
>> +
>> + string f3 = temporary_file("ke.y3= value3\nkey4=value4");
>> + dest=string("");
>> + find_property(f3, "ke.y3", dest);
>> + CHECK_EQUAL("value3", dest);
>> + dest=string("");
>> + find_property(f3, "key4", dest);
>> + CHECK_EQUAL("value4", dest);
>> + remove(f3.c_str());
>> +}
>> +
>> +TEST(read_deploy_property_value1) {
>> + string f1 = temporary_file("key1=value11");
>> + string f2 = temporary_file("key1=value12");
>> + string f3 = temporary_file("key2=value23");
>> + string dest=string("");
>> + read_deploy_property_value(f1,f2,true, "key1", dest);
>> + CHECK_EQUAL("value11", dest);
>> + dest=string("");
>> + read_deploy_property_value(f2,f1,true, "key1", dest);
>> + CHECK_EQUAL("value12", dest);
>> + dest=string("");
>> + read_deploy_property_value(f1,f3,true, "key1", dest);
>> + CHECK_EQUAL("value11", dest);
>> + dest=string("");
>> + read_deploy_property_value(f3,f1,true, "key1", dest);
>> + CHECK_EQUAL("value11", dest);
>> + read_deploy_property_value(f3,f2,true, "key1", dest);
>> + CHECK_EQUAL("value12", dest);
>> + dest=string("");
>> + read_deploy_property_value(f2,f3,true, "key1", dest);
>> + CHECK_EQUAL("value12", dest);
>> +
>> + dest=string("");
>> + read_deploy_property_value(f1,f2,true, "key2", dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + read_deploy_property_value(f2,f1,true, "key2", dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + read_deploy_property_value(f1,f3,true, "key2", dest);
>> + CHECK_EQUAL("value23", dest);
>> + dest=string("");
>> + read_deploy_property_value(f3,f1,true, "key2", dest);
>> + CHECK_EQUAL("value23", dest);
>> + read_deploy_property_value(f3,f2,true, "key2", dest);
>> + CHECK_EQUAL("value23", dest);
>> + dest=string("");
>> + read_deploy_property_value(f2,f3,true, "key2", dest);
>> + CHECK_EQUAL("value23", dest);
>> +
>> + remove(f1.c_str());/////////////////////////////////
>> + dest=string("");
>> + read_deploy_property_value(f1,f2,true, "key1", dest);
>> + CHECK_EQUAL("value12", dest);
>> + dest=string("");
>> + read_deploy_property_value(f2,f1,true, "key1", dest);
>> + CHECK_EQUAL("value12", dest);
>> + dest=string("");
>> + read_deploy_property_value(f1,f3,true, "key1", dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + read_deploy_property_value(f3,f1,true, "key1", dest);
>> + CHECK_EQUAL("", dest);
>> + read_deploy_property_value(f3,f2,true, "key1", dest);
>> + CHECK_EQUAL("value12", dest);
>> + dest=string("");
>> + read_deploy_property_value(f2,f3,true, "key1", dest);
>> + CHECK_EQUAL("value12", dest);
>> +
>> + dest=string("");
>> + read_deploy_property_value(f1,f2,true, "key2", dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + read_deploy_property_value(f2,f1,true, "key2", dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + read_deploy_property_value(f1,f3,true, "key2", dest);
>> + CHECK_EQUAL("value23", dest);
>> + dest=string("");
>> + read_deploy_property_value(f3,f1,true, "key2", dest);
>> + CHECK_EQUAL("value23", dest);
>> + read_deploy_property_value(f3,f2,true, "key2", dest);
>> + CHECK_EQUAL("value23", dest);
>> + dest=string("");
>> + read_deploy_property_value(f2,f3,true, "key2", dest);
>> + CHECK_EQUAL("value23", dest);
>> +
>> + remove(f3.c_str());/////////////////////////////////
>> + dest=string("");
>> + read_deploy_property_value(f1,f2,true, "key1", dest);
>> + CHECK_EQUAL("value12", dest);
>> + dest=string("");
>> + read_deploy_property_value(f2,f1,true, "key1", dest);
>> + CHECK_EQUAL("value12", dest);
>> + dest=string("");
>> + read_deploy_property_value(f1,f3,true, "key1", dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + read_deploy_property_value(f3,f1,true, "key1", dest);
>> + CHECK_EQUAL("", dest);
>> + read_deploy_property_value(f3,f2,true, "key1", dest);
>> + CHECK_EQUAL("value12", dest);
>> + dest=string("");
>> + read_deploy_property_value(f2,f3,true, "key1", dest);
>> + CHECK_EQUAL("value12", dest);
>> +
>> + dest=string("");
>> + read_deploy_property_value(f1,f2,true, "key2", dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + read_deploy_property_value(f2,f1,true, "key2", dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + read_deploy_property_value(f1,f3,true, "key2", dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + read_deploy_property_value(f3,f1,true, "key2", dest);
>> + CHECK_EQUAL("", dest);
>> + read_deploy_property_value(f3,f2,true, "key2", dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + read_deploy_property_value(f2,f3,true, "key2", dest);
>> + CHECK_EQUAL("", dest);
>> +
>> + remove(f2.c_str());/////////////////////////////////
>> +
>> +}
>> +
>> +
>> +
>> +TEST(read_deploy_property_value2) {
>> + string f1 = temporary_file("key1=value11");
>> + string f2 = temporary_file("key1=value12");
>> + string f3 = temporary_file("key2=value23");
>> + string dest=string("");
>> + read_deploy_property_value(f1,f2,false, "key1", dest);
>> + CHECK_EQUAL("value11", dest);
>> + dest=string("");
>> + read_deploy_property_value(f2,f1,false, "key1", dest);
>> + CHECK_EQUAL("value12", dest);
>> + dest=string("");
>> + read_deploy_property_value(f1,f3,false, "key1", dest);
>> + CHECK_EQUAL("value11", dest);
>> + dest=string("");
>> + read_deploy_property_value(f3,f1,false, "key1", dest);
>> + CHECK_EQUAL("", dest);
>> + read_deploy_property_value(f3,f2,false, "key1", dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + read_deploy_property_value(f2,f3,false, "key1", dest);
>> + CHECK_EQUAL("value12", dest);
>> +
>> + dest=string("");
>> + read_deploy_property_value(f1,f2,false, "key2", dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + read_deploy_property_value(f2,f1,false, "key2", dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + read_deploy_property_value(f1,f3,false, "key2", dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + read_deploy_property_value(f3,f1,false, "key2", dest);
>> + CHECK_EQUAL("value23", dest);
>> + read_deploy_property_value(f3,f2,false, "key2", dest);
>> + CHECK_EQUAL("value23", dest);
>> + dest=string("");
>> + read_deploy_property_value(f2,f3,false, "key2", dest);
>> + CHECK_EQUAL("", dest);
>> +
>> + remove(f1.c_str());/////////////////////////////////
>> + dest=string("");
>> + read_deploy_property_value(f1,f2,false, "key1", dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + read_deploy_property_value(f2,f1,false, "key1", dest);
>> + CHECK_EQUAL("value12", dest);
>> + dest=string("");
>> + read_deploy_property_value(f1,f3,false, "key1", dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + read_deploy_property_value(f3,f1,false, "key1", dest);
>> + CHECK_EQUAL("", dest);
>> + read_deploy_property_value(f3,f2,false, "key1", dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + read_deploy_property_value(f2,f3,false, "key1", dest);
>> + CHECK_EQUAL("value12", dest);
>> +
>> + dest=string("");
>> + read_deploy_property_value(f1,f2,false, "key2", dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + read_deploy_property_value(f2,f1,false, "key2", dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + read_deploy_property_value(f1,f3,false, "key2", dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + read_deploy_property_value(f3,f1,false, "key2", dest);
>> + CHECK_EQUAL("value23", dest);
>> + read_deploy_property_value(f3,f2,false, "key2", dest);
>> + CHECK_EQUAL("value23", dest);
>> + dest=string("");
>> + read_deploy_property_value(f2,f3,false, "key2", dest);
>> + CHECK_EQUAL("", dest);
>> +
>> + remove(f3.c_str());/////////////////////////////////
>> + dest=string("");
>> + read_deploy_property_value(f1,f2,false, "key1", dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + read_deploy_property_value(f2,f1,false, "key1", dest);
>> + CHECK_EQUAL("value12", dest);
>> + dest=string("");
>> + read_deploy_property_value(f1,f3,false, "key1", dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + read_deploy_property_value(f3,f1,false, "key1", dest);
>> + CHECK_EQUAL("", dest);
>> + read_deploy_property_value(f3,f2,false, "key1", dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + read_deploy_property_value(f2,f3,false, "key1", dest);
>> + CHECK_EQUAL("value12", dest);
>> +
>> + dest=string("");
>> + read_deploy_property_value(f1,f2,false, "key2", dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + read_deploy_property_value(f2,f1,false, "key2", dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + read_deploy_property_value(f1,f3,false, "key2", dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + read_deploy_property_value(f3,f1,false, "key2", dest);
>> + CHECK_EQUAL("", dest);
>> + read_deploy_property_value(f3,f2,false, "key2", dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + read_deploy_property_value(f2,f3,false, "key2", dest);
>> + CHECK_EQUAL("", dest);
>> +
>> + remove(f2.c_str());/////////////////////////////////
>> +}
>> +
>> +
>> +TEST(find_custom_jre) {
>> + string f1 = temporary_file(custom_jre_key+"=value11");
>> + string f2 = temporary_file(custom_jre_key+"=value12");
>> + string f3 = temporary_file("key2=value23");
>> + string f4 = temporary_file("key2=value24");
>> + string dest=string("");
>> + find_custom_jre(f1,f2, dest);
>> + CHECK_EQUAL("value11", dest);
>> + dest=string("");
>> + find_custom_jre(f2,f1, dest);
>> + CHECK_EQUAL("value12", dest);
>> + dest=string("");
>> + find_custom_jre(f1,f3, dest);
>> + CHECK_EQUAL("value11", dest);
>> + dest=string("");
>> + find_custom_jre(f3,f1, dest);
>> + CHECK_EQUAL("value11", dest);
>> + dest=string("");
>> + find_custom_jre(f3,f4, dest);
>> + CHECK_EQUAL("", dest);
>> + remove(f1.c_str());/////////////////////////////////
>> + dest=string("");
>> + find_custom_jre(f1,f2, dest);
>> + CHECK_EQUAL("value12", dest);
>> + dest=string("");
>> + find_custom_jre(f2,f1, dest);
>> + CHECK_EQUAL("value12", dest);
>> + dest=string("");
>> + find_custom_jre(f1,f3, dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + find_custom_jre(f3,f1, dest);
>> + CHECK_EQUAL("", dest);
>> + remove(f3.c_str());/////////////////////////////////
>> + dest=string("");
>> + find_custom_jre(f1,f2, dest);
>> + CHECK_EQUAL("value12", dest);
>> + dest=string("");
>> + find_custom_jre(f2,f1, dest);
>> + CHECK_EQUAL("value12", dest);
>> + dest=string("");
>> + find_custom_jre(f1,f3, dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + find_custom_jre(f3,f1, dest);
>> + CHECK_EQUAL("", dest);
>> + remove(f2.c_str());/////////////////////////////////
>> + dest=string("");
>> + find_custom_jre(f1,f2, dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + find_custom_jre(f2,f1, dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + find_custom_jre(f1,f3, dest);
>> + CHECK_EQUAL("", dest);
>> + dest=string("");
>> + find_custom_jre(f3,f1, dest);
>> + CHECK_EQUAL("", dest);
>> + remove(f4.c_str());/////////////////////////////////
>> +
>> +}
> [nit] string s = "something"; is valid, string s = string("something"); is not necessary.
>
> OK. I'll admit I just mostly trusted you for the tests. Thanks for testing it so thoroughly!
> I like to use artificial {} blocks to separate the different test cases within a single function,
> that way you can reuse the same variable names.
> See for example PluginParametersTest. Anyway, I'll understand if you don't want to go back and
> change it.
>
> I may have missed it -- does this add any functional to ITW yet ?
Not yet. It will be completely separated changeset.
Using this code :)
>
> Anyway, looks overall OK. I'd like to see another round, my main concerns are 'default_file_name'
> being a global ambiguous constant, and 'trim' being available as a general (tested! :-) utility
> function.
Yup - done - with most of the nits except deprecated streams.
>
> Very happy that you gave C++ a chance :-)
/me thnax for mentoring!
-------------- next part --------------
A non-text attachment was scrubbed...
Name: integratedAndTestedPArseproperties_2.patch
Type: text/x-patch
Size: 30797 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20130321/9a6202ea/integratedAndTestedPArseproperties_2.patch
More information about the distro-pkg-dev
mailing list