-
Notifications
You must be signed in to change notification settings - Fork 96
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.
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
Module Test code to support module setup is correct. #122
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
fili-core/src/test/groovy/com/yahoo/bard/systemconfig/BardModuleSetupSpec.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
// Copyright 2016 Yahoo Inc. | ||
// Licensed under the terms of the Apache license. Please see LICENSE.md file distributed with this work for terms. | ||
package com.yahoo.bard.systemconfig | ||
|
||
class BardModuleSetupSpec extends ModuleSetupSpec { | ||
|
||
@Override | ||
String getModuleName() { | ||
return "fili-core" | ||
} | ||
} |
50 changes: 50 additions & 0 deletions
50
fili-core/src/test/groovy/com/yahoo/bard/systemconfig/ModuleSetupSpec.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
// Copyright 2016 Yahoo Inc. | ||
// Licensed under the terms of the Apache license. Please see LICENSE.md file distributed with this work for terms. | ||
package com.yahoo.bard.systemconfig | ||
|
||
import static com.yahoo.bard.webservice.config.ModuleLoader.MODULE_CONFIG_FILE_NAME | ||
|
||
import com.yahoo.bard.webservice.config.ConfigResourceLoader | ||
import com.yahoo.bard.webservice.config.SystemConfigProvider | ||
|
||
import org.apache.commons.configuration.Configuration | ||
|
||
import spock.lang.Specification | ||
import spock.lang.Unroll | ||
/** | ||
* An abstract base TCK test for modules. | ||
* Usage: Subclass this spec, in test/groovy/ packages, implementing getModuleName() with your module's name. | ||
*/ | ||
abstract class ModuleSetupSpec extends Specification { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Description of what this base spec is for and how to use it would be good. |
||
|
||
public static final String MODULE_NAME_KEY = "moduleName" | ||
|
||
/** | ||
* Implement this test by supplying a subclass that provides the name of the module | ||
* | ||
* @return The name of the module as configured in moduleConfig.properties | ||
*/ | ||
abstract String getModuleName() | ||
|
||
@Unroll | ||
def "#moduleName does not break SystemConfig"() { | ||
expect: | ||
SystemConfigProvider.instance.runtimeProperties.getOrDefault("Does getting a property throw an exception?", "foo") == "foo" | ||
|
||
where: | ||
moduleName << [getModuleName()] | ||
} | ||
|
||
@Unroll | ||
def "ConfigResourceLoader discovers #moduleName"() { | ||
setup: | ||
List<Configuration> configurations = new ConfigResourceLoader().loadConfigurations(MODULE_CONFIG_FILE_NAME) | ||
|
||
expect: | ||
configurations.stream().map( {it.getString(MODULE_NAME_KEY)}).anyMatch({it.equals(getModuleName())}) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. spacing inside the calls is a little inconsistent. |
||
|
||
where: | ||
moduleName << [getModuleName()] | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Needs
@Override