annotate gwt-client/src/test/java/test/AbstractModuleRunner.java @ 9497:d6d5ca6d4af0

Enabled logging of saml-group-name in log-ing logfile. Some cleanup/refaktoring.
author gernotbelger
date Thu, 27 Sep 2018 17:40:39 +0200
parents e75afd693f78
children 86e522bc7f36
rev   line source
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
1 package test;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
2
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
3 /** Copyright (C) 2017 by Bundesanstalt für Gewässerkunde
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
4 * Software engineering by
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
5 * Björnsen Beratende Ingenieure GmbH
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
6 * Dr. Schumacher Ingenieurbüro für Wasser und Umwelt
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
7 *
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
8 * This file is Free Software under the GNU AGPL (>=v3)
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
9 * and comes with ABSOLUTELY NO WARRANTY! Check out the
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
10 * documentation coming with Dive4Elements River for details.
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
11 */
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
12
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
13 import java.io.File;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
14 import java.io.FileNotFoundException;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
15 import java.io.FileOutputStream;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
16 import java.io.IOException;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
17 import java.io.InputStream;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
18 import java.io.InputStreamReader;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
19 import java.net.URL;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
20 import java.util.ArrayList;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
21 import java.util.List;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
22
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
23 import org.apache.commons.io.FileUtils;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
24 import org.apache.commons.io.IOUtils;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
25 import org.dive4elements.artifacts.common.ArtifactNamespaceContext;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
26 import org.dive4elements.artifacts.common.utils.ClientProtocolUtils;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
27 import org.dive4elements.artifacts.httpclient.exceptions.ConnectionException;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
28 import org.dive4elements.artifacts.httpclient.http.HttpClient;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
29 import org.dive4elements.artifacts.httpclient.http.HttpClientImpl;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
30 import org.dive4elements.artifacts.httpclient.http.response.DocumentResponseHandler;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
31 import org.dive4elements.artifacts.httpclient.utils.XMLUtils;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
32 import org.dive4elements.river.client.server.AdvanceServiceImpl;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
33 import org.dive4elements.river.client.server.ArtifactHelper;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
34 import org.dive4elements.river.client.server.CollectionHelper;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
35 import org.dive4elements.river.client.server.CreateCollectionServiceImpl;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
36 import org.dive4elements.river.client.server.FLYSArtifactCreator;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
37 import org.dive4elements.river.client.server.FeedServiceImpl;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
38 import org.dive4elements.river.client.server.auth.DefaultUser;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
39 import org.dive4elements.river.client.server.auth.User;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
40 import org.dive4elements.river.client.server.auth.UserClient;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
41 import org.dive4elements.river.client.shared.exceptions.ServerException;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
42 import org.dive4elements.river.client.shared.model.Artifact;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
43 import org.dive4elements.river.client.shared.model.Collection;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
44 import org.dive4elements.river.client.shared.model.Data;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
45 import org.dive4elements.river.client.shared.model.DataItem;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
46 import org.dive4elements.river.client.shared.model.DefaultCollection;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
47 import org.dive4elements.river.client.shared.model.DefaultDataItem;
9127
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
48 import org.dive4elements.river.client.shared.model.OutputMode;
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
49 import org.dive4elements.river.client.shared.model.StringOptionsData;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
50 import org.junit.Assert;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
51 import org.w3c.dom.Document;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
52 import org.w3c.dom.Element;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
53
9422
e567fac95e3d uinfo salix no scenario jUnit test
gernotbelger
parents: 9228
diff changeset
54 import test.AbstractBerechnungsartenTester.River;
9127
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
55
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
56 /**
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
57 * @author Domenico Nardi Tironi
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
58 *
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
59 */
9148
48d87af1243e Unit testing flowdepthdevelopment added
gernotbelger
parents: 9133
diff changeset
60 public abstract class AbstractModuleRunner {
9127
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
61
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
62 public enum Infotype {
9422
e567fac95e3d uinfo salix no scenario jUnit test
gernotbelger
parents: 9228
diff changeset
63 sinfo, uinfo, bundu
9127
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
64 }
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
65
9422
e567fac95e3d uinfo salix no scenario jUnit test
gernotbelger
parents: 9228
diff changeset
66 private final static String USERNAME = "belger";
e567fac95e3d uinfo salix no scenario jUnit test
gernotbelger
parents: 9228
diff changeset
67
e567fac95e3d uinfo salix no scenario jUnit test
gernotbelger
parents: 9228
diff changeset
68 private final static String PASSWORD = "belger";
e567fac95e3d uinfo salix no scenario jUnit test
gernotbelger
parents: 9228
diff changeset
69
9210
de55d9a94796 Fixed: was using java 7 features in java 6 code
gernotbelger
parents: 9148
diff changeset
70 private static final String lineSeparator = System.getProperty("line.separator");
de55d9a94796 Fixed: was using java 7 features in java 6 code
gernotbelger
parents: 9148
diff changeset
71
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
72 private final String serverUrl = "http://localhost:8181";
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
73 private final String locale = "de";
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
74 private final HttpClient client;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
75
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
76 private static final String exportFileDir = "D:" + File.separator;
9127
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
77 private static final String IGNORE_ERSTELLDATUM = "# Datum der Erstellung";
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
78 private static final String IGNORE_FLYS_VERSION = "# FLYS-Version:";
9226
83aee0942eae JUnit-Tests - tkh works
gernotbelger
parents: 9210
diff changeset
79 private static final String IGNORE_BEARBEITER = "NEIN_DOCH_NICHT";// "# Bearbeiter:";
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
80
9127
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
81 private final Infotype infotype;
9424
da19f1f58d72 jUnit test uinfo salix regional
gernotbelger
parents: 9422
diff changeset
82 private static String userUuid;
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
83 private Collection collection;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
84 private Artifact artifact;
9422
e567fac95e3d uinfo salix no scenario jUnit test
gernotbelger
parents: 9228
diff changeset
85 private final IFilenameMapper fileName;
9127
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
86
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
87 // common attributes
9422
e567fac95e3d uinfo salix no scenario jUnit test
gernotbelger
parents: 9228
diff changeset
88 private final ICalcMode iCalcMode;
9127
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
89 private final double from;
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
90 private final double to;
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
91 private final River river;
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
92
9422
e567fac95e3d uinfo salix no scenario jUnit test
gernotbelger
parents: 9228
diff changeset
93 public AbstractModuleRunner(final Infotype infotype, final ICalcMode calcmode, final IFilenameMapper helloWorldFile, final double from, final double to,
e567fac95e3d uinfo salix no scenario jUnit test
gernotbelger
parents: 9228
diff changeset
94 final River beispielfluss) throws ConnectionException, ServerException {
9127
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
95 // common attributes (evtl. doch in subklassen, evtl. Zwischenhierarchiestufe einführen
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
96
9422
e567fac95e3d uinfo salix no scenario jUnit test
gernotbelger
parents: 9228
diff changeset
97 this.iCalcMode = calcmode;
9127
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
98 this.river = beispielfluss;
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
99 this.from = from;
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
100 this.to = to;
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
101
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
102 this.infotype = infotype;
9127
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
103 this.fileName = helloWorldFile;
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
104
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
105 // init
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
106 this.client = new HttpClientImpl(this.serverUrl, this.locale);
9424
da19f1f58d72 jUnit test uinfo salix regional
gernotbelger
parents: 9422
diff changeset
107 if (AbstractModuleRunner.userUuid == null)
da19f1f58d72 jUnit test uinfo salix regional
gernotbelger
parents: 9422
diff changeset
108 AbstractModuleRunner.userUuid = makeUserUuid(this.serverUrl);
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
109 this.collection = getCollection();
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
110 this.artifact = getArtifact();
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
111 }
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
112
9424
da19f1f58d72 jUnit test uinfo salix regional
gernotbelger
parents: 9422
diff changeset
113 private static String makeUserUuid(final String serverUrl) throws ConnectionException {
9497
d6d5ca6d4af0 Enabled logging of saml-group-name in log-ing logfile.
gernotbelger
parents: 9441
diff changeset
114 final User user = new DefaultUser(USERNAME, PASSWORD, null, false, new ArrayList<String>(), new ArrayList<String>(), null);
9424
da19f1f58d72 jUnit test uinfo salix regional
gernotbelger
parents: 9422
diff changeset
115 final UserClient userClient = new UserClient(serverUrl);
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
116 Element userElement;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
117
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
118 userElement = userClient.findUser(user);
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
119 return userElement.getAttributeNS(ArtifactNamespaceContext.NAMESPACE_URI, "uuid");
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
120
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
121 }
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
122
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
123 protected final Artifact getArtifact() throws ServerException, ConnectionException {
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
124 if (this.artifact == null) {
9127
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
125 this.artifact = ArtifactHelper.createArtifact(this.serverUrl, this.locale, this.infotype.name(), null);
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
126 setCollection(CollectionHelper.addArtifact(getCollection(), this.artifact, this.serverUrl, this.locale)); // wichtig; sorgt für Persistenz
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
127 }
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
128 return this.artifact;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
129 }
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
130
9148
48d87af1243e Unit testing flowdepthdevelopment added
gernotbelger
parents: 9133
diff changeset
131 protected Collection getCollection() throws ConnectionException {
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
132
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
133 if (this.collection == null) {
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
134 // lazy-Loading
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
135 final Document create = ClientProtocolUtils.newCreateCollectionDocument(null);
9424
da19f1f58d72 jUnit test uinfo salix regional
gernotbelger
parents: 9422
diff changeset
136 final Document doc = (Document) this.client.createCollection(create, userUuid, new DocumentResponseHandler());
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
137 final String uuid = XMLUtils.xpathString(doc, CreateCollectionServiceImpl.XPATH_COLLECTION_UUID, ArtifactNamespaceContext.INSTANCE);
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
138 final String ttlStr = XMLUtils.xpathString(doc, CreateCollectionServiceImpl.XPATH_COLLECTION_TTL, ArtifactNamespaceContext.INSTANCE);
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
139 this.collection = new DefaultCollection(uuid, Long.valueOf(ttlStr), uuid);
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
140 }
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
141 return this.collection;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
142
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
143 }
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
144
9127
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
145 private final void setCollection(final Collection collection) {
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
146 this.collection = collection;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
147 }
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
148
9127
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
149 private final void setArtifact(final Artifact artifact) {
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
150 this.artifact = artifact;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
151 }
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
152
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
153 public abstract void runTest(final boolean exportToFile) throws ConnectionException, ServerException, IOException;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
154
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
155 protected final void describeCollection() throws ConnectionException {
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
156
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
157 final String uuid = getCollection().identifier();
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
158 final Document describe = ClientProtocolUtils.newDescribeCollectionDocument(uuid);
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
159 final Document response = (Document) this.client.doCollectionAction(describe, uuid, new DocumentResponseHandler());
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
160 final Collection c = CollectionHelper.parseCollection(response);
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
161 setCollection(c);
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
162
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
163 }
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
164
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
165 protected final void feedAndGo(final Data[] data, final int reachableStateIndex) throws ConnectionException, ServerException {
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
166 feed(data);
9127
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
167 advance(getReachableStateByIndex(getArtifact(), reachableStateIndex)); // reachablestate könnte auch String sein.
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
168 }
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
169
9127
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
170 private final String getReachableStateByIndex(final Artifact artifact, final int index) {
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
171
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
172 final String[] states = artifact.getArtifactDescription().getReachableStates();
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
173 if (states != null) {
9210
de55d9a94796 Fixed: was using java 7 features in java 6 code
gernotbelger
parents: 9148
diff changeset
174
de55d9a94796 Fixed: was using java 7 features in java 6 code
gernotbelger
parents: 9148
diff changeset
175 if (states.length > index)
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
176 return states[index];
9210
de55d9a94796 Fixed: was using java 7 features in java 6 code
gernotbelger
parents: 9148
diff changeset
177
de55d9a94796 Fixed: was using java 7 features in java 6 code
gernotbelger
parents: 9148
diff changeset
178 return states[0];
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
179 }
9210
de55d9a94796 Fixed: was using java 7 features in java 6 code
gernotbelger
parents: 9148
diff changeset
180
de55d9a94796 Fixed: was using java 7 features in java 6 code
gernotbelger
parents: 9148
diff changeset
181 return "";
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
182 }
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
183
9226
83aee0942eae JUnit-Tests - tkh works
gernotbelger
parents: 9210
diff changeset
184 protected final void feed(final Data[] data) throws ServerException, ConnectionException {
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
185 final Document feed = ClientProtocolUtils.newFeedDocument(getArtifact().getUuid(), getArtifact().getHash(), createKVP(data));
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
186 final Document description = (Document) this.client.feed(
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
187 new org.dive4elements.artifacts.httpclient.objects.Artifact(getArtifact().getUuid(), getArtifact().getHash()), feed,
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
188 new DocumentResponseHandler());
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
189
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
190 final String result = XMLUtils.xpathString(description, FeedServiceImpl.XPATH_RESULT, ArtifactNamespaceContext.INSTANCE);
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
191
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
192 if (result == null || !result.equals(FeedServiceImpl.OPERATION_FAILURE)) {
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
193 setArtifact((Artifact) new FLYSArtifactCreator().create(description));
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
194 } else if (result != null && result.equals(FeedServiceImpl.OPERATION_FAILURE)) {
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
195 final String msg = XMLUtils.xpathString(description, FeedServiceImpl.XPATH_RESULT_MSG, ArtifactNamespaceContext.INSTANCE);
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
196 throw new ServerException(msg);
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
197 }
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
198 }
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
199
9148
48d87af1243e Unit testing flowdepthdevelopment added
gernotbelger
parents: 9133
diff changeset
200 protected final Data[] extractPairData(final List<String> pairIds, final String dataName) {
9228
dba14da43f23 JUnit-Tests finish
gernotbelger
parents: 9226
diff changeset
201 final DataItem[] items = new DataItem[pairIds.size()];
9148
48d87af1243e Unit testing flowdepthdevelopment added
gernotbelger
parents: 9133
diff changeset
202 int i = 0;
9228
dba14da43f23 JUnit-Tests finish
gernotbelger
parents: 9226
diff changeset
203 final StringBuilder builder = new StringBuilder();
9148
48d87af1243e Unit testing flowdepthdevelopment added
gernotbelger
parents: 9133
diff changeset
204 for (final String pairId : pairIds) {
9228
dba14da43f23 JUnit-Tests finish
gernotbelger
parents: 9226
diff changeset
205 builder.append(pairId).append("#");
9148
48d87af1243e Unit testing flowdepthdevelopment added
gernotbelger
parents: 9133
diff changeset
206 i++;
48d87af1243e Unit testing flowdepthdevelopment added
gernotbelger
parents: 9133
diff changeset
207 }
9228
dba14da43f23 JUnit-Tests finish
gernotbelger
parents: 9226
diff changeset
208 final String allPairIds = builder.delete(builder.length() - 1, builder.length()).toString(); // letztes Gatter entfernen
dba14da43f23 JUnit-Tests finish
gernotbelger
parents: 9226
diff changeset
209 final DataItem[] item = new DataItem[] { new DefaultDataItem(allPairIds, allPairIds, allPairIds) };
dba14da43f23 JUnit-Tests finish
gernotbelger
parents: 9226
diff changeset
210 return new Data[] { new StringOptionsData(dataName, dataName, item) };
9148
48d87af1243e Unit testing flowdepthdevelopment added
gernotbelger
parents: 9133
diff changeset
211 }
48d87af1243e Unit testing flowdepthdevelopment added
gernotbelger
parents: 9133
diff changeset
212
9127
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
213 private final String[][] createKVP(final Data[] data) {
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
214 if (data != null) {
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
215 final String[][] kvp = new String[data.length][];
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
216
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
217 int i = 0;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
218
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
219 for (final Data d : data) {
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
220 final String key = d.getLabel();
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
221 final String value = d.getStringValue();
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
222
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
223 kvp[i++] = new String[] { key, value };
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
224 }
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
225
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
226 return kvp;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
227 }
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
228 return null;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
229 }
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
230
9127
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
231 private final void advance(final String target) throws ConnectionException, ServerException {
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
232 final Document advance = ClientProtocolUtils.newAdvanceDocument(getArtifact().getUuid(), getArtifact().getHash(), target);
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
233 final Document description = (Document) this.client.advance(
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
234 new org.dive4elements.artifacts.httpclient.objects.Artifact(getArtifact().getUuid(), getArtifact().getHash()), advance,
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
235 new DocumentResponseHandler());
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
236
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
237 if (description == null) {
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
238 throw new ServerException(AdvanceServiceImpl.ERROR_ADVANCE_ARTIFACT);
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
239 }
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
240
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
241 final String result = XMLUtils.xpathString(description, AdvanceServiceImpl.XPATH_RESULT, ArtifactNamespaceContext.INSTANCE);
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
242
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
243 if (result == null || !result.equals(AdvanceServiceImpl.OPERATION_FAILURE)) {
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
244 setArtifact((Artifact) new FLYSArtifactCreator().create(description));
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
245 }
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
246 }
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
247
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
248 /// ExportServiceImpl
9148
48d87af1243e Unit testing flowdepthdevelopment added
gernotbelger
parents: 9133
diff changeset
249 protected final void assertAndWriteToFile(final String mode, final boolean exportToFile) throws IOException {
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
250
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
251 final String type = "csv";
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
252
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
253 final String enc = "windows-1252";// req.getParameter("encoding");
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
254
9127
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
255 final URL expectedResource = getClass().getResource(this.fileName.getFilename());
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
256 final Document attr = null;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
257 final Document request = ClientProtocolUtils.newOutCollectionDocument(getCollection().identifier(), mode, type, attr);
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
258
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
259 final InputStream response = this.client.collectionOut(request, getCollection().identifier(), mode);
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
260
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
261 final String actual = deleteErstelldatum(IOUtils.toString(response, "UTF-8"));
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
262
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
263 final String expected = deleteErstelldatum(FileUtils.readFileToString(new File(expectedResource.getFile()), enc));
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
264
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
265 // if (!actual.equals(expected)) {
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
266 if (exportToFile) {
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
267 doGetWriteToDisk(mode); // TODO: WENN der Test negativ ausfällt, Datei abspeichern -> Diskussion
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
268 }
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
269
9133
af73fdd96920 Title current/historical diff pair; limit on entries in diff'pair twin_panel
gernotbelger
parents: 9127
diff changeset
270 Assert.assertEquals(expected, actual);
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
271 }
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
272
9127
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
273 private final String deleteErstelldatum(final String input) {
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
274 String result = "";
9210
de55d9a94796 Fixed: was using java 7 features in java 6 code
gernotbelger
parents: 9148
diff changeset
275 final String[] lines = input.split(lineSeparator);
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
276 for (final String line : lines) {
9148
48d87af1243e Unit testing flowdepthdevelopment added
gernotbelger
parents: 9133
diff changeset
277 if (!line.contains(AbstractModuleRunner.IGNORE_ERSTELLDATUM) && !line.contains(AbstractModuleRunner.IGNORE_FLYS_VERSION)
48d87af1243e Unit testing flowdepthdevelopment added
gernotbelger
parents: 9133
diff changeset
278 && !line.contains(AbstractModuleRunner.IGNORE_BEARBEITER)) {
9210
de55d9a94796 Fixed: was using java 7 features in java 6 code
gernotbelger
parents: 9148
diff changeset
279 result = result + line + lineSeparator;
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
280 }
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
281 }
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
282 return result;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
283 }
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
284
9127
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
285 public final void doGetWriteToDisk(final String mode) throws FileNotFoundException, IOException {
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
286
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
287 final String name = mode;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
288 final String type = "csv";
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
289
9127
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
290 final String fn = name + System.currentTimeMillis() + "." + type;
9031
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
291 final String enc = "windows-1252";
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
292
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
293 final String filepath = exportFileDir + fn;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
294
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
295 final Document attr = null;
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
296 final Document request = ClientProtocolUtils.newOutCollectionDocument(getCollection().identifier(), mode, type, attr);
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
297
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
298 final InputStream response = this.client.collectionOut(request, getCollection().identifier(), mode);
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
299 final InputStreamReader in = new InputStreamReader(response, "UTF-8");
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
300
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
301 IOUtils.copy(in, new FileOutputStream(filepath), enc);
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
302
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
303 }
efd2de78d158 work on unit testing
gernotbelger
parents:
diff changeset
304
9127
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
305 protected final void selectCalcMode() throws ConnectionException, ServerException {
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
306
9422
e567fac95e3d uinfo salix no scenario jUnit test
gernotbelger
parents: 9228
diff changeset
307 /* Select ICalcMode */
e567fac95e3d uinfo salix no scenario jUnit test
gernotbelger
parents: 9228
diff changeset
308 final String calcmodeStr = this.iCalcMode.toString();
9127
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
309 final Data dataCalcMode = new StringOptionsData("calculation_mode", "calculation_mode",
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
310 new DataItem[] { new DefaultDataItem(calcmodeStr, calcmodeStr, calcmodeStr) });
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
311 feedAndGo(new Data[] { dataCalcMode }, 0);
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
312 }
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
313
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
314 protected final void selectRange() throws ConnectionException, ServerException {
9424
da19f1f58d72 jUnit test uinfo salix regional
gernotbelger
parents: 9422
diff changeset
315 makeKmRange(this.from, this.to, "ld_from", "ld_to");
da19f1f58d72 jUnit test uinfo salix regional
gernotbelger
parents: 9422
diff changeset
316
da19f1f58d72 jUnit test uinfo salix regional
gernotbelger
parents: 9422
diff changeset
317 }
da19f1f58d72 jUnit test uinfo salix regional
gernotbelger
parents: 9422
diff changeset
318
da19f1f58d72 jUnit test uinfo salix regional
gernotbelger
parents: 9422
diff changeset
319 protected final void makeKmRange(final double from, final double to, final String from_key, final String to_key)
da19f1f58d72 jUnit test uinfo salix regional
gernotbelger
parents: 9422
diff changeset
320 throws ConnectionException, ServerException {
9441
e75afd693f78 Backed out changeset: e991c4cec0d0
gernotbelger
parents: 9440
diff changeset
321 feedAndGo(makeFromToData(from_key, to_key), 0);
e75afd693f78 Backed out changeset: e991c4cec0d0
gernotbelger
parents: 9440
diff changeset
322 }
e75afd693f78 Backed out changeset: e991c4cec0d0
gernotbelger
parents: 9440
diff changeset
323
e75afd693f78 Backed out changeset: e991c4cec0d0
gernotbelger
parents: 9440
diff changeset
324 protected final Data[] makeFromToData(final String from_key, final String to_key) {
e75afd693f78 Backed out changeset: e991c4cec0d0
gernotbelger
parents: 9440
diff changeset
325 final String fromStr = String.valueOf(this.from);
e75afd693f78 Backed out changeset: e991c4cec0d0
gernotbelger
parents: 9440
diff changeset
326 final String toStr = String.valueOf(this.to);
9424
da19f1f58d72 jUnit test uinfo salix regional
gernotbelger
parents: 9422
diff changeset
327 final Data dataFrom = new StringOptionsData(from_key, from_key, new DataItem[] { new DefaultDataItem(fromStr, fromStr, fromStr) });
da19f1f58d72 jUnit test uinfo salix regional
gernotbelger
parents: 9422
diff changeset
328 final Data dataTo = new StringOptionsData(to_key, to_key, new DataItem[] { new DefaultDataItem(toStr, toStr, toStr) });
9441
e75afd693f78 Backed out changeset: e991c4cec0d0
gernotbelger
parents: 9440
diff changeset
329 return new Data[] { dataFrom, dataTo };
9127
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
330 }
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
331
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
332 protected final void selectRiver() throws ConnectionException, ServerException {
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
333 final String riverStr = this.river.name();
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
334 final Data data = new StringOptionsData("river", "river", new DataItem[] { new DefaultDataItem(riverStr, riverStr, riverStr) });
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
335 feedAndGo(new Data[] { data }, 0);
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
336 }
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
337
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
338 protected final void export(final boolean exportToFile) throws IOException, ServerException {
9148
48d87af1243e Unit testing flowdepthdevelopment added
gernotbelger
parents: 9133
diff changeset
339 final OutputMode[] modes = getArtifact().getArtifactDescription().getOutputModes();
9226
83aee0942eae JUnit-Tests - tkh works
gernotbelger
parents: 9210
diff changeset
340 boolean exportFacetCreated = false;
9127
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
341 if (modes != null) {
9148
48d87af1243e Unit testing flowdepthdevelopment added
gernotbelger
parents: 9133
diff changeset
342 for (final OutputMode mode : modes) {
9226
83aee0942eae JUnit-Tests - tkh works
gernotbelger
parents: 9210
diff changeset
343 if (mode.getDescription().contains("_export")) {
9148
48d87af1243e Unit testing flowdepthdevelopment added
gernotbelger
parents: 9133
diff changeset
344 assertAndWriteToFile(mode.getName(), exportToFile);
9226
83aee0942eae JUnit-Tests - tkh works
gernotbelger
parents: 9210
diff changeset
345 exportFacetCreated = true;
83aee0942eae JUnit-Tests - tkh works
gernotbelger
parents: 9210
diff changeset
346 }
9148
48d87af1243e Unit testing flowdepthdevelopment added
gernotbelger
parents: 9133
diff changeset
347 }
9226
83aee0942eae JUnit-Tests - tkh works
gernotbelger
parents: 9210
diff changeset
348
9127
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
349 }
9226
83aee0942eae JUnit-Tests - tkh works
gernotbelger
parents: 9210
diff changeset
350 assert (exportFacetCreated == true);
9127
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
351 }
dbb26bc81843 Testing
gernotbelger
parents: 9031
diff changeset
352
9148
48d87af1243e Unit testing flowdepthdevelopment added
gernotbelger
parents: 9133
diff changeset
353 protected final String getRecommendationPairString(final SimpleRecommendation rec1, final SimpleRecommendation rec2)
48d87af1243e Unit testing flowdepthdevelopment added
gernotbelger
parents: 9133
diff changeset
354 throws ConnectionException, ServerException {
48d87af1243e Unit testing flowdepthdevelopment added
gernotbelger
parents: 9133
diff changeset
355
48d87af1243e Unit testing flowdepthdevelopment added
gernotbelger
parents: 9133
diff changeset
356 return rec1.getRecommendationPairString(rec2, getCollection(), this.serverUrl, this.locale);
48d87af1243e Unit testing flowdepthdevelopment added
gernotbelger
parents: 9133
diff changeset
357 }
9424
da19f1f58d72 jUnit test uinfo salix regional
gernotbelger
parents: 9422
diff changeset
358
9441
e75afd693f78 Backed out changeset: e991c4cec0d0
gernotbelger
parents: 9440
diff changeset
359 protected final void feedAndGoData(final Data[] data) throws ConnectionException, ServerException {
e75afd693f78 Backed out changeset: e991c4cec0d0
gernotbelger
parents: 9440
diff changeset
360 feedAndGo(data, 0);
e75afd693f78 Backed out changeset: e991c4cec0d0
gernotbelger
parents: 9440
diff changeset
361 }
e75afd693f78 Backed out changeset: e991c4cec0d0
gernotbelger
parents: 9440
diff changeset
362
e75afd693f78 Backed out changeset: e991c4cec0d0
gernotbelger
parents: 9440
diff changeset
363 protected final void feedAndGoSimpleTextInput(final String key, final String value) throws ConnectionException, ServerException {
e75afd693f78 Backed out changeset: e991c4cec0d0
gernotbelger
parents: 9440
diff changeset
364 feedAndGo(new Data[] { getSimpleTextInput(key, value) }, 0);
e75afd693f78 Backed out changeset: e991c4cec0d0
gernotbelger
parents: 9440
diff changeset
365 }
e75afd693f78 Backed out changeset: e991c4cec0d0
gernotbelger
parents: 9440
diff changeset
366
e75afd693f78 Backed out changeset: e991c4cec0d0
gernotbelger
parents: 9440
diff changeset
367 protected Data getSimpleTextInput(final String key, final String value) throws ConnectionException, ServerException {
e75afd693f78 Backed out changeset: e991c4cec0d0
gernotbelger
parents: 9440
diff changeset
368 return new StringOptionsData(key, key, new DataItem[] { new DefaultDataItem(value, value, value) });
e75afd693f78 Backed out changeset: e991c4cec0d0
gernotbelger
parents: 9440
diff changeset
369 }
e75afd693f78 Backed out changeset: e991c4cec0d0
gernotbelger
parents: 9440
diff changeset
370
e75afd693f78 Backed out changeset: e991c4cec0d0
gernotbelger
parents: 9440
diff changeset
371 protected final Data[] addItemToExistingData(final Data[] existing, final Data add) {
e75afd693f78 Backed out changeset: e991c4cec0d0
gernotbelger
parents: 9440
diff changeset
372 final Data[] data = new Data[existing.length + 1];
e75afd693f78 Backed out changeset: e991c4cec0d0
gernotbelger
parents: 9440
diff changeset
373 for (int i = 0; i < existing.length; i++) {
e75afd693f78 Backed out changeset: e991c4cec0d0
gernotbelger
parents: 9440
diff changeset
374 data[i] = existing[i];
e75afd693f78 Backed out changeset: e991c4cec0d0
gernotbelger
parents: 9440
diff changeset
375 }
e75afd693f78 Backed out changeset: e991c4cec0d0
gernotbelger
parents: 9440
diff changeset
376 data[existing.length] = add;
e75afd693f78 Backed out changeset: e991c4cec0d0
gernotbelger
parents: 9440
diff changeset
377 return data;
9424
da19f1f58d72 jUnit test uinfo salix regional
gernotbelger
parents: 9422
diff changeset
378 }
da19f1f58d72 jUnit test uinfo salix regional
gernotbelger
parents: 9422
diff changeset
379
9210
de55d9a94796 Fixed: was using java 7 features in java 6 code
gernotbelger
parents: 9148
diff changeset
380 }

http://dive4elements.wald.intevation.org