iban und bic in bank_account
This commit is contained in:
parent
65a0025645
commit
12a1556b34
@ -1,21 +0,0 @@
|
||||
-- INSERT INTO domain__domain_option
|
||||
-- SELECT domain_option_id, domain_id FROM domain
|
||||
-- JOIN unixuser on ( domain.domain_owner = unixuser.unixuser_id )
|
||||
-- JOIN packet on ( unixuser.packet_id = packet.packet_id )
|
||||
-- JOIN basepacket on ( packet.bp_id = basepacket.basepacket_id ), domain_option
|
||||
-- WHERE basepacket.basepacket_code = 'PAC/DW'
|
||||
-- AND domain_option.domain_option_name = 'php' ;
|
||||
|
||||
-- DELETE FROM domain__domain_option
|
||||
-- USING domain_option, domain
|
||||
-- JOIN unixuser on ( domain.domain_owner = unixuser.unixuser_id )
|
||||
-- JOIN packet on ( unixuser.packet_id = packet.packet_id )
|
||||
-- JOIN basepacket on ( packet.bp_id = basepacket.basepacket_id )
|
||||
-- WHERE basepacket.basepacket_code != 'PAC/DW'
|
||||
-- AND domain__domain_option.domain_option_id = domain_option.domain_option_id
|
||||
-- AND domain_option.domain_option_name = 'php' ;
|
||||
|
||||
--
|
||||
-- Name: packet_component_id_seq; Type: SEQUENCE; Schema: public; Owner: -
|
||||
--
|
||||
|
@ -3,6 +3,7 @@ DROP TABLE price ;
|
||||
DROP TABLE price_list ;
|
||||
DROP TABLE bank_account ;
|
||||
DROP SEQUENCE bank_account_bank_account_id_seq ;
|
||||
-- DROP VIEW business_partner_ticket ;
|
||||
DROP TABLE contact ;
|
||||
DROP SEQUENCE contact_contact_id_seq ;
|
||||
DROP TABLE database ;
|
||||
@ -38,3 +39,7 @@ DROP TABLE business_partner CASCADE ;
|
||||
DROP SEQUENCE business_partner_bp_id_seq ;
|
||||
DROP SEQUENCE packet_component_id_seq ;
|
||||
DROP SEQUENCE component_id_seq ;
|
||||
-- DROP SEQUENCE bank_account_bank_account_i_seq ;
|
||||
-- DROP SEQUENCE billdata_billdata_id_seq ;
|
||||
-- DROP SEQUENCE member_id_seq ;
|
||||
-- DROP SEQUENCE queue_queue_entry_id_seq ;
|
||||
|
@ -12,7 +12,9 @@ CREATE TABLE bank_account (
|
||||
bank_account character varying(10),
|
||||
bank_code character varying(8),
|
||||
bank_name character varying(50),
|
||||
CONSTRAINT ckt_bank_account CHECK (((((((bank_customer IS NOT NULL) AND (bank_account IS NOT NULL)) AND (bank_code IS NOT NULL)) AND (bank_name IS NOT NULL)) AND (((autodebit_ga = true) OR (autodebit_ar = true)) OR (autodebit_op = true))) OR (((autodebit_ga = false) AND (autodebit_ar = false)) AND (autodebit_op = false))))
|
||||
bank_iban character varying(30),
|
||||
bank_bic character varying(15),
|
||||
mandat_ref character varying(10)
|
||||
);
|
||||
|
||||
|
||||
|
@ -89,6 +89,7 @@ public class Transaction {
|
||||
for (String hive : taskStores.keySet()) {
|
||||
QueueTaskStore store = taskStores.get(hive);
|
||||
String queueName = "hsadminSystem-" + hive;
|
||||
queueName = "hsadminSystem-h99"; // FIXME nicht committen !!!
|
||||
Queue jmsSystemQueue = lookupJMSQueue(queueName);
|
||||
QueueClient qClient = null;
|
||||
try {
|
||||
|
@ -44,11 +44,14 @@ public class BankAccount extends AbstractEntity implements Serializable {
|
||||
@Column(name = "bank_customer", columnDefinition = "character varying(50)")
|
||||
private String bankCustomer;
|
||||
|
||||
@Column(name = "bank_account", columnDefinition = "character varying(10)")
|
||||
private String bankAccount;
|
||||
@Column(name = "bank_iban", columnDefinition = "character varying(30)")
|
||||
private String bankIBAN;
|
||||
|
||||
@Column(name = "bank_code", columnDefinition = "character varying(8)")
|
||||
private String bankCode;
|
||||
@Column(name = "bank_bic", columnDefinition = "character varying(15)")
|
||||
private String bankBIC;
|
||||
|
||||
@Column(name = "mandat_ref", columnDefinition = "character varying(10)")
|
||||
private String mandatRef;
|
||||
|
||||
@Column(name = "bank_name", columnDefinition = "character varying(50)")
|
||||
private String bankName;
|
||||
@ -127,22 +130,6 @@ public class BankAccount extends AbstractEntity implements Serializable {
|
||||
this.bankCustomer = bankCustomer;
|
||||
}
|
||||
|
||||
public String getBankAccount() {
|
||||
return bankAccount;
|
||||
}
|
||||
|
||||
public void setBankAccount(String bankAccount) {
|
||||
this.bankAccount = bankAccount;
|
||||
}
|
||||
|
||||
public String getBankCode() {
|
||||
return bankCode;
|
||||
}
|
||||
|
||||
public void setBankCode(String bankCode) {
|
||||
this.bankCode = bankCode;
|
||||
}
|
||||
|
||||
public String getBankName() {
|
||||
return bankName;
|
||||
}
|
||||
@ -160,4 +147,28 @@ public class BankAccount extends AbstractEntity implements Serializable {
|
||||
public UnixUser owningUser(EntityManager em) {
|
||||
return customer.owningUser(em);
|
||||
}
|
||||
|
||||
public String getBankIBAN() {
|
||||
return bankIBAN;
|
||||
}
|
||||
|
||||
public void setBankIBAN(String bankIBAN) {
|
||||
this.bankIBAN = bankIBAN;
|
||||
}
|
||||
|
||||
public String getBankBIC() {
|
||||
return bankBIC;
|
||||
}
|
||||
|
||||
public void setBankBIC(String bankBIC) {
|
||||
this.bankBIC = bankBIC;
|
||||
}
|
||||
|
||||
public String getMandatRef() {
|
||||
return mandatRef;
|
||||
}
|
||||
|
||||
public void setMandatRef(String mandatRef) {
|
||||
this.mandatRef = mandatRef;
|
||||
}
|
||||
}
|
||||
|
@ -53,9 +53,10 @@ public class CustomerRemote extends AbstractRemote {
|
||||
resultMap.put("autodebit_ar", bank.getAutoDebitAR() != null && bank.getAutoDebitAR() ? "Yes" : "No");
|
||||
resultMap.put("autodebit_op", bank.getAutoDebitOP() != null && bank.getAutoDebitOP() ? "Yes" : "No");
|
||||
resultMap.put("bank_customer", bank.getBankCustomer());
|
||||
resultMap.put("bank_account", bank.getBankAccount());
|
||||
resultMap.put("bank_code", bank.getBankCode());
|
||||
resultMap.put("bank_iban", bank.getBankIBAN());
|
||||
resultMap.put("bank_bic", bank.getBankBIC());
|
||||
resultMap.put("bank_name", bank.getBankName());
|
||||
resultMap.put("mandat_ref", bank.getMandatRef());
|
||||
}
|
||||
Set<Contact> contacts = cust.getContacts();
|
||||
if (contacts != null && !contacts.isEmpty()) {
|
||||
@ -135,6 +136,7 @@ public class CustomerRemote extends AbstractRemote {
|
||||
bank = new BankAccount();
|
||||
bank.setCustomer(cust);
|
||||
cust.setBankAccount(bank);
|
||||
bank.setMandatRef(memberNo);
|
||||
}
|
||||
String autoDebitGA = (String) setParams.get("autodebit_ga");
|
||||
if (assertNotNull(autoDebitGA)) {
|
||||
@ -155,13 +157,13 @@ public class CustomerRemote extends AbstractRemote {
|
||||
if (assertNotNull(bankCustomer)) {
|
||||
bank.setBankCustomer(bankCustomer);
|
||||
}
|
||||
String bankAccount = (String) setParams.get("bank_account");
|
||||
if (assertNotNull(bankAccount)) {
|
||||
bank.setBankAccount(bankAccount);
|
||||
String bankIBAN = (String) setParams.get("bank_iban");
|
||||
if (assertNotNull(bankIBAN)) {
|
||||
bank.setBankIBAN(bankIBAN);
|
||||
}
|
||||
String bankCode = (String) setParams.get("bank_code");
|
||||
if (assertNotNull(bankCode)) {
|
||||
bank.setBankCode(bankCode);
|
||||
String bankBIC = (String) setParams.get("bank_bic");
|
||||
if (assertNotNull(bankBIC)) {
|
||||
bank.setBankBIC(bankBIC);
|
||||
}
|
||||
String bankName = (String) setParams.get("bank_name");
|
||||
if (assertNotNull(bankName)) {
|
||||
|
@ -2,20 +2,12 @@ package de.hsadmin.remote;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
import static org.junit.Assert.assertNull;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import static org.junit.Assert.fail;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStreamReader;
|
||||
import java.io.OutputStreamWriter;
|
||||
import java.io.PrintWriter;
|
||||
import java.net.Socket;
|
||||
import java.net.UnknownHostException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.apache.xmlrpc.XmlRpcException;
|
||||
@ -44,7 +36,7 @@ public class DomainTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSearchAllAsPacAdmin() {
|
||||
public void test1SearchAllAsPacAdmin() {
|
||||
String user = "aaa00";
|
||||
String grantingTicketURL = cas.getGrantingTicketURL(user);
|
||||
Map<String, String> whereParams = new HashMap<String, String>();
|
||||
@ -69,7 +61,7 @@ public class DomainTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUpdate() {
|
||||
public void test2Update() {
|
||||
String user = "aaa00";
|
||||
String grantingTicketURL = cas.getGrantingTicketURL(user);
|
||||
Map<String, String> setParams = new HashMap<String, String>();
|
||||
@ -88,7 +80,27 @@ public class DomainTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testCreate() throws UnknownHostException, IOException {
|
||||
public void test3Create() throws UnknownHostException, IOException {
|
||||
int count = getDomsCount();
|
||||
String user = "aaa00";
|
||||
String grantingTicketURL = cas.getGrantingTicketURL(user);
|
||||
Map<String, String> setParams = new HashMap<String, String>();
|
||||
setParams.put("name", "f8n.de");
|
||||
setParams.put("user", "aaa00-admin");
|
||||
Object[] params = new Object[] { user,
|
||||
cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()),
|
||||
setParams };
|
||||
try {
|
||||
Object execute = client.execute(MODULE + ".add", params);
|
||||
assertTrue(execute instanceof Map<?, ?>);
|
||||
} catch (XmlRpcException e) {
|
||||
fail(e.getMessage());
|
||||
}
|
||||
assertEquals(count + 1, getDomsCount());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void test4CreateForeignSubdomain() throws UnknownHostException, IOException {
|
||||
int count = getDomsCount();
|
||||
String user = "aaa00";
|
||||
String grantingTicketURL = cas.getGrantingTicketURL(user);
|
||||
@ -105,25 +117,13 @@ public class DomainTest {
|
||||
fail(e.getMessage());
|
||||
}
|
||||
assertEquals(count + 1, getDomsCount());
|
||||
// TODO die beiden folgenden Tests sind etwas spezifisch für Version 2.2
|
||||
assertEquals("neue Domain ist nicht kompatibel zum Bisher",5,getDomOptionsCount());
|
||||
// testGreylistingOnOff(true, "sollte bei neuer Domain eingeschaltet sein");
|
||||
// testHtdocsfallbackOnOff(true, "sollte bei neuer Domain eingeschaltet sein");
|
||||
// testIncludesOnOff(true, "sollte bei neuer Domain eingeschaltet sein");
|
||||
// testIndexesOnOff(true, "sollte bei neuer Domain eingeschaltet sein");
|
||||
// testMultiviewsOnOff(true, "sollte bei neuer Domain eingeschaltet sein");
|
||||
// testBackupMxForExternamlMxOnOff(false, "sollte bei neuer Domain ausgeschaltet sein");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testCreateForeignSubdomain() throws UnknownHostException, IOException {
|
||||
int count = getDomsCount();
|
||||
String user = "aaa01";
|
||||
String grantingTicketURL = cas.getGrantingTicketURL(user);
|
||||
Map<String, String> setParams = new HashMap<String, String>();
|
||||
count = getDomsCount();
|
||||
user = "aaa01";
|
||||
grantingTicketURL = cas.getGrantingTicketURL(user);
|
||||
setParams = new HashMap<String, String>();
|
||||
setParams.put("name", "subdomain.f6n.de");
|
||||
setParams.put("user", "aaa01");
|
||||
Object[] params = new Object[] { user,
|
||||
params = new Object[] { user,
|
||||
cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()),
|
||||
setParams };
|
||||
try {
|
||||
@ -135,304 +135,6 @@ public class DomainTest {
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testDomainOption() {
|
||||
// these tests build upon each other
|
||||
testZeroOptions();
|
||||
testOneValidOption();
|
||||
testTwoValidOptions();
|
||||
testZeroOptions();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testInvalidOption() {
|
||||
String user = "aaa00";
|
||||
String grantingTicketURL = cas.getGrantingTicketURL(user);
|
||||
Map<String, Object> setParams = new HashMap<String, Object>();
|
||||
Map<String, String> whereParams = new HashMap<String, String>();
|
||||
List<String> optionslist = new ArrayList<String>();
|
||||
optionslist.add("invalide");
|
||||
setParams.put("domainoptions", optionslist);
|
||||
whereParams.put("name", "example01.org");
|
||||
Object[] params = new Object[] { user,
|
||||
cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()),
|
||||
setParams, whereParams };
|
||||
try {
|
||||
Object execute = client.execute(MODULE + ".update", params);
|
||||
assertNotNull(execute);
|
||||
fail("exception expected");
|
||||
} catch (XmlRpcException e) {
|
||||
assertEquals(getDomOptionsCount(),0);
|
||||
}
|
||||
}
|
||||
|
||||
public void testOneValidOption() {
|
||||
String user = "aaa00";
|
||||
String grantingTicketURL = cas.getGrantingTicketURL(user);
|
||||
Map<String, Object> setParams = new HashMap<String, Object>();
|
||||
Map<String, String> whereParams = new HashMap<String, String>();
|
||||
List<String> optionslist = new ArrayList<String>();
|
||||
optionslist.add("greylisting");
|
||||
setParams.put("domainoptions", optionslist);
|
||||
whereParams.put("name", "example01.org");
|
||||
Object[] params = new Object[] { user,
|
||||
cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()),
|
||||
setParams, whereParams };
|
||||
try {
|
||||
Object execute = client.execute(MODULE + ".update", params);
|
||||
assertNotNull(execute);
|
||||
assertEquals(1, getDomOptionsCount());
|
||||
} catch (XmlRpcException e) {
|
||||
fail(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public void testTwoValidOptions() {
|
||||
String user = "aaa00";
|
||||
String grantingTicketURL = cas.getGrantingTicketURL(user);
|
||||
Map<String, Object> setParams = new HashMap<String, Object>();
|
||||
Map<String, String> whereParams = new HashMap<String, String>();
|
||||
List<String> optionslist = new ArrayList<String>();
|
||||
optionslist.add("htdocsfallback");
|
||||
optionslist.add("greylisting");
|
||||
setParams.put("domainoptions", optionslist);
|
||||
whereParams.put("name", "example01.org");
|
||||
Object[] params = new Object[] { user,
|
||||
cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()),
|
||||
setParams, whereParams };
|
||||
try {
|
||||
Object execute = client.execute(MODULE + ".update", params);
|
||||
assertNotNull(execute);
|
||||
assertEquals(2, getDomOptionsCount());
|
||||
} catch (XmlRpcException e) {
|
||||
fail(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public void testZeroOptions() {
|
||||
String user = "aaa00";
|
||||
String grantingTicketURL = cas.getGrantingTicketURL(user);
|
||||
Map<String, Object> setParams = new HashMap<String, Object>();
|
||||
Map<String, String> whereParams = new HashMap<String, String>();
|
||||
List<String> optionslist = new ArrayList<String>();
|
||||
setParams.put("domainoptions", optionslist);
|
||||
whereParams.put("name", "example01.org");
|
||||
Object[] params = new Object[] { user,
|
||||
cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()),
|
||||
setParams, whereParams };
|
||||
try {
|
||||
Object execute = client.execute(MODULE + ".update", params);
|
||||
assertNotNull(execute);
|
||||
assertEquals(0, getDomOptionsCount());
|
||||
} catch (XmlRpcException e) {
|
||||
fail(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
// @Test
|
||||
public void testBackupMxForExternamlMx() throws UnknownHostException, IOException {
|
||||
testBackupMxForExternamlMxOnOff(true, "zuerst an");
|
||||
testBackupMxForExternamlMxOnOff(false, "als zweites aus");
|
||||
testBackupMxForExternamlMxOnOff(true, "zuletzt wieder an");
|
||||
}
|
||||
|
||||
// TODO Fix this @Test
|
||||
public void testGreylisting() throws UnknownHostException, IOException {
|
||||
testGreylistingOnOff(true, "zuerst an");
|
||||
testGreylistingOnOff(false, "als zweites aus");
|
||||
testGreylistingOnOff(true, "zuletzt wieder an");
|
||||
}
|
||||
|
||||
// TODO Fix this @Test
|
||||
public void testHtdocsfallback() throws UnknownHostException, IOException {
|
||||
testHtdocsfallbackOnOff(false, "zuerst aus");
|
||||
testHtdocsfallbackOnOff(true, "als zweites an");
|
||||
testHtdocsfallbackOnOff(false, "zuletzt wieder aus");
|
||||
}
|
||||
|
||||
// @Test
|
||||
public void testIncludes() throws UnknownHostException, IOException {
|
||||
testIncludesOnOff(false, "zuerst aus");
|
||||
testIncludesOnOff(true, "als zweites an");
|
||||
testIncludesOnOff(false, "zuletzt wieder aus");
|
||||
}
|
||||
|
||||
// @Test
|
||||
public void testIndexes() throws UnknownHostException, IOException {
|
||||
testIndexesOnOff(false, "zuerst aus");
|
||||
testIndexesOnOff(true, "als zweites an");
|
||||
testIndexesOnOff(false, "zuletzt wieder aus");
|
||||
}
|
||||
|
||||
// @Test
|
||||
public void testMultiviews() throws UnknownHostException, IOException {
|
||||
testMultiviewsOnOff(true, "zuerst an");
|
||||
testMultiviewsOnOff(false, "als zweites aus");
|
||||
testMultiviewsOnOff(true, "zuletzt wieder an");
|
||||
}
|
||||
|
||||
private void testBackupMxForExternamlMxOnOff(boolean onoff, String message)
|
||||
throws UnknownHostException, IOException {
|
||||
testDomainptionOnOf(onoff, message, new DomainOptionTester() {
|
||||
|
||||
@Override
|
||||
public String getOptionName() {
|
||||
return "backupmxforexternalmx";
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isOptionConfigured(String domain)
|
||||
throws UnknownHostException, IOException {
|
||||
String host = "test-h99.hostsharing.net";
|
||||
return host == ""; // noch kein sinnvoller test
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void testGreylistingOnOff(boolean onoff, String message)
|
||||
throws UnknownHostException, IOException {
|
||||
testDomainptionOnOf(onoff, message, new DomainOptionTester() {
|
||||
|
||||
@Override
|
||||
public String getOptionName() {
|
||||
return "greylisting";
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isOptionConfigured(String domain)
|
||||
throws UnknownHostException, IOException {
|
||||
String host = "test-h99.hostsharing.net";
|
||||
String[] query = {
|
||||
"HELO " + domain + "\n" ,
|
||||
"MAIL FROM: hsadmin-testing@" + domain + "\n" ,
|
||||
"RCPT TO: postmaster@" + domain + "\n" ,
|
||||
"DATA\n" ,
|
||||
".\n" ,
|
||||
"QUIT\n" } ;
|
||||
String[] answer = socketQuery(host, 25, query ) ;
|
||||
return answer[3].contains("450") && answer[3].contains("reylisting");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void testHtdocsfallbackOnOff(boolean onoff, String message)
|
||||
throws UnknownHostException, IOException {
|
||||
testDomainptionOnOf(onoff, message, new DomainOptionTester() {
|
||||
|
||||
@Override
|
||||
public String getOptionName() {
|
||||
return "htdocsfallback";
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isOptionConfigured(String domain)
|
||||
throws UnknownHostException, IOException {
|
||||
String host = "test-h99.hostsharing.net";
|
||||
String[] answer = socketQuery(host, 80, "GET / HTTP/1.1\n"
|
||||
+ "Host: x.y.z." + domain
|
||||
+ "User-Agent: hsAdmin Test\n"
|
||||
+ "Connection: close\n");
|
||||
// answer = answer.substring(0, answer.indexOf("\n"));
|
||||
return answer[1].contains("404");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void testIncludesOnOff(boolean onoff, String message)
|
||||
throws UnknownHostException, IOException {
|
||||
testDomainptionOnOf(onoff, message, new DomainOptionTester() {
|
||||
|
||||
@Override
|
||||
public String getOptionName() {
|
||||
return "includes";
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isOptionConfigured(String domain)
|
||||
throws UnknownHostException, IOException {
|
||||
String host = "test-h99.hostsharing.net";
|
||||
// TODO dieser Test ist Humbug
|
||||
String[] answer = socketQuery(host, 80, "GET / HTTP/1.1\n"
|
||||
+ "Host: " + domain
|
||||
+ "User-Agent: hsAdmin Test\n"
|
||||
+ "Connection: close\n");
|
||||
// answer = answer.substring(0, answer.indexOf("\n"));
|
||||
return answer[1].contains("404");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void testIndexesOnOff(boolean onoff, String message)
|
||||
throws UnknownHostException, IOException {
|
||||
testDomainptionOnOf(onoff, message, new DomainOptionTester() {
|
||||
|
||||
@Override
|
||||
public String getOptionName() {
|
||||
return "indexes";
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isOptionConfigured(String domain)
|
||||
throws UnknownHostException, IOException {
|
||||
String host = "test-h99.hostsharing.net";
|
||||
// TODO dieser Test ist Humbug
|
||||
String[] answer = socketQuery(host, 80, "GET / HTTP/1.1\n"
|
||||
+ "Host: " + domain
|
||||
+ "User-Agent: hsAdmin Test\n"
|
||||
+ "Connection: close\n");
|
||||
// answer = answer.substring(0, answer.indexOf("\n"));
|
||||
return answer[1].contains("404");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void testMultiviewsOnOff(boolean onoff, String message)
|
||||
throws UnknownHostException, IOException {
|
||||
testDomainptionOnOf(onoff, message, new DomainOptionTester() {
|
||||
|
||||
@Override
|
||||
public String getOptionName() {
|
||||
return "multiviews";
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isOptionConfigured(String domain)
|
||||
throws UnknownHostException, IOException {
|
||||
String host = "test-h99.hostsharing.net";
|
||||
// TODO dieser Test ist Humbug
|
||||
String[] answer = socketQuery(host, 80, "GET / HTTP/1.1\n"
|
||||
+ "Host: " + domain
|
||||
+ "User-Agent: hsAdmin Test\n"
|
||||
+ "Connection: close\n");
|
||||
// answer = answer.substring(0, answer.indexOf("\n"));
|
||||
return answer[1].contains("404");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void testDomainptionOnOf( boolean onoff, String message, DomainOptionTester tester) throws UnknownHostException, IOException {
|
||||
String user = "aaa00";
|
||||
String domain = "example01.org";
|
||||
String grantingTicketURL = cas.getGrantingTicketURL(user);
|
||||
Map<String, Object> setParams = new HashMap<String, Object>();
|
||||
Map<String, String> whereParams = new HashMap<String, String>();
|
||||
List<String> optionslist = new ArrayList<String>();
|
||||
if(onoff) {
|
||||
optionslist.add(tester.getOptionName());
|
||||
}
|
||||
setParams.put("domainoptions", optionslist);
|
||||
whereParams.put("name", domain);
|
||||
Object[] params = new Object[] { user,
|
||||
cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()),
|
||||
setParams, whereParams };
|
||||
try {
|
||||
Object execute = client.execute(MODULE + ".update", params);
|
||||
assertNotNull(execute);
|
||||
assertEquals(tester.getOptionName()+": "+message, onoff, tester.isOptionConfigured(domain));
|
||||
} catch (XmlRpcException e) {
|
||||
}
|
||||
}
|
||||
|
||||
private int getDomsCount() {
|
||||
int count = 0;
|
||||
String user = "aaa00";
|
||||
@ -451,79 +153,4 @@ public class DomainTest {
|
||||
return count;
|
||||
}
|
||||
|
||||
private int getDomOptionsCount() {
|
||||
int count = 0;
|
||||
String user = "aaa00";
|
||||
String grantingTicketURL = cas.getGrantingTicketURL(user);
|
||||
Map<String, String> whereParams = new HashMap<String, String>();
|
||||
whereParams.put("name", "example01.org");
|
||||
Object[] params = new Object[] { user,
|
||||
cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()),
|
||||
whereParams };
|
||||
try {
|
||||
Object execute = client.execute(MODULE + ".search", params);
|
||||
Object[] result = (Object[]) execute;
|
||||
assertEquals(result.length, 1);
|
||||
assertTrue(result[0] instanceof Map<?, ?>);
|
||||
Map<?, ?> domainMap = (Map<?, ?>) result[0];
|
||||
assertNotNull(domainMap);
|
||||
Object[] optsList = (Object[])domainMap.get("domainoptions");
|
||||
if (optsList == null) {
|
||||
count = 0;
|
||||
} else {
|
||||
count = optsList.length;
|
||||
}
|
||||
} catch (XmlRpcException e) {
|
||||
fail(e.getMessage());
|
||||
}
|
||||
return count;
|
||||
}
|
||||
|
||||
private static String[] socketQuery( String host, int port, String command) throws UnknownHostException, IOException{
|
||||
String[] query = { command } ;
|
||||
return socketQuery( host , port , query );
|
||||
}
|
||||
|
||||
private static String[] socketQuery( String host, int port, String[] query) throws UnknownHostException, IOException{
|
||||
Socket socket = new Socket( host, port );
|
||||
String[] retval = socketQuery( socket, query );
|
||||
socket.close();
|
||||
return retval;
|
||||
}
|
||||
|
||||
private static String[] socketQuery( Socket socket, String command) throws UnknownHostException, IOException{
|
||||
String[] query = { command } ;
|
||||
return socketQuery( socket , query );
|
||||
}
|
||||
|
||||
private static String[] socketQuery( Socket socket, String[] query) throws UnknownHostException, IOException{
|
||||
int l = query.length;
|
||||
String[] retval = new String[l];
|
||||
retval[0] = socketQueryReader(socket);
|
||||
for(int i=0; i<l; ){
|
||||
socketQueryWriter( socket, query[i] );
|
||||
retval[i++] = socketQueryReader(socket);
|
||||
}
|
||||
return retval;
|
||||
}
|
||||
|
||||
private static void socketQueryWriter( Socket socket, String buffer) throws IOException{
|
||||
PrintWriter printWriter =
|
||||
new PrintWriter(
|
||||
new OutputStreamWriter(
|
||||
socket.getOutputStream()));
|
||||
printWriter.print(buffer);
|
||||
printWriter.flush();
|
||||
}
|
||||
|
||||
private static String socketQueryReader( Socket socket ) throws IOException{
|
||||
int maxbufferbytecount = 4099;
|
||||
BufferedReader bufferedReader =
|
||||
new BufferedReader(
|
||||
new InputStreamReader(
|
||||
socket.getInputStream()));
|
||||
char[] buffer = new char[maxbufferbytecount];
|
||||
int bufferbytecount = bufferedReader.read(buffer, 0, maxbufferbytecount); // blocks til end of transmission
|
||||
return new String(buffer, 0, bufferbytecount);
|
||||
}
|
||||
}
|
||||
|
@ -38,7 +38,7 @@ public class InitDataTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testAddMember() {
|
||||
public void testAdd1Member() {
|
||||
String user = "ad";
|
||||
int membersCount = -9999;
|
||||
membersCount = getMembersCount();
|
||||
@ -71,7 +71,7 @@ public class InitDataTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testAddPac() {
|
||||
public void testAdd2Pac() {
|
||||
int count = getPacsCount();
|
||||
String user = "ad";
|
||||
String grantingTicketURL = cas.getGrantingTicketURL(user);
|
||||
@ -99,7 +99,7 @@ public class InitDataTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testAddUser() {
|
||||
public void testAdd3User() {
|
||||
int count = getUsersCount();
|
||||
try {
|
||||
String user = "aaa00";
|
||||
@ -128,7 +128,7 @@ public class InitDataTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testAddDomain() {
|
||||
public void testAdd4Domain() {
|
||||
int count = getUsersCount();
|
||||
try {
|
||||
String user = "aaa00";
|
||||
|
@ -10,6 +10,7 @@ import org.apache.xmlrpc.XmlRpcException;
|
||||
import org.apache.xmlrpc.client.XmlRpcClient;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Ignore;
|
||||
import org.junit.Test;
|
||||
|
||||
import de.hsadmin.core.qserv.CommandShell;
|
||||
@ -39,7 +40,7 @@ public class SSLCertDomainTest {
|
||||
config = null;
|
||||
}
|
||||
|
||||
@Test
|
||||
@Test @Ignore
|
||||
public void testSSLCertWithoutChain() {
|
||||
String user = "ad";
|
||||
String grantingTicketURL = cas.getGrantingTicketURL(user);
|
||||
@ -70,7 +71,7 @@ public class SSLCertDomainTest {
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
@Test @Ignore
|
||||
public void testSSLCertWithChain() {
|
||||
String user = "ad";
|
||||
String grantingTicketURL = cas.getGrantingTicketURL(user);
|
||||
|
@ -32,6 +32,17 @@ public class UnixUserTest {
|
||||
cas = null;
|
||||
}
|
||||
|
||||
public void doTests() {
|
||||
testSearchAsPacAdmin();
|
||||
testAddAsPacAdmin();
|
||||
testAddAsPacAdminFail();
|
||||
testAddWithFalseName();
|
||||
testUpdateAsPacAdmin();
|
||||
testDeleteWithLongName();
|
||||
testDeleteAsPacAdminFail();
|
||||
testDeleteAsPacAdmin();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSearchAsPacAdmin() {
|
||||
String user = "aaa00";
|
||||
@ -64,7 +75,7 @@ public class UnixUserTest {
|
||||
String user = "aaa00";
|
||||
String grantingTicketURL = cas.getGrantingTicketURL(user);
|
||||
Map<String, String> setParams = new HashMap<String, String>();
|
||||
setParams.put("name", "aaa00-test3");
|
||||
setParams.put("name", "aaa00-test3a");
|
||||
setParams.put("password", "test123");
|
||||
setParams.put("quota", "128");
|
||||
setParams.put("quotalimit", "192");
|
||||
@ -74,7 +85,7 @@ public class UnixUserTest {
|
||||
Object execute = client.execute(MODULE + ".add", params);
|
||||
if (execute instanceof Map<?, ?>) {
|
||||
Map<?, ?> entry = (Map<?, ?>) execute;
|
||||
assertEquals("aaa00-test3", entry.get("name"));
|
||||
assertEquals("aaa00-test3a", entry.get("name"));
|
||||
assertEquals("aaa00", entry.get("pac"));
|
||||
assertEquals(null, entry.get("password"));
|
||||
} else {
|
||||
@ -202,16 +213,27 @@ public class UnixUserTest {
|
||||
|
||||
@Test
|
||||
public void testDeleteAsPacAdmin() {
|
||||
int count = getObjectCount();
|
||||
int count = 0;
|
||||
try {
|
||||
String user = "aaa00";
|
||||
String grantingTicketURL = cas.getGrantingTicketURL(user);
|
||||
Map<String, String> whereParams = new HashMap<String, String>();
|
||||
whereParams.put("name", "aaa00-test3");
|
||||
Map<String, String> setParams = new HashMap<String, String>();
|
||||
setParams.put("name", "aaa00-test3");
|
||||
setParams.put("password", "test123");
|
||||
setParams.put("quota", "128");
|
||||
setParams.put("quotalimit", "192");
|
||||
Object[] params = new Object[] { user,
|
||||
cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()),
|
||||
setParams };
|
||||
Object execute = client.execute(MODULE + ".add", params);
|
||||
count = getObjectCount();
|
||||
grantingTicketURL = cas.getGrantingTicketURL(user);
|
||||
Map<String, String> whereParams = new HashMap<String, String>();
|
||||
whereParams.put("name", "aaa00-test3");
|
||||
params = new Object[] { user,
|
||||
cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()),
|
||||
whereParams };
|
||||
Object execute = client.execute(MODULE + ".delete", params);
|
||||
execute = client.execute(MODULE + ".delete", params);
|
||||
assertNull(execute);
|
||||
} catch (XmlRpcException e) {
|
||||
fail(e.getMessage());
|
||||
|
Loading…
Reference in New Issue
Block a user