Skip to content

2.0 - chore - addCheckForTestMavenProperties #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexiudice wants to merge 1 commit into
base: 2.0
Choose a base branch
from
Open

2.0 - chore - addCheckForTestMavenProperties #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 25 additions & 6 deletions graphgrid-sdk-java-tests/src/test/java/com/graphgrid/sdk/SdkTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import java.io.IOException;
import java.util.Properties;

import com.graphgrid.sdk.core.exception.GraphGridSdkInvalidArgumentException;
import com.graphgrid.sdk.core.security.SecurityConfig;

/**
Expand All @@ -32,6 +33,8 @@ public abstract class SdkTestBase
protected String username;
protected String password;

private Properties p = new Properties();

@Before
public void setUp()
{
Expand All @@ -42,7 +45,6 @@ public void setUp()
private void loadSecurityCredentialsFromPom()
{
java.io.InputStream is = this.getClass().getClassLoader().getResourceAsStream( "test.properties" );
java.util.Properties p = new Properties();
try
{
p.load( is );
Expand All @@ -57,11 +59,28 @@ private void loadSecurityCredentialsFromPom()
return;
}

securityConfig.setClientId( p.getProperty( "client.id" ) );
securityConfig.setClientSecret( p.getProperty( "client.secret" ) );
securityConfig.setBaseSecurityUrl( p.getProperty( "baseSecurityUrl" ) );
final String clientId = getPropertyValueAndThrowErrorIfMissing( "client.id" );
final String clientSecret = getPropertyValueAndThrowErrorIfMissing( "client.secret" );
final String baseSecurityUrl = getPropertyValueAndThrowErrorIfMissing( "baseSecurityUrl" );
final String oauthUsername = getPropertyValueAndThrowErrorIfMissing( "oauth.username" );
final String oauthPassword = getPropertyValueAndThrowErrorIfMissing( "oauth.password" );

securityConfig.setClientId( clientId );
securityConfig.setClientSecret( clientSecret );
securityConfig.setBaseSecurityUrl( baseSecurityUrl );

username = oauthUsername;
password = oauthPassword;
}

username = p.getProperty( "oauth.username" );
password = p.getProperty( "oauth.password" );
private String getPropertyValueAndThrowErrorIfMissing( String propName ) throws GraphGridSdkInvalidArgumentException
{
String propValue = p.getProperty( propName );
if ( propValue == null || propValue.isEmpty() )
{
throw new GraphGridSdkInvalidArgumentException( "Property '" + propName + "' is missing or empty. " +
"Graphgrid-java-sdk tests require this property to be non-empty (set directly in the test pom or through the properties in your maven settings.xml)" );
}
return propValue;
}
}