From 0397c0e1f8e8289f58bdfd477afdfad3ce393a44 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Fri, 10 Feb 2017 17:40:28 +0000 Subject: [PATCH] git-svn-id: http://svn.research-infrastructures.eu/d4science/gcube/trunk/spatial-data/geonetwork@142472 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../data/geonetwork/test/ScopeTests.java | 32 +++++++++---------- .../geonetwork/test/TestConfiguration.java | 24 +++++++------- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/src/test/java/org/gcube/spatial/data/geonetwork/test/ScopeTests.java b/src/test/java/org/gcube/spatial/data/geonetwork/test/ScopeTests.java index 57e91e7..ddfb21b 100644 --- a/src/test/java/org/gcube/spatial/data/geonetwork/test/ScopeTests.java +++ b/src/test/java/org/gcube/spatial/data/geonetwork/test/ScopeTests.java @@ -33,22 +33,22 @@ public class ScopeTests { // DEV scopes.add("/gcube"); - scopes.add("/gcube/devNext"); - scopes.add("/gcube/devsec"); - - scopes.add("/gcube/devNext/NextNext"); - - scopes.add("/gcube/devsec/StaTabTest"); - - - scopes.add("/gcube/devsec/RMinerDev"); - - - - scopes.add("/gcube/devsec/TabProcessing"); - - scopes.add("/gcube/devsec/devVRE"); - +// scopes.add("/gcube/devNext"); +// scopes.add("/gcube/devsec"); +// +// scopes.add("/gcube/devNext/NextNext"); +// +// scopes.add("/gcube/devsec/StaTabTest"); +// +// +// scopes.add("/gcube/devsec/RMinerDev"); +// +// +// +// scopes.add("/gcube/devsec/TabProcessing"); +// +// scopes.add("/gcube/devsec/devVRE"); +// // scopes.add("/gcube/preprod/preVRE"); diff --git a/src/test/java/org/gcube/spatial/data/geonetwork/test/TestConfiguration.java b/src/test/java/org/gcube/spatial/data/geonetwork/test/TestConfiguration.java index fa9ee2c..887f75b 100644 --- a/src/test/java/org/gcube/spatial/data/geonetwork/test/TestConfiguration.java +++ b/src/test/java/org/gcube/spatial/data/geonetwork/test/TestConfiguration.java @@ -4,8 +4,6 @@ import org.gcube.spatial.data.geonetwork.GeoNetwork; import org.gcube.spatial.data.geonetwork.GeoNetworkAdministration; import org.gcube.spatial.data.geonetwork.configuration.Configuration; import org.gcube.spatial.data.geonetwork.configuration.DefaultConfiguration; -import org.gcube.spatial.data.geonetwork.configuration.LocalResourceConfiguration; -import org.gcube.spatial.data.geonetwork.configuration.LocalResourceConfiguration.ResourceConfiguration; import org.gcube.spatial.data.geonetwork.model.faults.AuthorizationException; import org.gcube.spatial.data.geonetwork.model.faults.EncryptionException; import org.gcube.spatial.data.geonetwork.model.faults.MissingConfigurationException; @@ -22,19 +20,19 @@ public class TestConfiguration { @Synchronized public static GeoNetworkAdministration getClient() throws MissingConfigurationException, EncryptionException, MissingServiceEndpointException, GNLibException, GNServerException, AuthorizationException{ if(toUseConfiguration==null){ - - ResourceConfiguration resConfig=new ResourceConfiguration(); - resConfig.setAdminPassword("admin"); - resConfig.setVersion((short)3); - resConfig.setMinor((short)0); - resConfig.setRevision((short)5); - resConfig.setBuild((short)0); - resConfig.setHost("node3-d-d4s.d4science.org"); - resConfig.setEndpoint("http://node3-d-d4s.d4science.org/geonetwork"); - toUseConfiguration=new LocalResourceConfiguration(resConfig); +// +// ResourceConfiguration resConfig=new ResourceConfiguration(); +// resConfig.setAdminPassword("admin"); +// resConfig.setVersion((short)3); +// resConfig.setMinor((short)0); +// resConfig.setRevision((short)5); +// resConfig.setBuild((short)0); +// resConfig.setHost("node3-d-d4s.d4science.org"); +// resConfig.setEndpoint("http://node3-d-d4s.d4science.org/geonetwork"); +// toUseConfiguration=new LocalResourceConfiguration(resConfig); -// toUseConfiguration=new DefaultConfiguration(); + toUseConfiguration=new DefaultConfiguration(); } return GeoNetwork.get(toUseConfiguration); }