Skip to content

Commit

Permalink
deegree#963 - cleaned up deegree-workspace-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@lgoltz
lgoltz committed Aug 12, 2021
1 parent 6309cc9 commit f394a5e
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 278 deletions.
25 changes: 6 additions & 19 deletions ...est/java/org/deegree/maven/ServiceIT.java → ...t/java/org/deegree/maven/WorkpacesIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,21 +69,15 @@ Occam Labs UG (haftungsbeschränkt)
* @version $Revision$, $Date$
*/
@RunWith(Parameterized.class)
public class ServiceIT {
public class WorkpacesIT {

private static final Logger LOG = getLogger( ServiceIT.class );
private static final Logger LOG = getLogger( WorkpacesIT.class );

private final Path workspaceUnderTest;

private boolean testCapabilities = true;

private boolean testLayers = true;

private boolean testRequests = true;

private static final TestEnvironment env = new TestEnvironment( System.getProperties() );

public ServiceIT( Path workspaceUnderTest ) {
public WorkpacesIT( Path workspaceUnderTest ) {
this.workspaceUnderTest = workspaceUnderTest;
}

Expand Down Expand Up @@ -130,9 +124,6 @@ public void execute()
for ( Path service : serviceList ) {
testService( helper, service );
}
if ( testRequests ) {
helper.testRequests();
}
}
} catch ( NoClassDefFoundError e ) {
LOG.warn( "Class not found, not performing any tests." );
Expand All @@ -144,13 +135,9 @@ private void testService( ServiceIntegrationTestHelper helper, Path service )
String serviceName = service.getFileName().toString().toLowerCase();
String serviceType = serviceName.substring( 0, 3 ).toUpperCase();
LOG.info( "Service name: {}, service type: {}", serviceName, serviceType );
if ( testCapabilities ) {
helper.testCapabilities( serviceType );
}
if ( testLayers ) {
helper.testLayers( serviceType );
LOG.info( "All maps can be requested." );
}
helper.testCapabilities( serviceType );
helper.testLayers( serviceType );
LOG.info( "All maps can be requested." );
}

private boolean isService( Path f ) {
Expand Down
145 changes: 0 additions & 145 deletions deegree-tests/deegree-workspace-tests/src/test/java/org/deegree/maven/WorkspaceIT.java
View file

This file was deleted.

107 changes: 2 additions & 105 deletions ...orkspace-tests/src/test/java/org/deegree/maven/ithelper/ServiceIntegrationTestHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
package org.deegree.maven.ithelper;

import org.apache.commons.io.IOUtils;
import org.apache.commons.io.filefilter.SuffixFileFilter;
import org.deegree.cs.CRSUtils;
import org.deegree.cs.persistence.CRSManager;
import org.deegree.geometry.Envelope;
Expand All @@ -48,30 +47,21 @@
import javax.imageio.ImageIO;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import java.io.File;
import java.io.FileFilter;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.StringReader;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.List;

import static java.util.Collections.singletonList;
import static org.apache.commons.io.FileUtils.readFileToString;
import static org.apache.commons.io.IOUtils.closeQuietly;
import static org.apache.commons.io.IOUtils.toByteArray;
import static org.deegree.commons.utils.net.HttpUtils.STREAM;
import static org.deegree.commons.utils.net.HttpUtils.post;
import static org.deegree.protocol.wms.WMSConstants.WMSRequestType.GetMap;
import static org.slf4j.LoggerFactory.getLogger;

/**
*
*
* @author <a href="mailto:schmitz@lat-lon.de">Andreas Schmitz</a>
* @author last edited by: $Author$
*
*
* @version $Revision$, $Date$
*/
public class ServiceIntegrationTestHelper {
Expand Down Expand Up @@ -156,97 +146,4 @@ public void testLayers( String service )
}
}

public static double determineSimilarity( String name, InputStream in1, InputStream in2 )
throws IOException, Exception {
try {
byte[] buf1 = toByteArray( in1 );
byte[] buf2 = toByteArray( in2 );
long equal = 0;
for ( int i = 0; i < buf1.length; ++i ) {
if ( i < buf2.length && buf1[i] == buf2[i] ) {
++equal;
}
}
double sim = (double) equal / (double) buf1.length;
if ( sim < 0.99 ) {
throw new Exception( "Request test " + name + " resulted in a similarity of only " + sim
+ "!" );
}
return sim;
} finally {
closeQuietly( in1 );
closeQuietly( in2 );
}
}

public void testRequests()
throws Exception {
String address = createBaseURL() + "services";

File reqDir = new File( environment.getBasedir(), "src/test/requests" );
LOG.info( "---- Searching main requests directory for requests." );
testRequestDirectories( address, reqDir );
}

public void testRequestDirectories( String address, File dir )
throws Exception {
testRequestDirectory( address, dir );
File[] listed = dir.listFiles();
if ( listed != null ) {
for ( File f : listed ) {
if ( f.isDirectory() && !f.getName().equalsIgnoreCase( ".svn" ) ) {
LOG.info( "---- Searching request class " + f.getName() + " for requests." );
testRequestDirectories( address, f );
}
}
}
}

public void testRequestDirectory( String address, File dir )
throws Exception {
File[] listed = dir.listFiles( (FileFilter) new SuffixFileFilter( "kvp" ) );
if ( listed != null ) {
for ( File f : listed ) {
String name = f.getName();
name = name.substring( 0, name.length() - 4 );
LOG.info( "KVP request testing " + name );
try {
String req = readFileToString( f ).trim();
InputStream in1 = new URL( address + ( req.startsWith( "?" ) ? "" : "?" ) + req ).openStream();
File response = new File( f.getParentFile(), name + ".response" );
InputStream in2 = new FileInputStream( response );
double sim = determineSimilarity( name, in1, in2 );
if ( sim != 1 ) {
LOG.info( "Request test " + name + " resulted in similarity of " + sim );
}
} catch ( IOException e ) {
throw new Exception( "KVP request checking of " + name + " failed: "
+ e.getLocalizedMessage(), e );
}
}
}
listed = dir.listFiles( (FileFilter) new SuffixFileFilter( "xml" ) );
if ( listed != null ) {
for ( File f : listed ) {
String name = f.getName();
name = name.substring( 0, name.length() - 4 );
LOG.info( "XML request testing " + name );
FileInputStream reqIn = null;
try {
reqIn = new FileInputStream( f );
InputStream in1 = post( STREAM, address, reqIn, null );
File response = new File( f.getParentFile(), name + ".response" );
InputStream in2 = new FileInputStream( response );
double sim = determineSimilarity( name, in1, in2 );
LOG.info( "Request test " + name + " resulted in similarity of " + sim );
} catch ( IOException e ) {
throw new Exception( "KVP request checking of " + name + " failed: "
+ e.getLocalizedMessage(), e );
} finally {
closeQuietly( reqIn );
}
}
}
}

}
11 changes: 2 additions & 9 deletions ...sts/deegree-workspace-tests/src/test/java/org/deegree/maven/ithelper/TestEnvironment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,18 @@ Occam Labs UG (haftungsbeschränkt)

package org.deegree.maven.ithelper;

import org.deegree.cs.persistence.CRSManager;

import java.util.Properties;

public class TestEnvironment {

private Properties properties;

public TestEnvironment(Properties properties) {
public TestEnvironment( Properties properties ) {
this.properties = properties;
}

public String getPort() {
String port = properties.getProperty( "portnumber" , "8080");
String port = properties.getProperty( "portnumber", "8080" );
return port;
}

Expand All @@ -62,11 +60,6 @@ public String getContext() {
return context;
}

public String getBasedir() {
String basedir = properties.getProperty( "basedir" );
return basedir;
}

public String getWorkspaceDir() {
return properties.getProperty( "workspaceDir" );
}
Expand Down

0 comments on commit f394a5e

Please sign in to comment.