diff --git a/.classpath b/.classpath deleted file mode 100644 index 115baaf13..000000000 --- a/.classpath +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Makefile b/Makefile deleted file mode 100644 index 17db74f06..000000000 --- a/Makefile +++ /dev/null @@ -1,132 +0,0 @@ -#port is now set in deploy.cfg -SERVICE = workspace -SERVICE_CAPS = Workspace -CLIENT_JAR = WorkspaceClient.jar -WAR = WorkspaceService.war -URL = https://kbase.us/services/ws/ - -#End of user defined variables -TARGET ?= /kb/deployment - -GITCOMMIT := $(shell git rev-parse --short HEAD) -#TODO use --points-at when git 1.7.10 available -TAGS := $(shell git tag --contains $(GITCOMMIT)) - -DEPLOY_RUNTIME ?= /kb/runtime -JAVA_HOME ?= $(DEPLOY_RUNTIME)/java -SERVICE_DIR ?= $(TARGET)/services/$(SERVICE) -GLASSFISH_HOME ?= $(DEPLOY_RUNTIME)/glassfish3 -SERVICE_USER ?= kbase - -ASADMIN = $(GLASSFISH_HOME)/glassfish/bin/asadmin - -ANT = ant - -# make sure our make test works -.PHONY : test - -default: build-libs build-docs - -build-libs: - @#TODO at some point make dependent on compile - checked in for now. - $(ANT) compile - -build-docs: - -rm -r docs - $(ANT) javadoc - pod2html --infile=lib/Bio/KBase/$(SERVICE)/Client.pm --outfile=docs/$(SERVICE)_perl.html - rm -f pod2htm?.tmp - sphinx-build docsource/ docs - cp $(SERVICE).spec docs/. - cp docshtml/* docs/. - -docker_deps: build-libs build-docs - $(ANT) buildwar - # cp server_scripts/glassfish_administer_service.py deployment/bin - # chmod 755 deployment/bin/glassfish_administer_service.py - mkdir -p deployment/services/workspace/ - cp dist/$(WAR) deployment/services/workspace/ - -compile: compile-typespec compile-typespec-java compile-html - -compile-html: - kb-sdk compile --html --out docshtml $(SERVICE).spec - -compile-typespec-java: - kb-sdk compile --java --javasrc src --javasrv --out . \ - --url $(URL) $(SERVICE).spec - -compile-typespec: - kb-sdk compile \ - --out lib \ - --jsclname javascript/$(SERVICE)/Client \ - --plclname Bio::KBase::$(SERVICE)::Client \ - --pyclname biokbase.$(SERVICE).client \ - --url $(URL) \ - $(SERVICE).spec - rm lib/biokbase/workspace/authclient.py - -test: test-service - -test-service: - $(ANT) test - -test-quick: - $(ANT) test_quick - -deploy: deploy-client deploy-service - -deploy-client: deploy-client-libs deploy-docs - -deploy-client-libs: - mkdir -p $(TARGET)/lib/ - cp dist/client/$(CLIENT_JAR) $(TARGET)/lib/ - cp -rv lib/* $(TARGET)/lib/ - echo $(GITCOMMIT) > $(TARGET)/lib/$(SERVICE).clientdist - echo $(TAGS) >> $(TARGET)/lib/$(SERVICE).clientdist - -deploy-docs: - mkdir -p $(SERVICE_DIR)/webroot - cp -r docs/* $(SERVICE_DIR)/webroot/. - -deploy-service: deploy-service-libs deploy-service-scripts - -deploy-service-libs: - $(ANT) buildwar - mkdir -p $(SERVICE_DIR) - cp dist/$(WAR) $(SERVICE_DIR) - echo $(GITCOMMIT) > $(SERVICE_DIR)/$(SERVICE).serverdist - echo $(TAGS) >> $(SERVICE_DIR)/$(SERVICE).serverdist - -deploy-service-scripts: - cp server_scripts/glassfish_administer_service.py $(SERVICE_DIR) - server_scripts/build_server_control_scripts.py $(SERVICE_DIR) $(WAR)\ - $(TARGET) $(JAVA_HOME) deploy.cfg $(ASADMIN) $(SERVICE_CAPS) - -deploy-upstart: - echo "# $(SERVICE) service" > /etc/init/$(SERVICE).conf - echo "# NOTE: stop $(SERVICE) does not work" >> /etc/init/$(SERVICE).conf - echo "# Use the standard stop_service script as the $(SERVICE_USER) user" >> /etc/init/$(SERVICE).conf - echo "#" >> /etc/init/$(SERVICE).conf - echo "# Make sure to set up the $(SERVICE_USER) user account" >> /etc/init/$(SERVICE).conf - echo "# shell> groupadd kbase" >> /etc/init/$(SERVICE).conf - echo "# shell> useradd -r -g $(SERVICE_USER) $(SERVICE_USER)" >> /etc/init/$(SERVICE).conf - echo "#" >> /etc/init/$(SERVICE).conf - echo "start on runlevel [23] and started shock" >> /etc/init/$(SERVICE).conf - echo "stop on runlevel [!23]" >> /etc/init/$(SERVICE).conf - echo "pre-start exec chown -R $(SERVICE_USER) $(TARGET)/services/$(SERVICE)" >> /etc/init/$(SERVICE).conf - echo "exec su kbase -c '$(TARGET)/services/$(SERVICE)/start_service'" >> /etc/init/$(SERVICE).conf - -undeploy: - -rm -rf $(SERVICE_DIR) - -rm -rfv $(TARGET)/lib/Bio/KBase/$(SERVICE) - -rm -rfv $(TARGET)/lib/biokbase/$(SERVICE) - -rm -rfv $(TARGET)/lib/javascript/$(SERVICE) - -rm -rfv $(TARGET)/lib/$(CLIENT_JAR) - -clean: - $(ANT) clean - -rm -rf docs - -rm -rf bin - -rm -rf deployment/services/workspace/* - @#TODO remove lib once files are generated on the fly diff --git a/build.gradle b/build.gradle index fd96d5f78..784872c32 100644 --- a/build.gradle +++ b/build.gradle @@ -30,8 +30,6 @@ var IN_JAR_JAVA_DOC_DIR = "$IN_JAR_DOC_DIR/javadoc" var LOC_WS_SPEC = "$rootDir/workspace.spec" var LOC_DOC_HTML = "$rootDir/docshtml" -// TODO NOW delete build.xml and Makefile - commit 8 -// TODO NOW run tests from Eclipse w/o specifying classpath manually & remove sourceSets & claspath - commit 9 // TODO NOW update any ant refs in docs to gradle & the update schema script build & location repositories { @@ -239,10 +237,10 @@ task sdkCompileLibs { } task sdkCompileJava { - // TODO GRADLE is there a variable for src/main/java when we move the code locations? + // TODO GRADLE is there a variable for src/main/java? var cmd = "kb-sdk compile " + "--java " + - "--javasrc $rootDir/src " + + "--javasrc $rootDir/src/main/java/ " + "--javasrv " + "--out . " + "--url $DEFAULT_URL " + @@ -282,36 +280,6 @@ java -cp $buildDir/classes/java/main:\$CLASSPATH us.kbase.workspace.kbase.Schema } } -// Custom java project layout -sourceSets { - main { - java { - srcDirs = ["src"] - exclude '**/test/**' - } - } - test { - java { - srcDirs = ["src"] - include '**/test/**' - } - resources { - srcDirs = ["src"] - include "**/*.properties" - include '**/*.spec' - include '**/*instance.*' - include '**/*.instance*' - include '**/*.html' - include '**/*.css' - include '**/*.gif' - include '**/*.js' - include '**/*.png' - include '**/*.txt' - include '**/*.weirdsuffix' - } - } -} - configurations { // can't directly access testImplementation, so extend and access testimpl.extendsFrom testImplementation diff --git a/build.xml b/build.xml deleted file mode 100644 index 5b3af13f7..000000000 --- a/build.xml +++ /dev/null @@ -1,355 +0,0 @@ - - - - Build file for the Workspace Service - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #!/bin/sh -java -cp ${dist}/${jar.file}:${lib.classpath} us.kbase.workspace.kbase.SchemaUpdaterCLI $@ - - - - - - - - - - - diff --git a/src/us/kbase/common/service/ServiceChecker.java b/src/main/java/us/kbase/common/service/ServiceChecker.java similarity index 100% rename from src/us/kbase/common/service/ServiceChecker.java rename to src/main/java/us/kbase/common/service/ServiceChecker.java diff --git a/src/us/kbase/common/service/Tuple11.java b/src/main/java/us/kbase/common/service/Tuple11.java similarity index 100% rename from src/us/kbase/common/service/Tuple11.java rename to src/main/java/us/kbase/common/service/Tuple11.java diff --git a/src/us/kbase/common/service/Tuple12.java b/src/main/java/us/kbase/common/service/Tuple12.java similarity index 100% rename from src/us/kbase/common/service/Tuple12.java rename to src/main/java/us/kbase/common/service/Tuple12.java diff --git a/src/us/kbase/common/service/Tuple7.java b/src/main/java/us/kbase/common/service/Tuple7.java similarity index 100% rename from src/us/kbase/common/service/Tuple7.java rename to src/main/java/us/kbase/common/service/Tuple7.java diff --git a/src/us/kbase/common/service/Tuple9.java b/src/main/java/us/kbase/common/service/Tuple9.java similarity index 100% rename from src/us/kbase/common/service/Tuple9.java rename to src/main/java/us/kbase/common/service/Tuple9.java diff --git a/src/us/kbase/common/utils/Counter.java b/src/main/java/us/kbase/common/utils/Counter.java similarity index 100% rename from src/us/kbase/common/utils/Counter.java rename to src/main/java/us/kbase/common/utils/Counter.java diff --git a/src/us/kbase/common/utils/SizeUtils.java b/src/main/java/us/kbase/common/utils/SizeUtils.java similarity index 100% rename from src/us/kbase/common/utils/SizeUtils.java rename to src/main/java/us/kbase/common/utils/SizeUtils.java diff --git a/src/us/kbase/typedobj/core/AbsoluteTypeDefId.java b/src/main/java/us/kbase/typedobj/core/AbsoluteTypeDefId.java similarity index 100% rename from src/us/kbase/typedobj/core/AbsoluteTypeDefId.java rename to src/main/java/us/kbase/typedobj/core/AbsoluteTypeDefId.java diff --git a/src/us/kbase/typedobj/core/ExtractedMetadata.java b/src/main/java/us/kbase/typedobj/core/ExtractedMetadata.java similarity index 100% rename from src/us/kbase/typedobj/core/ExtractedMetadata.java rename to src/main/java/us/kbase/typedobj/core/ExtractedMetadata.java diff --git a/src/us/kbase/typedobj/core/IdRefTokenSequenceProvider.java b/src/main/java/us/kbase/typedobj/core/IdRefTokenSequenceProvider.java similarity index 100% rename from src/us/kbase/typedobj/core/IdRefTokenSequenceProvider.java rename to src/main/java/us/kbase/typedobj/core/IdRefTokenSequenceProvider.java diff --git a/src/us/kbase/typedobj/core/JsonDocumentLocation.java b/src/main/java/us/kbase/typedobj/core/JsonDocumentLocation.java similarity index 100% rename from src/us/kbase/typedobj/core/JsonDocumentLocation.java rename to src/main/java/us/kbase/typedobj/core/JsonDocumentLocation.java diff --git a/src/us/kbase/typedobj/core/JsonPointerParseException.java b/src/main/java/us/kbase/typedobj/core/JsonPointerParseException.java similarity index 100% rename from src/us/kbase/typedobj/core/JsonPointerParseException.java rename to src/main/java/us/kbase/typedobj/core/JsonPointerParseException.java diff --git a/src/us/kbase/typedobj/core/JsonTokenStreamWriter.java b/src/main/java/us/kbase/typedobj/core/JsonTokenStreamWriter.java similarity index 100% rename from src/us/kbase/typedobj/core/JsonTokenStreamWriter.java rename to src/main/java/us/kbase/typedobj/core/JsonTokenStreamWriter.java diff --git a/src/us/kbase/typedobj/core/JsonTokenValidationException.java b/src/main/java/us/kbase/typedobj/core/JsonTokenValidationException.java similarity index 100% rename from src/us/kbase/typedobj/core/JsonTokenValidationException.java rename to src/main/java/us/kbase/typedobj/core/JsonTokenValidationException.java diff --git a/src/us/kbase/typedobj/core/JsonTokenValidationListener.java b/src/main/java/us/kbase/typedobj/core/JsonTokenValidationListener.java similarity index 100% rename from src/us/kbase/typedobj/core/JsonTokenValidationListener.java rename to src/main/java/us/kbase/typedobj/core/JsonTokenValidationListener.java diff --git a/src/us/kbase/typedobj/core/JsonTokenValidationSchema.java b/src/main/java/us/kbase/typedobj/core/JsonTokenValidationSchema.java similarity index 100% rename from src/us/kbase/typedobj/core/JsonTokenValidationSchema.java rename to src/main/java/us/kbase/typedobj/core/JsonTokenValidationSchema.java diff --git a/src/us/kbase/typedobj/core/LocalTypeProvider.java b/src/main/java/us/kbase/typedobj/core/LocalTypeProvider.java similarity index 100% rename from src/us/kbase/typedobj/core/LocalTypeProvider.java rename to src/main/java/us/kbase/typedobj/core/LocalTypeProvider.java diff --git a/src/us/kbase/typedobj/core/MD5.java b/src/main/java/us/kbase/typedobj/core/MD5.java similarity index 100% rename from src/us/kbase/typedobj/core/MD5.java rename to src/main/java/us/kbase/typedobj/core/MD5.java diff --git a/src/us/kbase/typedobj/core/MetadataExtractionHandler.java b/src/main/java/us/kbase/typedobj/core/MetadataExtractionHandler.java similarity index 100% rename from src/us/kbase/typedobj/core/MetadataExtractionHandler.java rename to src/main/java/us/kbase/typedobj/core/MetadataExtractionHandler.java diff --git a/src/us/kbase/typedobj/core/MetadataExtractor.java b/src/main/java/us/kbase/typedobj/core/MetadataExtractor.java similarity index 100% rename from src/us/kbase/typedobj/core/MetadataExtractor.java rename to src/main/java/us/kbase/typedobj/core/MetadataExtractor.java diff --git a/src/us/kbase/typedobj/core/MetadataNode.java b/src/main/java/us/kbase/typedobj/core/MetadataNode.java similarity index 100% rename from src/us/kbase/typedobj/core/MetadataNode.java rename to src/main/java/us/kbase/typedobj/core/MetadataNode.java diff --git a/src/us/kbase/typedobj/core/NullJsonGenerator.java b/src/main/java/us/kbase/typedobj/core/NullJsonGenerator.java similarity index 100% rename from src/us/kbase/typedobj/core/NullJsonGenerator.java rename to src/main/java/us/kbase/typedobj/core/NullJsonGenerator.java diff --git a/src/us/kbase/typedobj/core/Restreamable.java b/src/main/java/us/kbase/typedobj/core/Restreamable.java similarity index 100% rename from src/us/kbase/typedobj/core/Restreamable.java rename to src/main/java/us/kbase/typedobj/core/Restreamable.java diff --git a/src/us/kbase/typedobj/core/SubdataExtractionNode.java b/src/main/java/us/kbase/typedobj/core/SubdataExtractionNode.java similarity index 100% rename from src/us/kbase/typedobj/core/SubdataExtractionNode.java rename to src/main/java/us/kbase/typedobj/core/SubdataExtractionNode.java diff --git a/src/us/kbase/typedobj/core/SubdataExtractor.java b/src/main/java/us/kbase/typedobj/core/SubdataExtractor.java similarity index 100% rename from src/us/kbase/typedobj/core/SubdataExtractor.java rename to src/main/java/us/kbase/typedobj/core/SubdataExtractor.java diff --git a/src/us/kbase/typedobj/core/SubsetSelection.java b/src/main/java/us/kbase/typedobj/core/SubsetSelection.java similarity index 100% rename from src/us/kbase/typedobj/core/SubsetSelection.java rename to src/main/java/us/kbase/typedobj/core/SubsetSelection.java diff --git a/src/us/kbase/typedobj/core/TempFileListener.java b/src/main/java/us/kbase/typedobj/core/TempFileListener.java similarity index 100% rename from src/us/kbase/typedobj/core/TempFileListener.java rename to src/main/java/us/kbase/typedobj/core/TempFileListener.java diff --git a/src/us/kbase/typedobj/core/TempFilesManager.java b/src/main/java/us/kbase/typedobj/core/TempFilesManager.java similarity index 100% rename from src/us/kbase/typedobj/core/TempFilesManager.java rename to src/main/java/us/kbase/typedobj/core/TempFilesManager.java diff --git a/src/us/kbase/typedobj/core/TokenSequenceProvider.java b/src/main/java/us/kbase/typedobj/core/TokenSequenceProvider.java similarity index 100% rename from src/us/kbase/typedobj/core/TokenSequenceProvider.java rename to src/main/java/us/kbase/typedobj/core/TokenSequenceProvider.java diff --git a/src/us/kbase/typedobj/core/TypeDefId.java b/src/main/java/us/kbase/typedobj/core/TypeDefId.java similarity index 100% rename from src/us/kbase/typedobj/core/TypeDefId.java rename to src/main/java/us/kbase/typedobj/core/TypeDefId.java diff --git a/src/us/kbase/typedobj/core/TypeDefName.java b/src/main/java/us/kbase/typedobj/core/TypeDefName.java similarity index 100% rename from src/us/kbase/typedobj/core/TypeDefName.java rename to src/main/java/us/kbase/typedobj/core/TypeDefName.java diff --git a/src/us/kbase/typedobj/core/TypeProvider.java b/src/main/java/us/kbase/typedobj/core/TypeProvider.java similarity index 100% rename from src/us/kbase/typedobj/core/TypeProvider.java rename to src/main/java/us/kbase/typedobj/core/TypeProvider.java diff --git a/src/us/kbase/typedobj/core/TypedObjectValidator.java b/src/main/java/us/kbase/typedobj/core/TypedObjectValidator.java similarity index 100% rename from src/us/kbase/typedobj/core/TypedObjectValidator.java rename to src/main/java/us/kbase/typedobj/core/TypedObjectValidator.java diff --git a/src/us/kbase/typedobj/core/ValidatedTypedObject.java b/src/main/java/us/kbase/typedobj/core/ValidatedTypedObject.java similarity index 100% rename from src/us/kbase/typedobj/core/ValidatedTypedObject.java rename to src/main/java/us/kbase/typedobj/core/ValidatedTypedObject.java diff --git a/src/us/kbase/typedobj/db/FileTypeStorage.java b/src/main/java/us/kbase/typedobj/db/FileTypeStorage.java similarity index 100% rename from src/us/kbase/typedobj/db/FileTypeStorage.java rename to src/main/java/us/kbase/typedobj/db/FileTypeStorage.java diff --git a/src/us/kbase/typedobj/db/FuncDetailedInfo.java b/src/main/java/us/kbase/typedobj/db/FuncDetailedInfo.java similarity index 100% rename from src/us/kbase/typedobj/db/FuncDetailedInfo.java rename to src/main/java/us/kbase/typedobj/db/FuncDetailedInfo.java diff --git a/src/us/kbase/typedobj/db/FuncInfo.java b/src/main/java/us/kbase/typedobj/db/FuncInfo.java similarity index 100% rename from src/us/kbase/typedobj/db/FuncInfo.java rename to src/main/java/us/kbase/typedobj/db/FuncInfo.java diff --git a/src/us/kbase/typedobj/db/KidlUtil.java b/src/main/java/us/kbase/typedobj/db/KidlUtil.java similarity index 100% rename from src/us/kbase/typedobj/db/KidlUtil.java rename to src/main/java/us/kbase/typedobj/db/KidlUtil.java diff --git a/src/us/kbase/typedobj/db/ModuleDefId.java b/src/main/java/us/kbase/typedobj/db/ModuleDefId.java similarity index 100% rename from src/us/kbase/typedobj/db/ModuleDefId.java rename to src/main/java/us/kbase/typedobj/db/ModuleDefId.java diff --git a/src/us/kbase/typedobj/db/ModuleInfo.java b/src/main/java/us/kbase/typedobj/db/ModuleInfo.java similarity index 100% rename from src/us/kbase/typedobj/db/ModuleInfo.java rename to src/main/java/us/kbase/typedobj/db/ModuleInfo.java diff --git a/src/us/kbase/typedobj/db/MongoTypeStorage.java b/src/main/java/us/kbase/typedobj/db/MongoTypeStorage.java similarity index 100% rename from src/us/kbase/typedobj/db/MongoTypeStorage.java rename to src/main/java/us/kbase/typedobj/db/MongoTypeStorage.java diff --git a/src/us/kbase/typedobj/db/OwnerInfo.java b/src/main/java/us/kbase/typedobj/db/OwnerInfo.java similarity index 100% rename from src/us/kbase/typedobj/db/OwnerInfo.java rename to src/main/java/us/kbase/typedobj/db/OwnerInfo.java diff --git a/src/us/kbase/typedobj/db/RefInfo.java b/src/main/java/us/kbase/typedobj/db/RefInfo.java similarity index 100% rename from src/us/kbase/typedobj/db/RefInfo.java rename to src/main/java/us/kbase/typedobj/db/RefInfo.java diff --git a/src/us/kbase/typedobj/db/SemanticVersion.java b/src/main/java/us/kbase/typedobj/db/SemanticVersion.java similarity index 100% rename from src/us/kbase/typedobj/db/SemanticVersion.java rename to src/main/java/us/kbase/typedobj/db/SemanticVersion.java diff --git a/src/us/kbase/typedobj/db/TypeChange.java b/src/main/java/us/kbase/typedobj/db/TypeChange.java similarity index 100% rename from src/us/kbase/typedobj/db/TypeChange.java rename to src/main/java/us/kbase/typedobj/db/TypeChange.java diff --git a/src/us/kbase/typedobj/db/TypeDefinitionDB.java b/src/main/java/us/kbase/typedobj/db/TypeDefinitionDB.java similarity index 100% rename from src/us/kbase/typedobj/db/TypeDefinitionDB.java rename to src/main/java/us/kbase/typedobj/db/TypeDefinitionDB.java diff --git a/src/us/kbase/typedobj/db/TypeDetailedInfo.java b/src/main/java/us/kbase/typedobj/db/TypeDetailedInfo.java similarity index 100% rename from src/us/kbase/typedobj/db/TypeDetailedInfo.java rename to src/main/java/us/kbase/typedobj/db/TypeDetailedInfo.java diff --git a/src/us/kbase/typedobj/db/TypeInfo.java b/src/main/java/us/kbase/typedobj/db/TypeInfo.java similarity index 100% rename from src/us/kbase/typedobj/db/TypeInfo.java rename to src/main/java/us/kbase/typedobj/db/TypeInfo.java diff --git a/src/us/kbase/typedobj/db/TypeStorage.java b/src/main/java/us/kbase/typedobj/db/TypeStorage.java similarity index 100% rename from src/us/kbase/typedobj/db/TypeStorage.java rename to src/main/java/us/kbase/typedobj/db/TypeStorage.java diff --git a/src/us/kbase/typedobj/exceptions/ExceededMaxMetadataSizeException.java b/src/main/java/us/kbase/typedobj/exceptions/ExceededMaxMetadataSizeException.java similarity index 100% rename from src/us/kbase/typedobj/exceptions/ExceededMaxMetadataSizeException.java rename to src/main/java/us/kbase/typedobj/exceptions/ExceededMaxMetadataSizeException.java diff --git a/src/us/kbase/typedobj/exceptions/ExceededMaxSubsetSizeException.java b/src/main/java/us/kbase/typedobj/exceptions/ExceededMaxSubsetSizeException.java similarity index 100% rename from src/us/kbase/typedobj/exceptions/ExceededMaxSubsetSizeException.java rename to src/main/java/us/kbase/typedobj/exceptions/ExceededMaxSubsetSizeException.java diff --git a/src/us/kbase/typedobj/exceptions/NoSuchFuncException.java b/src/main/java/us/kbase/typedobj/exceptions/NoSuchFuncException.java similarity index 100% rename from src/us/kbase/typedobj/exceptions/NoSuchFuncException.java rename to src/main/java/us/kbase/typedobj/exceptions/NoSuchFuncException.java diff --git a/src/us/kbase/typedobj/exceptions/NoSuchModuleException.java b/src/main/java/us/kbase/typedobj/exceptions/NoSuchModuleException.java similarity index 100% rename from src/us/kbase/typedobj/exceptions/NoSuchModuleException.java rename to src/main/java/us/kbase/typedobj/exceptions/NoSuchModuleException.java diff --git a/src/us/kbase/typedobj/exceptions/NoSuchPrivilegeException.java b/src/main/java/us/kbase/typedobj/exceptions/NoSuchPrivilegeException.java similarity index 100% rename from src/us/kbase/typedobj/exceptions/NoSuchPrivilegeException.java rename to src/main/java/us/kbase/typedobj/exceptions/NoSuchPrivilegeException.java diff --git a/src/us/kbase/typedobj/exceptions/NoSuchTypeException.java b/src/main/java/us/kbase/typedobj/exceptions/NoSuchTypeException.java similarity index 100% rename from src/us/kbase/typedobj/exceptions/NoSuchTypeException.java rename to src/main/java/us/kbase/typedobj/exceptions/NoSuchTypeException.java diff --git a/src/us/kbase/typedobj/exceptions/SpecParseException.java b/src/main/java/us/kbase/typedobj/exceptions/SpecParseException.java similarity index 100% rename from src/us/kbase/typedobj/exceptions/SpecParseException.java rename to src/main/java/us/kbase/typedobj/exceptions/SpecParseException.java diff --git a/src/us/kbase/typedobj/exceptions/TypeStorageException.java b/src/main/java/us/kbase/typedobj/exceptions/TypeStorageException.java similarity index 100% rename from src/us/kbase/typedobj/exceptions/TypeStorageException.java rename to src/main/java/us/kbase/typedobj/exceptions/TypeStorageException.java diff --git a/src/us/kbase/typedobj/exceptions/TypedObjectException.java b/src/main/java/us/kbase/typedobj/exceptions/TypedObjectException.java similarity index 100% rename from src/us/kbase/typedobj/exceptions/TypedObjectException.java rename to src/main/java/us/kbase/typedobj/exceptions/TypedObjectException.java diff --git a/src/us/kbase/typedobj/exceptions/TypedObjectExtractionException.java b/src/main/java/us/kbase/typedobj/exceptions/TypedObjectExtractionException.java similarity index 100% rename from src/us/kbase/typedobj/exceptions/TypedObjectExtractionException.java rename to src/main/java/us/kbase/typedobj/exceptions/TypedObjectExtractionException.java diff --git a/src/us/kbase/typedobj/exceptions/TypedObjectSchemaException.java b/src/main/java/us/kbase/typedobj/exceptions/TypedObjectSchemaException.java similarity index 100% rename from src/us/kbase/typedobj/exceptions/TypedObjectSchemaException.java rename to src/main/java/us/kbase/typedobj/exceptions/TypedObjectSchemaException.java diff --git a/src/us/kbase/typedobj/exceptions/TypedObjectValidationException.java b/src/main/java/us/kbase/typedobj/exceptions/TypedObjectValidationException.java similarity index 100% rename from src/us/kbase/typedobj/exceptions/TypedObjectValidationException.java rename to src/main/java/us/kbase/typedobj/exceptions/TypedObjectValidationException.java diff --git a/src/us/kbase/typedobj/idref/DefaultRemappedId.java b/src/main/java/us/kbase/typedobj/idref/DefaultRemappedId.java similarity index 100% rename from src/us/kbase/typedobj/idref/DefaultRemappedId.java rename to src/main/java/us/kbase/typedobj/idref/DefaultRemappedId.java diff --git a/src/us/kbase/typedobj/idref/IdReference.java b/src/main/java/us/kbase/typedobj/idref/IdReference.java similarity index 100% rename from src/us/kbase/typedobj/idref/IdReference.java rename to src/main/java/us/kbase/typedobj/idref/IdReference.java diff --git a/src/us/kbase/typedobj/idref/IdReferenceHandlerSet.java b/src/main/java/us/kbase/typedobj/idref/IdReferenceHandlerSet.java similarity index 100% rename from src/us/kbase/typedobj/idref/IdReferenceHandlerSet.java rename to src/main/java/us/kbase/typedobj/idref/IdReferenceHandlerSet.java diff --git a/src/us/kbase/typedobj/idref/IdReferenceHandlerSetFactory.java b/src/main/java/us/kbase/typedobj/idref/IdReferenceHandlerSetFactory.java similarity index 100% rename from src/us/kbase/typedobj/idref/IdReferenceHandlerSetFactory.java rename to src/main/java/us/kbase/typedobj/idref/IdReferenceHandlerSetFactory.java diff --git a/src/us/kbase/typedobj/idref/IdReferenceHandlerSetFactoryBuilder.java b/src/main/java/us/kbase/typedobj/idref/IdReferenceHandlerSetFactoryBuilder.java similarity index 100% rename from src/us/kbase/typedobj/idref/IdReferenceHandlerSetFactoryBuilder.java rename to src/main/java/us/kbase/typedobj/idref/IdReferenceHandlerSetFactoryBuilder.java diff --git a/src/us/kbase/typedobj/idref/IdReferencePermissionHandlerSet.java b/src/main/java/us/kbase/typedobj/idref/IdReferencePermissionHandlerSet.java similarity index 100% rename from src/us/kbase/typedobj/idref/IdReferencePermissionHandlerSet.java rename to src/main/java/us/kbase/typedobj/idref/IdReferencePermissionHandlerSet.java diff --git a/src/us/kbase/typedobj/idref/IdReferenceType.java b/src/main/java/us/kbase/typedobj/idref/IdReferenceType.java similarity index 100% rename from src/us/kbase/typedobj/idref/IdReferenceType.java rename to src/main/java/us/kbase/typedobj/idref/IdReferenceType.java diff --git a/src/us/kbase/typedobj/idref/NoSuchIdReferenceHandlerException.java b/src/main/java/us/kbase/typedobj/idref/NoSuchIdReferenceHandlerException.java similarity index 100% rename from src/us/kbase/typedobj/idref/NoSuchIdReferenceHandlerException.java rename to src/main/java/us/kbase/typedobj/idref/NoSuchIdReferenceHandlerException.java diff --git a/src/us/kbase/typedobj/idref/RemappedId.java b/src/main/java/us/kbase/typedobj/idref/RemappedId.java similarity index 100% rename from src/us/kbase/typedobj/idref/RemappedId.java rename to src/main/java/us/kbase/typedobj/idref/RemappedId.java diff --git a/src/us/kbase/typedobj/idref/SimpleRemappedId.java b/src/main/java/us/kbase/typedobj/idref/SimpleRemappedId.java similarity index 100% rename from src/us/kbase/typedobj/idref/SimpleRemappedId.java rename to src/main/java/us/kbase/typedobj/idref/SimpleRemappedId.java diff --git a/src/us/kbase/workspace/AlterAdminObjectMetadataParams.java b/src/main/java/us/kbase/workspace/AlterAdminObjectMetadataParams.java similarity index 100% rename from src/us/kbase/workspace/AlterAdminObjectMetadataParams.java rename to src/main/java/us/kbase/workspace/AlterAdminObjectMetadataParams.java diff --git a/src/us/kbase/workspace/AlterWorkspaceMetadataParams.java b/src/main/java/us/kbase/workspace/AlterWorkspaceMetadataParams.java similarity index 100% rename from src/us/kbase/workspace/AlterWorkspaceMetadataParams.java rename to src/main/java/us/kbase/workspace/AlterWorkspaceMetadataParams.java diff --git a/src/us/kbase/workspace/CloneWorkspaceParams.java b/src/main/java/us/kbase/workspace/CloneWorkspaceParams.java similarity index 100% rename from src/us/kbase/workspace/CloneWorkspaceParams.java rename to src/main/java/us/kbase/workspace/CloneWorkspaceParams.java diff --git a/src/us/kbase/workspace/CopyObjectParams.java b/src/main/java/us/kbase/workspace/CopyObjectParams.java similarity index 100% rename from src/us/kbase/workspace/CopyObjectParams.java rename to src/main/java/us/kbase/workspace/CopyObjectParams.java diff --git a/src/us/kbase/workspace/CreateWorkspaceParams.java b/src/main/java/us/kbase/workspace/CreateWorkspaceParams.java similarity index 100% rename from src/us/kbase/workspace/CreateWorkspaceParams.java rename to src/main/java/us/kbase/workspace/CreateWorkspaceParams.java diff --git a/src/us/kbase/workspace/ExternalDataUnit.java b/src/main/java/us/kbase/workspace/ExternalDataUnit.java similarity index 100% rename from src/us/kbase/workspace/ExternalDataUnit.java rename to src/main/java/us/kbase/workspace/ExternalDataUnit.java diff --git a/src/us/kbase/workspace/FuncInfo.java b/src/main/java/us/kbase/workspace/FuncInfo.java similarity index 100% rename from src/us/kbase/workspace/FuncInfo.java rename to src/main/java/us/kbase/workspace/FuncInfo.java diff --git a/src/us/kbase/workspace/GetAdminRoleResults.java b/src/main/java/us/kbase/workspace/GetAdminRoleResults.java similarity index 100% rename from src/us/kbase/workspace/GetAdminRoleResults.java rename to src/main/java/us/kbase/workspace/GetAdminRoleResults.java diff --git a/src/us/kbase/workspace/GetModuleInfoParams.java b/src/main/java/us/kbase/workspace/GetModuleInfoParams.java similarity index 100% rename from src/us/kbase/workspace/GetModuleInfoParams.java rename to src/main/java/us/kbase/workspace/GetModuleInfoParams.java diff --git a/src/us/kbase/workspace/GetNamesByPrefixParams.java b/src/main/java/us/kbase/workspace/GetNamesByPrefixParams.java similarity index 100% rename from src/us/kbase/workspace/GetNamesByPrefixParams.java rename to src/main/java/us/kbase/workspace/GetNamesByPrefixParams.java diff --git a/src/us/kbase/workspace/GetNamesByPrefixResults.java b/src/main/java/us/kbase/workspace/GetNamesByPrefixResults.java similarity index 100% rename from src/us/kbase/workspace/GetNamesByPrefixResults.java rename to src/main/java/us/kbase/workspace/GetNamesByPrefixResults.java diff --git a/src/us/kbase/workspace/GetObjectInfo3Params.java b/src/main/java/us/kbase/workspace/GetObjectInfo3Params.java similarity index 100% rename from src/us/kbase/workspace/GetObjectInfo3Params.java rename to src/main/java/us/kbase/workspace/GetObjectInfo3Params.java diff --git a/src/us/kbase/workspace/GetObjectInfo3Results.java b/src/main/java/us/kbase/workspace/GetObjectInfo3Results.java similarity index 100% rename from src/us/kbase/workspace/GetObjectInfo3Results.java rename to src/main/java/us/kbase/workspace/GetObjectInfo3Results.java diff --git a/src/us/kbase/workspace/GetObjectInfoNewParams.java b/src/main/java/us/kbase/workspace/GetObjectInfoNewParams.java similarity index 100% rename from src/us/kbase/workspace/GetObjectInfoNewParams.java rename to src/main/java/us/kbase/workspace/GetObjectInfoNewParams.java diff --git a/src/us/kbase/workspace/GetObjectOutput.java b/src/main/java/us/kbase/workspace/GetObjectOutput.java similarity index 100% rename from src/us/kbase/workspace/GetObjectOutput.java rename to src/main/java/us/kbase/workspace/GetObjectOutput.java diff --git a/src/us/kbase/workspace/GetObjectParams.java b/src/main/java/us/kbase/workspace/GetObjectParams.java similarity index 100% rename from src/us/kbase/workspace/GetObjectParams.java rename to src/main/java/us/kbase/workspace/GetObjectParams.java diff --git a/src/us/kbase/workspace/GetObjectmetaParams.java b/src/main/java/us/kbase/workspace/GetObjectmetaParams.java similarity index 100% rename from src/us/kbase/workspace/GetObjectmetaParams.java rename to src/main/java/us/kbase/workspace/GetObjectmetaParams.java diff --git a/src/us/kbase/workspace/GetObjects2Params.java b/src/main/java/us/kbase/workspace/GetObjects2Params.java similarity index 100% rename from src/us/kbase/workspace/GetObjects2Params.java rename to src/main/java/us/kbase/workspace/GetObjects2Params.java diff --git a/src/us/kbase/workspace/GetObjects2Results.java b/src/main/java/us/kbase/workspace/GetObjects2Results.java similarity index 100% rename from src/us/kbase/workspace/GetObjects2Results.java rename to src/main/java/us/kbase/workspace/GetObjects2Results.java diff --git a/src/us/kbase/workspace/GetPermissionsMassParams.java b/src/main/java/us/kbase/workspace/GetPermissionsMassParams.java similarity index 100% rename from src/us/kbase/workspace/GetPermissionsMassParams.java rename to src/main/java/us/kbase/workspace/GetPermissionsMassParams.java diff --git a/src/us/kbase/workspace/GetWorkspacemetaParams.java b/src/main/java/us/kbase/workspace/GetWorkspacemetaParams.java similarity index 100% rename from src/us/kbase/workspace/GetWorkspacemetaParams.java rename to src/main/java/us/kbase/workspace/GetWorkspacemetaParams.java diff --git a/src/us/kbase/workspace/GrantModuleOwnershipParams.java b/src/main/java/us/kbase/workspace/GrantModuleOwnershipParams.java similarity index 100% rename from src/us/kbase/workspace/GrantModuleOwnershipParams.java rename to src/main/java/us/kbase/workspace/GrantModuleOwnershipParams.java diff --git a/src/us/kbase/workspace/ListAllTypesParams.java b/src/main/java/us/kbase/workspace/ListAllTypesParams.java similarity index 100% rename from src/us/kbase/workspace/ListAllTypesParams.java rename to src/main/java/us/kbase/workspace/ListAllTypesParams.java diff --git a/src/us/kbase/workspace/ListModuleVersionsParams.java b/src/main/java/us/kbase/workspace/ListModuleVersionsParams.java similarity index 100% rename from src/us/kbase/workspace/ListModuleVersionsParams.java rename to src/main/java/us/kbase/workspace/ListModuleVersionsParams.java diff --git a/src/us/kbase/workspace/ListModulesParams.java b/src/main/java/us/kbase/workspace/ListModulesParams.java similarity index 100% rename from src/us/kbase/workspace/ListModulesParams.java rename to src/main/java/us/kbase/workspace/ListModulesParams.java diff --git a/src/us/kbase/workspace/ListObjectsParams.java b/src/main/java/us/kbase/workspace/ListObjectsParams.java similarity index 100% rename from src/us/kbase/workspace/ListObjectsParams.java rename to src/main/java/us/kbase/workspace/ListObjectsParams.java diff --git a/src/us/kbase/workspace/ListWorkspaceIDsParams.java b/src/main/java/us/kbase/workspace/ListWorkspaceIDsParams.java similarity index 100% rename from src/us/kbase/workspace/ListWorkspaceIDsParams.java rename to src/main/java/us/kbase/workspace/ListWorkspaceIDsParams.java diff --git a/src/us/kbase/workspace/ListWorkspaceIDsResults.java b/src/main/java/us/kbase/workspace/ListWorkspaceIDsResults.java similarity index 100% rename from src/us/kbase/workspace/ListWorkspaceIDsResults.java rename to src/main/java/us/kbase/workspace/ListWorkspaceIDsResults.java diff --git a/src/us/kbase/workspace/ListWorkspaceInfoParams.java b/src/main/java/us/kbase/workspace/ListWorkspaceInfoParams.java similarity index 100% rename from src/us/kbase/workspace/ListWorkspaceInfoParams.java rename to src/main/java/us/kbase/workspace/ListWorkspaceInfoParams.java diff --git a/src/us/kbase/workspace/ListWorkspaceObjectsParams.java b/src/main/java/us/kbase/workspace/ListWorkspaceObjectsParams.java similarity index 100% rename from src/us/kbase/workspace/ListWorkspaceObjectsParams.java rename to src/main/java/us/kbase/workspace/ListWorkspaceObjectsParams.java diff --git a/src/us/kbase/workspace/ListWorkspacesParams.java b/src/main/java/us/kbase/workspace/ListWorkspacesParams.java similarity index 100% rename from src/us/kbase/workspace/ListWorkspacesParams.java rename to src/main/java/us/kbase/workspace/ListWorkspacesParams.java diff --git a/src/us/kbase/workspace/ModuleInfo.java b/src/main/java/us/kbase/workspace/ModuleInfo.java similarity index 100% rename from src/us/kbase/workspace/ModuleInfo.java rename to src/main/java/us/kbase/workspace/ModuleInfo.java diff --git a/src/us/kbase/workspace/ModuleVersions.java b/src/main/java/us/kbase/workspace/ModuleVersions.java similarity index 100% rename from src/us/kbase/workspace/ModuleVersions.java rename to src/main/java/us/kbase/workspace/ModuleVersions.java diff --git a/src/us/kbase/workspace/ObjectData.java b/src/main/java/us/kbase/workspace/ObjectData.java similarity index 100% rename from src/us/kbase/workspace/ObjectData.java rename to src/main/java/us/kbase/workspace/ObjectData.java diff --git a/src/us/kbase/workspace/ObjectIdentity.java b/src/main/java/us/kbase/workspace/ObjectIdentity.java similarity index 100% rename from src/us/kbase/workspace/ObjectIdentity.java rename to src/main/java/us/kbase/workspace/ObjectIdentity.java diff --git a/src/us/kbase/workspace/ObjectInfo.java b/src/main/java/us/kbase/workspace/ObjectInfo.java similarity index 100% rename from src/us/kbase/workspace/ObjectInfo.java rename to src/main/java/us/kbase/workspace/ObjectInfo.java diff --git a/src/us/kbase/workspace/ObjectMetadataUpdate.java b/src/main/java/us/kbase/workspace/ObjectMetadataUpdate.java similarity index 100% rename from src/us/kbase/workspace/ObjectMetadataUpdate.java rename to src/main/java/us/kbase/workspace/ObjectMetadataUpdate.java diff --git a/src/us/kbase/workspace/ObjectProvenanceInfo.java b/src/main/java/us/kbase/workspace/ObjectProvenanceInfo.java similarity index 100% rename from src/us/kbase/workspace/ObjectProvenanceInfo.java rename to src/main/java/us/kbase/workspace/ObjectProvenanceInfo.java diff --git a/src/us/kbase/workspace/ObjectSaveData.java b/src/main/java/us/kbase/workspace/ObjectSaveData.java similarity index 100% rename from src/us/kbase/workspace/ObjectSaveData.java rename to src/main/java/us/kbase/workspace/ObjectSaveData.java diff --git a/src/us/kbase/workspace/ObjectSpecification.java b/src/main/java/us/kbase/workspace/ObjectSpecification.java similarity index 100% rename from src/us/kbase/workspace/ObjectSpecification.java rename to src/main/java/us/kbase/workspace/ObjectSpecification.java diff --git a/src/us/kbase/workspace/ProvenanceAction.java b/src/main/java/us/kbase/workspace/ProvenanceAction.java similarity index 100% rename from src/us/kbase/workspace/ProvenanceAction.java rename to src/main/java/us/kbase/workspace/ProvenanceAction.java diff --git a/src/us/kbase/workspace/RegisterTypespecCopyParams.java b/src/main/java/us/kbase/workspace/RegisterTypespecCopyParams.java similarity index 100% rename from src/us/kbase/workspace/RegisterTypespecCopyParams.java rename to src/main/java/us/kbase/workspace/RegisterTypespecCopyParams.java diff --git a/src/us/kbase/workspace/RegisterTypespecParams.java b/src/main/java/us/kbase/workspace/RegisterTypespecParams.java similarity index 100% rename from src/us/kbase/workspace/RegisterTypespecParams.java rename to src/main/java/us/kbase/workspace/RegisterTypespecParams.java diff --git a/src/us/kbase/workspace/RemoveModuleOwnershipParams.java b/src/main/java/us/kbase/workspace/RemoveModuleOwnershipParams.java similarity index 100% rename from src/us/kbase/workspace/RemoveModuleOwnershipParams.java rename to src/main/java/us/kbase/workspace/RemoveModuleOwnershipParams.java diff --git a/src/us/kbase/workspace/RenameObjectParams.java b/src/main/java/us/kbase/workspace/RenameObjectParams.java similarity index 100% rename from src/us/kbase/workspace/RenameObjectParams.java rename to src/main/java/us/kbase/workspace/RenameObjectParams.java diff --git a/src/us/kbase/workspace/RenameWorkspaceParams.java b/src/main/java/us/kbase/workspace/RenameWorkspaceParams.java similarity index 100% rename from src/us/kbase/workspace/RenameWorkspaceParams.java rename to src/main/java/us/kbase/workspace/RenameWorkspaceParams.java diff --git a/src/us/kbase/workspace/SaveObjectParams.java b/src/main/java/us/kbase/workspace/SaveObjectParams.java similarity index 100% rename from src/us/kbase/workspace/SaveObjectParams.java rename to src/main/java/us/kbase/workspace/SaveObjectParams.java diff --git a/src/us/kbase/workspace/SaveObjectsParams.java b/src/main/java/us/kbase/workspace/SaveObjectsParams.java similarity index 100% rename from src/us/kbase/workspace/SaveObjectsParams.java rename to src/main/java/us/kbase/workspace/SaveObjectsParams.java diff --git a/src/us/kbase/workspace/SetGlobalPermissionsParams.java b/src/main/java/us/kbase/workspace/SetGlobalPermissionsParams.java similarity index 100% rename from src/us/kbase/workspace/SetGlobalPermissionsParams.java rename to src/main/java/us/kbase/workspace/SetGlobalPermissionsParams.java diff --git a/src/us/kbase/workspace/SetPermissionsParams.java b/src/main/java/us/kbase/workspace/SetPermissionsParams.java similarity index 100% rename from src/us/kbase/workspace/SetPermissionsParams.java rename to src/main/java/us/kbase/workspace/SetPermissionsParams.java diff --git a/src/us/kbase/workspace/SetWorkspaceDescriptionParams.java b/src/main/java/us/kbase/workspace/SetWorkspaceDescriptionParams.java similarity index 100% rename from src/us/kbase/workspace/SetWorkspaceDescriptionParams.java rename to src/main/java/us/kbase/workspace/SetWorkspaceDescriptionParams.java diff --git a/src/us/kbase/workspace/SubAction.java b/src/main/java/us/kbase/workspace/SubAction.java similarity index 100% rename from src/us/kbase/workspace/SubAction.java rename to src/main/java/us/kbase/workspace/SubAction.java diff --git a/src/us/kbase/workspace/SubObjectIdentity.java b/src/main/java/us/kbase/workspace/SubObjectIdentity.java similarity index 100% rename from src/us/kbase/workspace/SubObjectIdentity.java rename to src/main/java/us/kbase/workspace/SubObjectIdentity.java diff --git a/src/us/kbase/workspace/TypeInfo.java b/src/main/java/us/kbase/workspace/TypeInfo.java similarity index 100% rename from src/us/kbase/workspace/TypeInfo.java rename to src/main/java/us/kbase/workspace/TypeInfo.java diff --git a/src/us/kbase/workspace/WorkspaceClient.java b/src/main/java/us/kbase/workspace/WorkspaceClient.java similarity index 100% rename from src/us/kbase/workspace/WorkspaceClient.java rename to src/main/java/us/kbase/workspace/WorkspaceClient.java diff --git a/src/us/kbase/workspace/WorkspaceIdentity.java b/src/main/java/us/kbase/workspace/WorkspaceIdentity.java similarity index 100% rename from src/us/kbase/workspace/WorkspaceIdentity.java rename to src/main/java/us/kbase/workspace/WorkspaceIdentity.java diff --git a/src/us/kbase/workspace/WorkspacePermissions.java b/src/main/java/us/kbase/workspace/WorkspacePermissions.java similarity index 100% rename from src/us/kbase/workspace/WorkspacePermissions.java rename to src/main/java/us/kbase/workspace/WorkspacePermissions.java diff --git a/src/us/kbase/workspace/WorkspaceServer.java b/src/main/java/us/kbase/workspace/WorkspaceServer.java similarity index 100% rename from src/us/kbase/workspace/WorkspaceServer.java rename to src/main/java/us/kbase/workspace/WorkspaceServer.java diff --git a/src/us/kbase/workspace/database/AllUsers.java b/src/main/java/us/kbase/workspace/database/AllUsers.java similarity index 100% rename from src/us/kbase/workspace/database/AllUsers.java rename to src/main/java/us/kbase/workspace/database/AllUsers.java diff --git a/src/us/kbase/workspace/database/ByteArrayFileCacheManager.java b/src/main/java/us/kbase/workspace/database/ByteArrayFileCacheManager.java similarity index 100% rename from src/us/kbase/workspace/database/ByteArrayFileCacheManager.java rename to src/main/java/us/kbase/workspace/database/ByteArrayFileCacheManager.java diff --git a/src/us/kbase/workspace/database/CopyResult.java b/src/main/java/us/kbase/workspace/database/CopyResult.java similarity index 100% rename from src/us/kbase/workspace/database/CopyResult.java rename to src/main/java/us/kbase/workspace/database/CopyResult.java diff --git a/src/us/kbase/workspace/database/DependencyStatus.java b/src/main/java/us/kbase/workspace/database/DependencyStatus.java similarity index 100% rename from src/us/kbase/workspace/database/DependencyStatus.java rename to src/main/java/us/kbase/workspace/database/DependencyStatus.java diff --git a/src/us/kbase/workspace/database/DynamicConfig.java b/src/main/java/us/kbase/workspace/database/DynamicConfig.java similarity index 100% rename from src/us/kbase/workspace/database/DynamicConfig.java rename to src/main/java/us/kbase/workspace/database/DynamicConfig.java diff --git a/src/us/kbase/workspace/database/ListObjectsParameters.java b/src/main/java/us/kbase/workspace/database/ListObjectsParameters.java similarity index 100% rename from src/us/kbase/workspace/database/ListObjectsParameters.java rename to src/main/java/us/kbase/workspace/database/ListObjectsParameters.java diff --git a/src/us/kbase/workspace/database/MetadataUpdate.java b/src/main/java/us/kbase/workspace/database/MetadataUpdate.java similarity index 100% rename from src/us/kbase/workspace/database/MetadataUpdate.java rename to src/main/java/us/kbase/workspace/database/MetadataUpdate.java diff --git a/src/us/kbase/workspace/database/ModuleInfo.java b/src/main/java/us/kbase/workspace/database/ModuleInfo.java similarity index 100% rename from src/us/kbase/workspace/database/ModuleInfo.java rename to src/main/java/us/kbase/workspace/database/ModuleInfo.java diff --git a/src/us/kbase/workspace/database/ObjectIDNoWSNoVer.java b/src/main/java/us/kbase/workspace/database/ObjectIDNoWSNoVer.java similarity index 100% rename from src/us/kbase/workspace/database/ObjectIDNoWSNoVer.java rename to src/main/java/us/kbase/workspace/database/ObjectIDNoWSNoVer.java diff --git a/src/us/kbase/workspace/database/ObjectIDResolvedWS.java b/src/main/java/us/kbase/workspace/database/ObjectIDResolvedWS.java similarity index 100% rename from src/us/kbase/workspace/database/ObjectIDResolvedWS.java rename to src/main/java/us/kbase/workspace/database/ObjectIDResolvedWS.java diff --git a/src/us/kbase/workspace/database/ObjectIdentifier.java b/src/main/java/us/kbase/workspace/database/ObjectIdentifier.java similarity index 100% rename from src/us/kbase/workspace/database/ObjectIdentifier.java rename to src/main/java/us/kbase/workspace/database/ObjectIdentifier.java diff --git a/src/us/kbase/workspace/database/ObjectInfoWithModDate.java b/src/main/java/us/kbase/workspace/database/ObjectInfoWithModDate.java similarity index 100% rename from src/us/kbase/workspace/database/ObjectInfoWithModDate.java rename to src/main/java/us/kbase/workspace/database/ObjectInfoWithModDate.java diff --git a/src/us/kbase/workspace/database/ObjectInformation.java b/src/main/java/us/kbase/workspace/database/ObjectInformation.java similarity index 100% rename from src/us/kbase/workspace/database/ObjectInformation.java rename to src/main/java/us/kbase/workspace/database/ObjectInformation.java diff --git a/src/us/kbase/workspace/database/ObjectReferenceSet.java b/src/main/java/us/kbase/workspace/database/ObjectReferenceSet.java similarity index 100% rename from src/us/kbase/workspace/database/ObjectReferenceSet.java rename to src/main/java/us/kbase/workspace/database/ObjectReferenceSet.java diff --git a/src/us/kbase/workspace/database/ObjectResolver.java b/src/main/java/us/kbase/workspace/database/ObjectResolver.java similarity index 100% rename from src/us/kbase/workspace/database/ObjectResolver.java rename to src/main/java/us/kbase/workspace/database/ObjectResolver.java diff --git a/src/us/kbase/workspace/database/Permission.java b/src/main/java/us/kbase/workspace/database/Permission.java similarity index 100% rename from src/us/kbase/workspace/database/Permission.java rename to src/main/java/us/kbase/workspace/database/Permission.java diff --git a/src/us/kbase/workspace/database/PermissionSet.java b/src/main/java/us/kbase/workspace/database/PermissionSet.java similarity index 100% rename from src/us/kbase/workspace/database/PermissionSet.java rename to src/main/java/us/kbase/workspace/database/PermissionSet.java diff --git a/src/us/kbase/workspace/database/PermissionsCheckerFactory.java b/src/main/java/us/kbase/workspace/database/PermissionsCheckerFactory.java similarity index 100% rename from src/us/kbase/workspace/database/PermissionsCheckerFactory.java rename to src/main/java/us/kbase/workspace/database/PermissionsCheckerFactory.java diff --git a/src/us/kbase/workspace/database/RefLimit.java b/src/main/java/us/kbase/workspace/database/RefLimit.java similarity index 100% rename from src/us/kbase/workspace/database/RefLimit.java rename to src/main/java/us/kbase/workspace/database/RefLimit.java diff --git a/src/us/kbase/workspace/database/Reference.java b/src/main/java/us/kbase/workspace/database/Reference.java similarity index 100% rename from src/us/kbase/workspace/database/Reference.java rename to src/main/java/us/kbase/workspace/database/Reference.java diff --git a/src/us/kbase/workspace/database/ResolvedObjectID.java b/src/main/java/us/kbase/workspace/database/ResolvedObjectID.java similarity index 100% rename from src/us/kbase/workspace/database/ResolvedObjectID.java rename to src/main/java/us/kbase/workspace/database/ResolvedObjectID.java diff --git a/src/us/kbase/workspace/database/ResolvedObjectIDNoVer.java b/src/main/java/us/kbase/workspace/database/ResolvedObjectIDNoVer.java similarity index 100% rename from src/us/kbase/workspace/database/ResolvedObjectIDNoVer.java rename to src/main/java/us/kbase/workspace/database/ResolvedObjectIDNoVer.java diff --git a/src/us/kbase/workspace/database/ResolvedSaveObject.java b/src/main/java/us/kbase/workspace/database/ResolvedSaveObject.java similarity index 100% rename from src/us/kbase/workspace/database/ResolvedSaveObject.java rename to src/main/java/us/kbase/workspace/database/ResolvedSaveObject.java diff --git a/src/us/kbase/workspace/database/ResolvedWorkspaceID.java b/src/main/java/us/kbase/workspace/database/ResolvedWorkspaceID.java similarity index 100% rename from src/us/kbase/workspace/database/ResolvedWorkspaceID.java rename to src/main/java/us/kbase/workspace/database/ResolvedWorkspaceID.java diff --git a/src/us/kbase/workspace/database/ResourceUsageConfigurationBuilder.java b/src/main/java/us/kbase/workspace/database/ResourceUsageConfigurationBuilder.java similarity index 100% rename from src/us/kbase/workspace/database/ResourceUsageConfigurationBuilder.java rename to src/main/java/us/kbase/workspace/database/ResourceUsageConfigurationBuilder.java diff --git a/src/us/kbase/workspace/database/TypeAndReference.java b/src/main/java/us/kbase/workspace/database/TypeAndReference.java similarity index 100% rename from src/us/kbase/workspace/database/TypeAndReference.java rename to src/main/java/us/kbase/workspace/database/TypeAndReference.java diff --git a/src/us/kbase/workspace/database/Types.java b/src/main/java/us/kbase/workspace/database/Types.java similarity index 100% rename from src/us/kbase/workspace/database/Types.java rename to src/main/java/us/kbase/workspace/database/Types.java diff --git a/src/us/kbase/workspace/database/UncheckedUserMetadata.java b/src/main/java/us/kbase/workspace/database/UncheckedUserMetadata.java similarity index 100% rename from src/us/kbase/workspace/database/UncheckedUserMetadata.java rename to src/main/java/us/kbase/workspace/database/UncheckedUserMetadata.java diff --git a/src/us/kbase/workspace/database/User.java b/src/main/java/us/kbase/workspace/database/User.java similarity index 100% rename from src/us/kbase/workspace/database/User.java rename to src/main/java/us/kbase/workspace/database/User.java diff --git a/src/us/kbase/workspace/database/UserWorkspaceIDs.java b/src/main/java/us/kbase/workspace/database/UserWorkspaceIDs.java similarity index 100% rename from src/us/kbase/workspace/database/UserWorkspaceIDs.java rename to src/main/java/us/kbase/workspace/database/UserWorkspaceIDs.java diff --git a/src/us/kbase/workspace/database/Util.java b/src/main/java/us/kbase/workspace/database/Util.java similarity index 100% rename from src/us/kbase/workspace/database/Util.java rename to src/main/java/us/kbase/workspace/database/Util.java diff --git a/src/us/kbase/workspace/database/Workspace.java b/src/main/java/us/kbase/workspace/database/Workspace.java similarity index 100% rename from src/us/kbase/workspace/database/Workspace.java rename to src/main/java/us/kbase/workspace/database/Workspace.java diff --git a/src/us/kbase/workspace/database/WorkspaceDatabase.java b/src/main/java/us/kbase/workspace/database/WorkspaceDatabase.java similarity index 100% rename from src/us/kbase/workspace/database/WorkspaceDatabase.java rename to src/main/java/us/kbase/workspace/database/WorkspaceDatabase.java diff --git a/src/us/kbase/workspace/database/WorkspaceIdentifier.java b/src/main/java/us/kbase/workspace/database/WorkspaceIdentifier.java similarity index 100% rename from src/us/kbase/workspace/database/WorkspaceIdentifier.java rename to src/main/java/us/kbase/workspace/database/WorkspaceIdentifier.java diff --git a/src/us/kbase/workspace/database/WorkspaceInformation.java b/src/main/java/us/kbase/workspace/database/WorkspaceInformation.java similarity index 100% rename from src/us/kbase/workspace/database/WorkspaceInformation.java rename to src/main/java/us/kbase/workspace/database/WorkspaceInformation.java diff --git a/src/us/kbase/workspace/database/WorkspaceObjectData.java b/src/main/java/us/kbase/workspace/database/WorkspaceObjectData.java similarity index 100% rename from src/us/kbase/workspace/database/WorkspaceObjectData.java rename to src/main/java/us/kbase/workspace/database/WorkspaceObjectData.java diff --git a/src/us/kbase/workspace/database/WorkspaceSaveObject.java b/src/main/java/us/kbase/workspace/database/WorkspaceSaveObject.java similarity index 100% rename from src/us/kbase/workspace/database/WorkspaceSaveObject.java rename to src/main/java/us/kbase/workspace/database/WorkspaceSaveObject.java diff --git a/src/us/kbase/workspace/database/WorkspaceUser.java b/src/main/java/us/kbase/workspace/database/WorkspaceUser.java similarity index 100% rename from src/us/kbase/workspace/database/WorkspaceUser.java rename to src/main/java/us/kbase/workspace/database/WorkspaceUser.java diff --git a/src/us/kbase/workspace/database/WorkspaceUserMetadata.java b/src/main/java/us/kbase/workspace/database/WorkspaceUserMetadata.java similarity index 100% rename from src/us/kbase/workspace/database/WorkspaceUserMetadata.java rename to src/main/java/us/kbase/workspace/database/WorkspaceUserMetadata.java diff --git a/src/us/kbase/workspace/database/exceptions/CorruptWorkspaceDBException.java b/src/main/java/us/kbase/workspace/database/exceptions/CorruptWorkspaceDBException.java similarity index 100% rename from src/us/kbase/workspace/database/exceptions/CorruptWorkspaceDBException.java rename to src/main/java/us/kbase/workspace/database/exceptions/CorruptWorkspaceDBException.java diff --git a/src/us/kbase/workspace/database/exceptions/DeletedObjectException.java b/src/main/java/us/kbase/workspace/database/exceptions/DeletedObjectException.java similarity index 100% rename from src/us/kbase/workspace/database/exceptions/DeletedObjectException.java rename to src/main/java/us/kbase/workspace/database/exceptions/DeletedObjectException.java diff --git a/src/us/kbase/workspace/database/exceptions/ErrorOr.java b/src/main/java/us/kbase/workspace/database/exceptions/ErrorOr.java similarity index 100% rename from src/us/kbase/workspace/database/exceptions/ErrorOr.java rename to src/main/java/us/kbase/workspace/database/exceptions/ErrorOr.java diff --git a/src/us/kbase/workspace/database/exceptions/ErrorType.java b/src/main/java/us/kbase/workspace/database/exceptions/ErrorType.java similarity index 100% rename from src/us/kbase/workspace/database/exceptions/ErrorType.java rename to src/main/java/us/kbase/workspace/database/exceptions/ErrorType.java diff --git a/src/us/kbase/workspace/database/exceptions/InaccessibleObjectException.java b/src/main/java/us/kbase/workspace/database/exceptions/InaccessibleObjectException.java similarity index 100% rename from src/us/kbase/workspace/database/exceptions/InaccessibleObjectException.java rename to src/main/java/us/kbase/workspace/database/exceptions/InaccessibleObjectException.java diff --git a/src/us/kbase/workspace/database/exceptions/NoObjectDataException.java b/src/main/java/us/kbase/workspace/database/exceptions/NoObjectDataException.java similarity index 100% rename from src/us/kbase/workspace/database/exceptions/NoObjectDataException.java rename to src/main/java/us/kbase/workspace/database/exceptions/NoObjectDataException.java diff --git a/src/us/kbase/workspace/database/exceptions/NoSuchObjectException.java b/src/main/java/us/kbase/workspace/database/exceptions/NoSuchObjectException.java similarity index 100% rename from src/us/kbase/workspace/database/exceptions/NoSuchObjectException.java rename to src/main/java/us/kbase/workspace/database/exceptions/NoSuchObjectException.java diff --git a/src/us/kbase/workspace/database/exceptions/NoSuchReferenceException.java b/src/main/java/us/kbase/workspace/database/exceptions/NoSuchReferenceException.java similarity index 100% rename from src/us/kbase/workspace/database/exceptions/NoSuchReferenceException.java rename to src/main/java/us/kbase/workspace/database/exceptions/NoSuchReferenceException.java diff --git a/src/us/kbase/workspace/database/exceptions/NoSuchWorkspaceException.java b/src/main/java/us/kbase/workspace/database/exceptions/NoSuchWorkspaceException.java similarity index 100% rename from src/us/kbase/workspace/database/exceptions/NoSuchWorkspaceException.java rename to src/main/java/us/kbase/workspace/database/exceptions/NoSuchWorkspaceException.java diff --git a/src/us/kbase/workspace/database/exceptions/PreExistingWorkspaceException.java b/src/main/java/us/kbase/workspace/database/exceptions/PreExistingWorkspaceException.java similarity index 100% rename from src/us/kbase/workspace/database/exceptions/PreExistingWorkspaceException.java rename to src/main/java/us/kbase/workspace/database/exceptions/PreExistingWorkspaceException.java diff --git a/src/us/kbase/workspace/database/exceptions/WorkspaceCommunicationException.java b/src/main/java/us/kbase/workspace/database/exceptions/WorkspaceCommunicationException.java similarity index 100% rename from src/us/kbase/workspace/database/exceptions/WorkspaceCommunicationException.java rename to src/main/java/us/kbase/workspace/database/exceptions/WorkspaceCommunicationException.java diff --git a/src/us/kbase/workspace/database/exceptions/WorkspaceDBException.java b/src/main/java/us/kbase/workspace/database/exceptions/WorkspaceDBException.java similarity index 100% rename from src/us/kbase/workspace/database/exceptions/WorkspaceDBException.java rename to src/main/java/us/kbase/workspace/database/exceptions/WorkspaceDBException.java diff --git a/src/us/kbase/workspace/database/exceptions/WorkspaceDBInitializationException.java b/src/main/java/us/kbase/workspace/database/exceptions/WorkspaceDBInitializationException.java similarity index 100% rename from src/us/kbase/workspace/database/exceptions/WorkspaceDBInitializationException.java rename to src/main/java/us/kbase/workspace/database/exceptions/WorkspaceDBInitializationException.java diff --git a/src/us/kbase/workspace/database/mongo/BlobStore.java b/src/main/java/us/kbase/workspace/database/mongo/BlobStore.java similarity index 100% rename from src/us/kbase/workspace/database/mongo/BlobStore.java rename to src/main/java/us/kbase/workspace/database/mongo/BlobStore.java diff --git a/src/us/kbase/workspace/database/mongo/CollectionNames.java b/src/main/java/us/kbase/workspace/database/mongo/CollectionNames.java similarity index 100% rename from src/us/kbase/workspace/database/mongo/CollectionNames.java rename to src/main/java/us/kbase/workspace/database/mongo/CollectionNames.java diff --git a/src/us/kbase/workspace/database/mongo/Fields.java b/src/main/java/us/kbase/workspace/database/mongo/Fields.java similarity index 100% rename from src/us/kbase/workspace/database/mongo/Fields.java rename to src/main/java/us/kbase/workspace/database/mongo/Fields.java diff --git a/src/us/kbase/workspace/database/mongo/GridFSBlobStore.java b/src/main/java/us/kbase/workspace/database/mongo/GridFSBlobStore.java similarity index 100% rename from src/us/kbase/workspace/database/mongo/GridFSBlobStore.java rename to src/main/java/us/kbase/workspace/database/mongo/GridFSBlobStore.java diff --git a/src/us/kbase/workspace/database/mongo/IDName.java b/src/main/java/us/kbase/workspace/database/mongo/IDName.java similarity index 100% rename from src/us/kbase/workspace/database/mongo/IDName.java rename to src/main/java/us/kbase/workspace/database/mongo/IDName.java diff --git a/src/us/kbase/workspace/database/mongo/MongoWorkspaceDB.java b/src/main/java/us/kbase/workspace/database/mongo/MongoWorkspaceDB.java similarity index 100% rename from src/us/kbase/workspace/database/mongo/MongoWorkspaceDB.java rename to src/main/java/us/kbase/workspace/database/mongo/MongoWorkspaceDB.java diff --git a/src/us/kbase/workspace/database/mongo/ObjectIDResolvedWSNoVer.java b/src/main/java/us/kbase/workspace/database/mongo/ObjectIDResolvedWSNoVer.java similarity index 100% rename from src/us/kbase/workspace/database/mongo/ObjectIDResolvedWSNoVer.java rename to src/main/java/us/kbase/workspace/database/mongo/ObjectIDResolvedWSNoVer.java diff --git a/src/us/kbase/workspace/database/mongo/ObjectInfoUtils.java b/src/main/java/us/kbase/workspace/database/mongo/ObjectInfoUtils.java similarity index 100% rename from src/us/kbase/workspace/database/mongo/ObjectInfoUtils.java rename to src/main/java/us/kbase/workspace/database/mongo/ObjectInfoUtils.java diff --git a/src/us/kbase/workspace/database/mongo/ObjectLister.java b/src/main/java/us/kbase/workspace/database/mongo/ObjectLister.java similarity index 100% rename from src/us/kbase/workspace/database/mongo/ObjectLister.java rename to src/main/java/us/kbase/workspace/database/mongo/ObjectLister.java diff --git a/src/us/kbase/workspace/database/mongo/ObjectSavePackage.java b/src/main/java/us/kbase/workspace/database/mongo/ObjectSavePackage.java similarity index 100% rename from src/us/kbase/workspace/database/mongo/ObjectSavePackage.java rename to src/main/java/us/kbase/workspace/database/mongo/ObjectSavePackage.java diff --git a/src/us/kbase/workspace/database/mongo/QueryMethods.java b/src/main/java/us/kbase/workspace/database/mongo/QueryMethods.java similarity index 100% rename from src/us/kbase/workspace/database/mongo/QueryMethods.java rename to src/main/java/us/kbase/workspace/database/mongo/QueryMethods.java diff --git a/src/us/kbase/workspace/database/mongo/S3BlobStore.java b/src/main/java/us/kbase/workspace/database/mongo/S3BlobStore.java similarity index 100% rename from src/us/kbase/workspace/database/mongo/S3BlobStore.java rename to src/main/java/us/kbase/workspace/database/mongo/S3BlobStore.java diff --git a/src/us/kbase/workspace/database/mongo/S3ClientWithPresign.java b/src/main/java/us/kbase/workspace/database/mongo/S3ClientWithPresign.java similarity index 100% rename from src/us/kbase/workspace/database/mongo/S3ClientWithPresign.java rename to src/main/java/us/kbase/workspace/database/mongo/S3ClientWithPresign.java diff --git a/src/us/kbase/workspace/database/mongo/SchemaUpdater.java b/src/main/java/us/kbase/workspace/database/mongo/SchemaUpdater.java similarity index 100% rename from src/us/kbase/workspace/database/mongo/SchemaUpdater.java rename to src/main/java/us/kbase/workspace/database/mongo/SchemaUpdater.java diff --git a/src/us/kbase/workspace/database/mongo/exceptions/BlobStoreAuthorizationException.java b/src/main/java/us/kbase/workspace/database/mongo/exceptions/BlobStoreAuthorizationException.java similarity index 100% rename from src/us/kbase/workspace/database/mongo/exceptions/BlobStoreAuthorizationException.java rename to src/main/java/us/kbase/workspace/database/mongo/exceptions/BlobStoreAuthorizationException.java diff --git a/src/us/kbase/workspace/database/mongo/exceptions/BlobStoreCommunicationException.java b/src/main/java/us/kbase/workspace/database/mongo/exceptions/BlobStoreCommunicationException.java similarity index 100% rename from src/us/kbase/workspace/database/mongo/exceptions/BlobStoreCommunicationException.java rename to src/main/java/us/kbase/workspace/database/mongo/exceptions/BlobStoreCommunicationException.java diff --git a/src/us/kbase/workspace/database/mongo/exceptions/BlobStoreException.java b/src/main/java/us/kbase/workspace/database/mongo/exceptions/BlobStoreException.java similarity index 100% rename from src/us/kbase/workspace/database/mongo/exceptions/BlobStoreException.java rename to src/main/java/us/kbase/workspace/database/mongo/exceptions/BlobStoreException.java diff --git a/src/us/kbase/workspace/database/mongo/exceptions/NoSuchBlobException.java b/src/main/java/us/kbase/workspace/database/mongo/exceptions/NoSuchBlobException.java similarity index 100% rename from src/us/kbase/workspace/database/mongo/exceptions/NoSuchBlobException.java rename to src/main/java/us/kbase/workspace/database/mongo/exceptions/NoSuchBlobException.java diff --git a/src/us/kbase/workspace/database/provenance/Common.java b/src/main/java/us/kbase/workspace/database/provenance/Common.java similarity index 100% rename from src/us/kbase/workspace/database/provenance/Common.java rename to src/main/java/us/kbase/workspace/database/provenance/Common.java diff --git a/src/us/kbase/workspace/database/provenance/ExternalData.java b/src/main/java/us/kbase/workspace/database/provenance/ExternalData.java similarity index 100% rename from src/us/kbase/workspace/database/provenance/ExternalData.java rename to src/main/java/us/kbase/workspace/database/provenance/ExternalData.java diff --git a/src/us/kbase/workspace/database/provenance/Provenance.java b/src/main/java/us/kbase/workspace/database/provenance/Provenance.java similarity index 100% rename from src/us/kbase/workspace/database/provenance/Provenance.java rename to src/main/java/us/kbase/workspace/database/provenance/Provenance.java diff --git a/src/us/kbase/workspace/database/provenance/ProvenanceAction.java b/src/main/java/us/kbase/workspace/database/provenance/ProvenanceAction.java similarity index 100% rename from src/us/kbase/workspace/database/provenance/ProvenanceAction.java rename to src/main/java/us/kbase/workspace/database/provenance/ProvenanceAction.java diff --git a/src/us/kbase/workspace/database/provenance/SubAction.java b/src/main/java/us/kbase/workspace/database/provenance/SubAction.java similarity index 100% rename from src/us/kbase/workspace/database/provenance/SubAction.java rename to src/main/java/us/kbase/workspace/database/provenance/SubAction.java diff --git a/src/us/kbase/workspace/database/refsearch/ReferenceGraphSearch.java b/src/main/java/us/kbase/workspace/database/refsearch/ReferenceGraphSearch.java similarity index 100% rename from src/us/kbase/workspace/database/refsearch/ReferenceGraphSearch.java rename to src/main/java/us/kbase/workspace/database/refsearch/ReferenceGraphSearch.java diff --git a/src/us/kbase/workspace/database/refsearch/ReferenceGraphTopologyProvider.java b/src/main/java/us/kbase/workspace/database/refsearch/ReferenceGraphTopologyProvider.java similarity index 100% rename from src/us/kbase/workspace/database/refsearch/ReferenceGraphTopologyProvider.java rename to src/main/java/us/kbase/workspace/database/refsearch/ReferenceGraphTopologyProvider.java diff --git a/src/us/kbase/workspace/database/refsearch/ReferenceProviderException.java b/src/main/java/us/kbase/workspace/database/refsearch/ReferenceProviderException.java similarity index 100% rename from src/us/kbase/workspace/database/refsearch/ReferenceProviderException.java rename to src/main/java/us/kbase/workspace/database/refsearch/ReferenceProviderException.java diff --git a/src/us/kbase/workspace/database/refsearch/ReferenceSearchFailedException.java b/src/main/java/us/kbase/workspace/database/refsearch/ReferenceSearchFailedException.java similarity index 100% rename from src/us/kbase/workspace/database/refsearch/ReferenceSearchFailedException.java rename to src/main/java/us/kbase/workspace/database/refsearch/ReferenceSearchFailedException.java diff --git a/src/us/kbase/workspace/database/refsearch/ReferenceSearchMaximumSizeExceededException.java b/src/main/java/us/kbase/workspace/database/refsearch/ReferenceSearchMaximumSizeExceededException.java similarity index 100% rename from src/us/kbase/workspace/database/refsearch/ReferenceSearchMaximumSizeExceededException.java rename to src/main/java/us/kbase/workspace/database/refsearch/ReferenceSearchMaximumSizeExceededException.java diff --git a/src/us/kbase/workspace/database/refsearch/ReferenceSearchTree.java b/src/main/java/us/kbase/workspace/database/refsearch/ReferenceSearchTree.java similarity index 100% rename from src/us/kbase/workspace/database/refsearch/ReferenceSearchTree.java rename to src/main/java/us/kbase/workspace/database/refsearch/ReferenceSearchTree.java diff --git a/src/us/kbase/workspace/database/refsearch/ReferenceTreeNode.java b/src/main/java/us/kbase/workspace/database/refsearch/ReferenceTreeNode.java similarity index 100% rename from src/us/kbase/workspace/database/refsearch/ReferenceTreeNode.java rename to src/main/java/us/kbase/workspace/database/refsearch/ReferenceTreeNode.java diff --git a/src/us/kbase/workspace/docserver/DocServer.java b/src/main/java/us/kbase/workspace/docserver/DocServer.java similarity index 100% rename from src/us/kbase/workspace/docserver/DocServer.java rename to src/main/java/us/kbase/workspace/docserver/DocServer.java diff --git a/src/us/kbase/workspace/exceptions/WorkspaceAuthorizationException.java b/src/main/java/us/kbase/workspace/exceptions/WorkspaceAuthorizationException.java similarity index 100% rename from src/us/kbase/workspace/exceptions/WorkspaceAuthorizationException.java rename to src/main/java/us/kbase/workspace/exceptions/WorkspaceAuthorizationException.java diff --git a/src/us/kbase/workspace/exceptions/WorkspaceException.java b/src/main/java/us/kbase/workspace/exceptions/WorkspaceException.java similarity index 100% rename from src/us/kbase/workspace/exceptions/WorkspaceException.java rename to src/main/java/us/kbase/workspace/exceptions/WorkspaceException.java diff --git a/src/us/kbase/workspace/gitcommit/GitCommit.java b/src/main/java/us/kbase/workspace/gitcommit/GitCommit.java similarity index 100% rename from src/us/kbase/workspace/gitcommit/GitCommit.java rename to src/main/java/us/kbase/workspace/gitcommit/GitCommit.java diff --git a/src/us/kbase/workspace/kbase/ArgUtils.java b/src/main/java/us/kbase/workspace/kbase/ArgUtils.java similarity index 100% rename from src/us/kbase/workspace/kbase/ArgUtils.java rename to src/main/java/us/kbase/workspace/kbase/ArgUtils.java diff --git a/src/us/kbase/workspace/kbase/BackendType.java b/src/main/java/us/kbase/workspace/kbase/BackendType.java similarity index 100% rename from src/us/kbase/workspace/kbase/BackendType.java rename to src/main/java/us/kbase/workspace/kbase/BackendType.java diff --git a/src/us/kbase/workspace/kbase/BytestreamIdHandlerFactory.java b/src/main/java/us/kbase/workspace/kbase/BytestreamIdHandlerFactory.java similarity index 100% rename from src/us/kbase/workspace/kbase/BytestreamIdHandlerFactory.java rename to src/main/java/us/kbase/workspace/kbase/BytestreamIdHandlerFactory.java diff --git a/src/us/kbase/workspace/kbase/DelegatingTypeProvider.java b/src/main/java/us/kbase/workspace/kbase/DelegatingTypeProvider.java similarity index 100% rename from src/us/kbase/workspace/kbase/DelegatingTypeProvider.java rename to src/main/java/us/kbase/workspace/kbase/DelegatingTypeProvider.java diff --git a/src/us/kbase/workspace/kbase/HandleIdHandlerFactory.java b/src/main/java/us/kbase/workspace/kbase/HandleIdHandlerFactory.java similarity index 100% rename from src/us/kbase/workspace/kbase/HandleIdHandlerFactory.java rename to src/main/java/us/kbase/workspace/kbase/HandleIdHandlerFactory.java diff --git a/src/us/kbase/workspace/kbase/IdentifierUtils.java b/src/main/java/us/kbase/workspace/kbase/IdentifierUtils.java similarity index 100% rename from src/us/kbase/workspace/kbase/IdentifierUtils.java rename to src/main/java/us/kbase/workspace/kbase/IdentifierUtils.java diff --git a/src/us/kbase/workspace/kbase/InitWorkspaceServer.java b/src/main/java/us/kbase/workspace/kbase/InitWorkspaceServer.java similarity index 100% rename from src/us/kbase/workspace/kbase/InitWorkspaceServer.java rename to src/main/java/us/kbase/workspace/kbase/InitWorkspaceServer.java diff --git a/src/us/kbase/workspace/kbase/KBasePermissions.java b/src/main/java/us/kbase/workspace/kbase/KBasePermissions.java similarity index 100% rename from src/us/kbase/workspace/kbase/KBasePermissions.java rename to src/main/java/us/kbase/workspace/kbase/KBasePermissions.java diff --git a/src/us/kbase/workspace/kbase/KBaseWorkspaceConfig.java b/src/main/java/us/kbase/workspace/kbase/KBaseWorkspaceConfig.java similarity index 100% rename from src/us/kbase/workspace/kbase/KBaseWorkspaceConfig.java rename to src/main/java/us/kbase/workspace/kbase/KBaseWorkspaceConfig.java diff --git a/src/us/kbase/workspace/kbase/LocalTypeServerMethods.java b/src/main/java/us/kbase/workspace/kbase/LocalTypeServerMethods.java similarity index 100% rename from src/us/kbase/workspace/kbase/LocalTypeServerMethods.java rename to src/main/java/us/kbase/workspace/kbase/LocalTypeServerMethods.java diff --git a/src/us/kbase/workspace/kbase/SampleIdHandlerFactory.java b/src/main/java/us/kbase/workspace/kbase/SampleIdHandlerFactory.java similarity index 100% rename from src/us/kbase/workspace/kbase/SampleIdHandlerFactory.java rename to src/main/java/us/kbase/workspace/kbase/SampleIdHandlerFactory.java diff --git a/src/us/kbase/workspace/kbase/SchemaUpdaterCLI.java b/src/main/java/us/kbase/workspace/kbase/SchemaUpdaterCLI.java similarity index 100% rename from src/us/kbase/workspace/kbase/SchemaUpdaterCLI.java rename to src/main/java/us/kbase/workspace/kbase/SchemaUpdaterCLI.java diff --git a/src/us/kbase/workspace/kbase/TypeClient.java b/src/main/java/us/kbase/workspace/kbase/TypeClient.java similarity index 100% rename from src/us/kbase/workspace/kbase/TypeClient.java rename to src/main/java/us/kbase/workspace/kbase/TypeClient.java diff --git a/src/us/kbase/workspace/kbase/TypeDelegationException.java b/src/main/java/us/kbase/workspace/kbase/TypeDelegationException.java similarity index 100% rename from src/us/kbase/workspace/kbase/TypeDelegationException.java rename to src/main/java/us/kbase/workspace/kbase/TypeDelegationException.java diff --git a/src/us/kbase/workspace/kbase/TypeServerMethods.java b/src/main/java/us/kbase/workspace/kbase/TypeServerMethods.java similarity index 100% rename from src/us/kbase/workspace/kbase/TypeServerMethods.java rename to src/main/java/us/kbase/workspace/kbase/TypeServerMethods.java diff --git a/src/us/kbase/workspace/kbase/WorkspaceServerMethods.java b/src/main/java/us/kbase/workspace/kbase/WorkspaceServerMethods.java similarity index 100% rename from src/us/kbase/workspace/kbase/WorkspaceServerMethods.java rename to src/main/java/us/kbase/workspace/kbase/WorkspaceServerMethods.java diff --git a/src/us/kbase/workspace/kbase/admin/AdminCommand.java b/src/main/java/us/kbase/workspace/kbase/admin/AdminCommand.java similarity index 100% rename from src/us/kbase/workspace/kbase/admin/AdminCommand.java rename to src/main/java/us/kbase/workspace/kbase/admin/AdminCommand.java diff --git a/src/us/kbase/workspace/kbase/admin/AdminRole.java b/src/main/java/us/kbase/workspace/kbase/admin/AdminRole.java similarity index 100% rename from src/us/kbase/workspace/kbase/admin/AdminRole.java rename to src/main/java/us/kbase/workspace/kbase/admin/AdminRole.java diff --git a/src/us/kbase/workspace/kbase/admin/AdministrationCommandSetInstaller.java b/src/main/java/us/kbase/workspace/kbase/admin/AdministrationCommandSetInstaller.java similarity index 100% rename from src/us/kbase/workspace/kbase/admin/AdministrationCommandSetInstaller.java rename to src/main/java/us/kbase/workspace/kbase/admin/AdministrationCommandSetInstaller.java diff --git a/src/us/kbase/workspace/kbase/admin/AdministratorHandler.java b/src/main/java/us/kbase/workspace/kbase/admin/AdministratorHandler.java similarity index 100% rename from src/us/kbase/workspace/kbase/admin/AdministratorHandler.java rename to src/main/java/us/kbase/workspace/kbase/admin/AdministratorHandler.java diff --git a/src/us/kbase/workspace/kbase/admin/AdministratorHandlerException.java b/src/main/java/us/kbase/workspace/kbase/admin/AdministratorHandlerException.java similarity index 100% rename from src/us/kbase/workspace/kbase/admin/AdministratorHandlerException.java rename to src/main/java/us/kbase/workspace/kbase/admin/AdministratorHandlerException.java diff --git a/src/us/kbase/workspace/kbase/admin/DefaultAdminHandler.java b/src/main/java/us/kbase/workspace/kbase/admin/DefaultAdminHandler.java similarity index 100% rename from src/us/kbase/workspace/kbase/admin/DefaultAdminHandler.java rename to src/main/java/us/kbase/workspace/kbase/admin/DefaultAdminHandler.java diff --git a/src/us/kbase/workspace/kbase/admin/KBaseAuth2AdminHandler.java b/src/main/java/us/kbase/workspace/kbase/admin/KBaseAuth2AdminHandler.java similarity index 100% rename from src/us/kbase/workspace/kbase/admin/KBaseAuth2AdminHandler.java rename to src/main/java/us/kbase/workspace/kbase/admin/KBaseAuth2AdminHandler.java diff --git a/src/us/kbase/workspace/kbase/admin/WorkspaceAdministration.java b/src/main/java/us/kbase/workspace/kbase/admin/WorkspaceAdministration.java similarity index 100% rename from src/us/kbase/workspace/kbase/admin/WorkspaceAdministration.java rename to src/main/java/us/kbase/workspace/kbase/admin/WorkspaceAdministration.java diff --git a/src/us/kbase/workspace/listener/ListenerInitializationException.java b/src/main/java/us/kbase/workspace/listener/ListenerInitializationException.java similarity index 100% rename from src/us/kbase/workspace/listener/ListenerInitializationException.java rename to src/main/java/us/kbase/workspace/listener/ListenerInitializationException.java diff --git a/src/us/kbase/workspace/listener/WorkspaceEventListener.java b/src/main/java/us/kbase/workspace/listener/WorkspaceEventListener.java similarity index 100% rename from src/us/kbase/workspace/listener/WorkspaceEventListener.java rename to src/main/java/us/kbase/workspace/listener/WorkspaceEventListener.java diff --git a/src/us/kbase/workspace/listener/WorkspaceEventListenerFactory.java b/src/main/java/us/kbase/workspace/listener/WorkspaceEventListenerFactory.java similarity index 100% rename from src/us/kbase/workspace/listener/WorkspaceEventListenerFactory.java rename to src/main/java/us/kbase/workspace/listener/WorkspaceEventListenerFactory.java diff --git a/src/us/kbase/workspace/listener/package-info.java b/src/main/java/us/kbase/workspace/listener/package-info.java similarity index 100% rename from src/us/kbase/workspace/listener/package-info.java rename to src/main/java/us/kbase/workspace/listener/package-info.java diff --git a/src/us/kbase/workspace/modules/KafkaNotifierFactory.java b/src/main/java/us/kbase/workspace/modules/KafkaNotifierFactory.java similarity index 100% rename from src/us/kbase/workspace/modules/KafkaNotifierFactory.java rename to src/main/java/us/kbase/workspace/modules/KafkaNotifierFactory.java diff --git a/src/us/kbase/workspace/modules/package-info.java b/src/main/java/us/kbase/workspace/modules/package-info.java similarity index 100% rename from src/us/kbase/workspace/modules/package-info.java rename to src/main/java/us/kbase/workspace/modules/package-info.java diff --git a/src/us/kbase/workspace/version/WorkspaceVersion.java b/src/main/java/us/kbase/workspace/version/WorkspaceVersion.java similarity index 100% rename from src/us/kbase/workspace/version/WorkspaceVersion.java rename to src/main/java/us/kbase/workspace/version/WorkspaceVersion.java diff --git a/src/us/kbase/common/test/MapBuilder.java b/src/test/java/us/kbase/test/common/MapBuilder.java similarity index 93% rename from src/us/kbase/common/test/MapBuilder.java rename to src/test/java/us/kbase/test/common/MapBuilder.java index 2654366ed..9331772da 100644 --- a/src/us/kbase/common/test/MapBuilder.java +++ b/src/test/java/us/kbase/test/common/MapBuilder.java @@ -1,4 +1,4 @@ -package us.kbase.common.test; +package us.kbase.test.common; import java.util.HashMap; import java.util.Map; diff --git a/src/us/kbase/common/test/TestCommon.java b/src/test/java/us/kbase/test/common/TestCommon.java similarity index 99% rename from src/us/kbase/common/test/TestCommon.java rename to src/test/java/us/kbase/test/common/TestCommon.java index e89b4f052..ccde18bb4 100644 --- a/src/us/kbase/common/test/TestCommon.java +++ b/src/test/java/us/kbase/test/common/TestCommon.java @@ -1,4 +1,4 @@ -package us.kbase.common.test; +package us.kbase.test.common; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.instanceOf; @@ -37,6 +37,7 @@ import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.classic.spi.IThrowableProxy; import ch.qos.logback.core.AppenderBase; +import us.kbase.common.test.TestException; import us.kbase.typedobj.core.TempFilesManager; public class TestCommon { diff --git a/src/us/kbase/common/test/service/ServiceCheckerTest.java b/src/test/java/us/kbase/test/common/test/service/ServiceCheckerTest.java similarity index 98% rename from src/us/kbase/common/test/service/ServiceCheckerTest.java rename to src/test/java/us/kbase/test/common/test/service/ServiceCheckerTest.java index 86a30d084..9a1a63d55 100644 --- a/src/us/kbase/common/test/service/ServiceCheckerTest.java +++ b/src/test/java/us/kbase/test/common/test/service/ServiceCheckerTest.java @@ -1,4 +1,4 @@ -package us.kbase.common.test.service; +package us.kbase.test.common.test.service; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; diff --git a/src/us/kbase/typedobj/test/AbsoluteTypeDefIdTest.java b/src/test/java/us/kbase/test/typedobj/AbsoluteTypeDefIdTest.java similarity index 96% rename from src/us/kbase/typedobj/test/AbsoluteTypeDefIdTest.java rename to src/test/java/us/kbase/test/typedobj/AbsoluteTypeDefIdTest.java index c2d15400c..945f18421 100644 --- a/src/us/kbase/typedobj/test/AbsoluteTypeDefIdTest.java +++ b/src/test/java/us/kbase/test/typedobj/AbsoluteTypeDefIdTest.java @@ -1,4 +1,4 @@ -package us.kbase.typedobj.test; +package us.kbase.test.typedobj; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; diff --git a/src/us/kbase/typedobj/test/BasicValidationTest.java b/src/test/java/us/kbase/test/typedobj/BasicValidationTest.java similarity index 99% rename from src/us/kbase/typedobj/test/BasicValidationTest.java rename to src/test/java/us/kbase/test/typedobj/BasicValidationTest.java index c034029a4..bf71baa65 100644 --- a/src/us/kbase/typedobj/test/BasicValidationTest.java +++ b/src/test/java/us/kbase/test/typedobj/BasicValidationTest.java @@ -1,4 +1,4 @@ -package us.kbase.typedobj.test; +package us.kbase.test.typedobj; import static org.junit.Assert.*; @@ -32,7 +32,7 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.common.test.TestException; import us.kbase.typedobj.core.LocalTypeProvider; import us.kbase.typedobj.core.TypeDefId; diff --git a/src/us/kbase/typedobj/test/DetailedValidationTest.java b/src/test/java/us/kbase/test/typedobj/DetailedValidationTest.java similarity index 99% rename from src/us/kbase/typedobj/test/DetailedValidationTest.java rename to src/test/java/us/kbase/test/typedobj/DetailedValidationTest.java index bf468f0db..dc481d096 100644 --- a/src/us/kbase/typedobj/test/DetailedValidationTest.java +++ b/src/test/java/us/kbase/test/typedobj/DetailedValidationTest.java @@ -1,4 +1,4 @@ -package us.kbase.typedobj.test; +package us.kbase.test.typedobj; import static org.junit.Assert.*; @@ -36,7 +36,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.common.test.TestException; import us.kbase.typedobj.core.LocalTypeProvider; import us.kbase.typedobj.core.TypeDefId; diff --git a/src/us/kbase/typedobj/test/DummyIdHandlerFactory.java b/src/test/java/us/kbase/test/typedobj/DummyIdHandlerFactory.java similarity index 99% rename from src/us/kbase/typedobj/test/DummyIdHandlerFactory.java rename to src/test/java/us/kbase/test/typedobj/DummyIdHandlerFactory.java index dffaff241..79cf0515e 100644 --- a/src/us/kbase/typedobj/test/DummyIdHandlerFactory.java +++ b/src/test/java/us/kbase/test/typedobj/DummyIdHandlerFactory.java @@ -1,4 +1,4 @@ -package us.kbase.typedobj.test; +package us.kbase.test.typedobj; import java.util.HashMap; import java.util.List; diff --git a/src/us/kbase/typedobj/test/DummyValidatedTypedObject.java b/src/test/java/us/kbase/test/typedobj/DummyValidatedTypedObject.java similarity index 98% rename from src/us/kbase/typedobj/test/DummyValidatedTypedObject.java rename to src/test/java/us/kbase/test/typedobj/DummyValidatedTypedObject.java index 854f7a2b7..202f30a33 100644 --- a/src/us/kbase/typedobj/test/DummyValidatedTypedObject.java +++ b/src/test/java/us/kbase/test/typedobj/DummyValidatedTypedObject.java @@ -1,4 +1,4 @@ -package us.kbase.typedobj.test; +package us.kbase.test.typedobj; import java.util.Collections; import java.util.List; diff --git a/src/us/kbase/typedobj/test/IdProcessingTest.java b/src/test/java/us/kbase/test/typedobj/IdProcessingTest.java similarity index 99% rename from src/us/kbase/typedobj/test/IdProcessingTest.java rename to src/test/java/us/kbase/test/typedobj/IdProcessingTest.java index a25ebd752..79d64a2f1 100644 --- a/src/us/kbase/typedobj/test/IdProcessingTest.java +++ b/src/test/java/us/kbase/test/typedobj/IdProcessingTest.java @@ -1,4 +1,4 @@ -package us.kbase.typedobj.test; +package us.kbase.test.typedobj; import static org.junit.Assert.*; import static org.hamcrest.CoreMatchers.is; @@ -40,7 +40,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.common.test.TestException; import us.kbase.common.utils.sortjson.UTF8JsonSorterFactory; import us.kbase.typedobj.core.LocalTypeProvider; diff --git a/src/us/kbase/typedobj/test/IdRefTokenSequenceProviderTest.java b/src/test/java/us/kbase/test/typedobj/IdRefTokenSequenceProviderTest.java similarity index 99% rename from src/us/kbase/typedobj/test/IdRefTokenSequenceProviderTest.java rename to src/test/java/us/kbase/test/typedobj/IdRefTokenSequenceProviderTest.java index 4ff9155a1..13f0c9fe9 100644 --- a/src/us/kbase/typedobj/test/IdRefTokenSequenceProviderTest.java +++ b/src/test/java/us/kbase/test/typedobj/IdRefTokenSequenceProviderTest.java @@ -1,4 +1,4 @@ -package us.kbase.typedobj.test; +package us.kbase.test.typedobj; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; diff --git a/src/us/kbase/typedobj/test/JsonSchemas.java b/src/test/java/us/kbase/test/typedobj/JsonSchemas.java similarity index 94% rename from src/us/kbase/typedobj/test/JsonSchemas.java rename to src/test/java/us/kbase/test/typedobj/JsonSchemas.java index c63b32c66..214bf7ba6 100644 --- a/src/us/kbase/typedobj/test/JsonSchemas.java +++ b/src/test/java/us/kbase/test/typedobj/JsonSchemas.java @@ -1,4 +1,4 @@ -package us.kbase.typedobj.test; +package us.kbase.test.typedobj; import java.util.Map; @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; -import us.kbase.common.test.MapBuilder; +import us.kbase.test.common.MapBuilder; /** Json schema strings for use in tests. * @author gaprice@lbl.gov diff --git a/src/us/kbase/typedobj/test/JsonTokenValidatorTester.java b/src/test/java/us/kbase/test/typedobj/JsonTokenValidatorTester.java similarity index 98% rename from src/us/kbase/typedobj/test/JsonTokenValidatorTester.java rename to src/test/java/us/kbase/test/typedobj/JsonTokenValidatorTester.java index 800186d2f..59a9d799e 100644 --- a/src/us/kbase/typedobj/test/JsonTokenValidatorTester.java +++ b/src/test/java/us/kbase/test/typedobj/JsonTokenValidatorTester.java @@ -1,4 +1,4 @@ -package us.kbase.typedobj.test; +package us.kbase.test.typedobj; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -16,6 +16,7 @@ import us.kbase.common.service.JsonTokenStream; import us.kbase.common.service.UObject; +import us.kbase.test.typedobj.db.TypeRegisteringTest; import us.kbase.typedobj.core.LocalTypeProvider; import us.kbase.typedobj.core.TypeDefId; import us.kbase.typedobj.core.TypeDefName; @@ -24,7 +25,6 @@ import us.kbase.typedobj.db.MongoTypeStorage; import us.kbase.typedobj.db.TypeDefinitionDB; import us.kbase.typedobj.db.TypeStorage; -import us.kbase.typedobj.db.test.TypeRegisteringTest; import us.kbase.typedobj.idref.IdReferenceHandlerSet; import us.kbase.typedobj.idref.IdReferenceHandlerSetFactory; import us.kbase.typedobj.idref.IdReferenceHandlerSetFactoryBuilder; diff --git a/src/us/kbase/typedobj/test/LocalTypeProviderTest.java b/src/test/java/us/kbase/test/typedobj/LocalTypeProviderTest.java similarity index 96% rename from src/us/kbase/typedobj/test/LocalTypeProviderTest.java rename to src/test/java/us/kbase/test/typedobj/LocalTypeProviderTest.java index e11cc53ec..3688b89e1 100644 --- a/src/us/kbase/typedobj/test/LocalTypeProviderTest.java +++ b/src/test/java/us/kbase/test/typedobj/LocalTypeProviderTest.java @@ -1,4 +1,4 @@ -package us.kbase.typedobj.test; +package us.kbase.test.typedobj; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -8,7 +8,7 @@ import org.junit.Test; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.typedobj.core.AbsoluteTypeDefId; import us.kbase.typedobj.core.LocalTypeProvider; import us.kbase.typedobj.core.TypeDefId; diff --git a/src/us/kbase/typedobj/test/MetadataExtractionTest.java b/src/test/java/us/kbase/test/typedobj/MetadataExtractionTest.java similarity index 99% rename from src/us/kbase/typedobj/test/MetadataExtractionTest.java rename to src/test/java/us/kbase/test/typedobj/MetadataExtractionTest.java index 1b1e473d4..a791b7c5d 100644 --- a/src/us/kbase/typedobj/test/MetadataExtractionTest.java +++ b/src/test/java/us/kbase/test/typedobj/MetadataExtractionTest.java @@ -1,4 +1,4 @@ -package us.kbase.typedobj.test; +package us.kbase.test.typedobj; import static org.junit.Assert.*; @@ -37,7 +37,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.common.test.TestException; import us.kbase.typedobj.core.ExtractedMetadata; import us.kbase.typedobj.core.LocalTypeProvider; diff --git a/src/us/kbase/typedobj/test/ObjectExtractionByPathTest.java b/src/test/java/us/kbase/test/typedobj/ObjectExtractionByPathTest.java similarity index 99% rename from src/us/kbase/typedobj/test/ObjectExtractionByPathTest.java rename to src/test/java/us/kbase/test/typedobj/ObjectExtractionByPathTest.java index 8132113fa..45bce5d64 100644 --- a/src/us/kbase/typedobj/test/ObjectExtractionByPathTest.java +++ b/src/test/java/us/kbase/test/typedobj/ObjectExtractionByPathTest.java @@ -1,4 +1,4 @@ -package us.kbase.typedobj.test; +package us.kbase.test.typedobj; import static org.junit.Assert.*; diff --git a/src/us/kbase/typedobj/test/ProfileBasicValidation.java b/src/test/java/us/kbase/test/typedobj/ProfileBasicValidation.java similarity index 99% rename from src/us/kbase/typedobj/test/ProfileBasicValidation.java rename to src/test/java/us/kbase/test/typedobj/ProfileBasicValidation.java index 8d39f6124..cd0af94d2 100644 --- a/src/us/kbase/typedobj/test/ProfileBasicValidation.java +++ b/src/test/java/us/kbase/test/typedobj/ProfileBasicValidation.java @@ -1,4 +1,4 @@ -package us.kbase.typedobj.test; +package us.kbase.test.typedobj; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -25,6 +25,7 @@ import org.apache.commons.io.FileUtils; +import us.kbase.test.typedobj.db.TypeRegisteringTest; import us.kbase.typedobj.core.LocalTypeProvider; import us.kbase.typedobj.core.TypeDefId; import us.kbase.typedobj.core.TypeDefName; @@ -33,7 +34,6 @@ import us.kbase.typedobj.db.MongoTypeStorage; import us.kbase.typedobj.db.TypeDefinitionDB; import us.kbase.typedobj.db.TypeStorage; -import us.kbase.typedobj.db.test.TypeRegisteringTest; import us.kbase.typedobj.idref.IdReferenceHandlerSet; import us.kbase.typedobj.idref.IdReferenceHandlerSetFactory; import us.kbase.typedobj.idref.IdReferenceHandlerSetFactoryBuilder; diff --git a/src/us/kbase/typedobj/test/TypeDefIdTest.java b/src/test/java/us/kbase/test/typedobj/TypeDefIdTest.java similarity index 93% rename from src/us/kbase/typedobj/test/TypeDefIdTest.java rename to src/test/java/us/kbase/test/typedobj/TypeDefIdTest.java index fe50520cb..2dd60ff05 100644 --- a/src/us/kbase/typedobj/test/TypeDefIdTest.java +++ b/src/test/java/us/kbase/test/typedobj/TypeDefIdTest.java @@ -1,9 +1,9 @@ -package us.kbase.typedobj.test; +package us.kbase.test.typedobj; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import static us.kbase.common.test.TestCommon.assertExceptionCorrect; +import static us.kbase.test.common.TestCommon.assertExceptionCorrect; import org.junit.Test; diff --git a/src/us/kbase/typedobj/test/TypeDefsTest.java b/src/test/java/us/kbase/test/typedobj/TypeDefsTest.java similarity index 99% rename from src/us/kbase/typedobj/test/TypeDefsTest.java rename to src/test/java/us/kbase/test/typedobj/TypeDefsTest.java index 909c911d3..582e55919 100644 --- a/src/us/kbase/typedobj/test/TypeDefsTest.java +++ b/src/test/java/us/kbase/test/typedobj/TypeDefsTest.java @@ -1,4 +1,4 @@ -package us.kbase.typedobj.test; +package us.kbase.test.typedobj; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertFalse; diff --git a/src/us/kbase/typedobj/test/TypeProviderTest.java b/src/test/java/us/kbase/test/typedobj/TypeProviderTest.java similarity index 95% rename from src/us/kbase/typedobj/test/TypeProviderTest.java rename to src/test/java/us/kbase/test/typedobj/TypeProviderTest.java index c87410c9c..efbdfe701 100644 --- a/src/us/kbase/typedobj/test/TypeProviderTest.java +++ b/src/test/java/us/kbase/test/typedobj/TypeProviderTest.java @@ -1,4 +1,4 @@ -package us.kbase.typedobj.test; +package us.kbase.test.typedobj; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -7,7 +7,7 @@ import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.typedobj.core.AbsoluteTypeDefId; import us.kbase.typedobj.core.TypeDefName; import us.kbase.typedobj.core.TypeProvider.ResolvedType; diff --git a/src/us/kbase/typedobj/test/TypedObjectValidationReportTest.java b/src/test/java/us/kbase/test/typedobj/TypedObjectValidationReportTest.java similarity index 99% rename from src/us/kbase/typedobj/test/TypedObjectValidationReportTest.java rename to src/test/java/us/kbase/test/typedobj/TypedObjectValidationReportTest.java index fb7a7e3c7..46f8e9244 100644 --- a/src/us/kbase/typedobj/test/TypedObjectValidationReportTest.java +++ b/src/test/java/us/kbase/test/typedobj/TypedObjectValidationReportTest.java @@ -1,4 +1,4 @@ -package us.kbase.typedobj.test; +package us.kbase.test.typedobj; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -22,8 +22,7 @@ import org.junit.BeforeClass; import org.junit.Test; - -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.common.utils.sortjson.KeyDuplicationException; import us.kbase.common.utils.sortjson.TooManyKeysException; import us.kbase.common.utils.sortjson.UTF8JsonSorterFactory; diff --git a/src/us/kbase/typedobj/db/test/HighLoadParallelTester.java b/src/test/java/us/kbase/test/typedobj/db/HighLoadParallelTester.java similarity index 99% rename from src/us/kbase/typedobj/db/test/HighLoadParallelTester.java rename to src/test/java/us/kbase/test/typedobj/db/HighLoadParallelTester.java index 2c1b3c64b..8e99ca7f7 100644 --- a/src/us/kbase/typedobj/db/test/HighLoadParallelTester.java +++ b/src/test/java/us/kbase/test/typedobj/db/HighLoadParallelTester.java @@ -1,4 +1,4 @@ -package us.kbase.typedobj.db.test; +package us.kbase.test.typedobj.db; import java.io.File; import java.util.ArrayList; diff --git a/src/us/kbase/typedobj/db/test/MongoTypeStorageTest.java b/src/test/java/us/kbase/test/typedobj/db/MongoTypeStorageTest.java similarity index 99% rename from src/us/kbase/typedobj/db/test/MongoTypeStorageTest.java rename to src/test/java/us/kbase/test/typedobj/db/MongoTypeStorageTest.java index 930fd45cd..c08495c8e 100644 --- a/src/us/kbase/typedobj/db/test/MongoTypeStorageTest.java +++ b/src/test/java/us/kbase/test/typedobj/db/MongoTypeStorageTest.java @@ -1,4 +1,4 @@ -package us.kbase.typedobj.db.test; +package us.kbase.test.typedobj.db; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -16,7 +16,7 @@ import com.mongodb.client.MongoClients; import com.mongodb.client.MongoDatabase; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.common.test.controllers.mongo.MongoController; import us.kbase.typedobj.db.ModuleInfo; import us.kbase.typedobj.db.MongoTypeStorage; diff --git a/src/us/kbase/typedobj/db/test/TestTypeStorage.java b/src/test/java/us/kbase/test/typedobj/db/TestTypeStorage.java similarity index 91% rename from src/us/kbase/typedobj/db/test/TestTypeStorage.java rename to src/test/java/us/kbase/test/typedobj/db/TestTypeStorage.java index e1af6daad..cab167475 100644 --- a/src/us/kbase/typedobj/db/test/TestTypeStorage.java +++ b/src/test/java/us/kbase/test/typedobj/db/TestTypeStorage.java @@ -1,4 +1,4 @@ -package us.kbase.typedobj.db.test; +package us.kbase.test.typedobj.db; import java.util.List; diff --git a/src/us/kbase/typedobj/db/test/TestTypeStorageFactory.java b/src/test/java/us/kbase/test/typedobj/db/TestTypeStorageFactory.java similarity index 98% rename from src/us/kbase/typedobj/db/test/TestTypeStorageFactory.java rename to src/test/java/us/kbase/test/typedobj/db/TestTypeStorageFactory.java index 546232e6f..01b01a3e5 100644 --- a/src/us/kbase/typedobj/db/test/TestTypeStorageFactory.java +++ b/src/test/java/us/kbase/test/typedobj/db/TestTypeStorageFactory.java @@ -1,4 +1,4 @@ -package us.kbase.typedobj.db.test; +package us.kbase.test.typedobj.db; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; diff --git a/src/us/kbase/typedobj/db/test/TypeRegisteringTest.java b/src/test/java/us/kbase/test/typedobj/db/TypeRegisteringTest.java similarity index 99% rename from src/us/kbase/typedobj/db/test/TypeRegisteringTest.java rename to src/test/java/us/kbase/test/typedobj/db/TypeRegisteringTest.java index 2a89162fe..3d7464278 100644 --- a/src/us/kbase/typedobj/db/test/TypeRegisteringTest.java +++ b/src/test/java/us/kbase/test/typedobj/db/TypeRegisteringTest.java @@ -1,4 +1,4 @@ -package us.kbase.typedobj.db.test; +package us.kbase.test.typedobj.db; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; @@ -37,7 +37,7 @@ import com.mongodb.client.MongoClients; import com.mongodb.client.MongoDatabase; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.common.test.controllers.mongo.MongoController; import us.kbase.typedobj.core.AbsoluteTypeDefId; import us.kbase.typedobj.core.MD5; diff --git a/src/us/kbase/typedobj/db/test/TypeStorageListener.java b/src/test/java/us/kbase/test/typedobj/db/TypeStorageListener.java similarity index 89% rename from src/us/kbase/typedobj/db/test/TypeStorageListener.java rename to src/test/java/us/kbase/test/typedobj/db/TypeStorageListener.java index ea7aee145..5e4d4400a 100644 --- a/src/us/kbase/typedobj/db/test/TypeStorageListener.java +++ b/src/test/java/us/kbase/test/typedobj/db/TypeStorageListener.java @@ -1,4 +1,4 @@ -package us.kbase.typedobj.db.test; +package us.kbase.test.typedobj.db; import us.kbase.typedobj.exceptions.TypeStorageException; diff --git a/src/us/kbase/typedobj/test/idref/IdReferenceHandlerSetFactoryBuilderTest.java b/src/test/java/us/kbase/test/typedobj/idref/IdReferenceHandlerSetFactoryBuilderTest.java similarity index 98% rename from src/us/kbase/typedobj/test/idref/IdReferenceHandlerSetFactoryBuilderTest.java rename to src/test/java/us/kbase/test/typedobj/idref/IdReferenceHandlerSetFactoryBuilderTest.java index 5dd44f27c..f14895077 100644 --- a/src/us/kbase/typedobj/test/idref/IdReferenceHandlerSetFactoryBuilderTest.java +++ b/src/test/java/us/kbase/test/typedobj/idref/IdReferenceHandlerSetFactoryBuilderTest.java @@ -1,4 +1,4 @@ -package us.kbase.typedobj.test.idref; +package us.kbase.test.typedobj.idref; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -7,7 +7,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import static us.kbase.common.test.TestCommon.set; +import static us.kbase.test.common.TestCommon.set; import java.util.Arrays; import java.util.Collections; @@ -15,7 +15,7 @@ import org.junit.Test; import us.kbase.auth.AuthToken; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.typedobj.idref.IdReference; import us.kbase.typedobj.idref.IdReferenceHandlerSet; import us.kbase.typedobj.idref.IdReferenceHandlerSet.IdReferenceHandler; diff --git a/src/us/kbase/typedobj/test/idref/IdReferencePermissionHandlerSetTest.java b/src/test/java/us/kbase/test/typedobj/idref/IdReferencePermissionHandlerSetTest.java similarity index 98% rename from src/us/kbase/typedobj/test/idref/IdReferencePermissionHandlerSetTest.java rename to src/test/java/us/kbase/test/typedobj/idref/IdReferencePermissionHandlerSetTest.java index c6d89b19b..899d83709 100644 --- a/src/us/kbase/typedobj/test/idref/IdReferencePermissionHandlerSetTest.java +++ b/src/test/java/us/kbase/test/typedobj/idref/IdReferencePermissionHandlerSetTest.java @@ -1,4 +1,4 @@ -package us.kbase.typedobj.test.idref; +package us.kbase.test.typedobj.idref; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -7,13 +7,13 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import static us.kbase.common.test.TestCommon.set; +import static us.kbase.test.common.TestCommon.set; import java.util.Collection; import org.junit.Test; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.typedobj.idref.IdReferenceHandlerSetFactory.IdReferenceHandlerFactory; import us.kbase.typedobj.idref.IdReferenceHandlerSetFactoryBuilder; import us.kbase.typedobj.idref.IdReferencePermissionHandlerSet; diff --git a/src/us/kbase/typedobj/test/idref/IdReferenceTypeTest.java b/src/test/java/us/kbase/test/typedobj/idref/IdReferenceTypeTest.java similarity index 96% rename from src/us/kbase/typedobj/test/idref/IdReferenceTypeTest.java rename to src/test/java/us/kbase/test/typedobj/idref/IdReferenceTypeTest.java index 7e55acd98..3ac80cc47 100644 --- a/src/us/kbase/typedobj/test/idref/IdReferenceTypeTest.java +++ b/src/test/java/us/kbase/test/typedobj/idref/IdReferenceTypeTest.java @@ -1,4 +1,4 @@ -package us.kbase.typedobj.test.idref; +package us.kbase.test.typedobj.idref; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -9,7 +9,7 @@ import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.typedobj.idref.IdReferenceType; public class IdReferenceTypeTest { diff --git a/src/us/kbase/workspace/test/JsonTokenStreamOCStat.java b/src/test/java/us/kbase/test/workspace/JsonTokenStreamOCStat.java similarity index 97% rename from src/us/kbase/workspace/test/JsonTokenStreamOCStat.java rename to src/test/java/us/kbase/test/workspace/JsonTokenStreamOCStat.java index 525f55081..0700322b9 100644 --- a/src/us/kbase/workspace/test/JsonTokenStreamOCStat.java +++ b/src/test/java/us/kbase/test/workspace/JsonTokenStreamOCStat.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test; +package us.kbase.test.workspace; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/us/kbase/workspace/test/LongTextForTestUsage.java b/src/test/java/us/kbase/test/workspace/LongTextForTestUsage.java similarity index 96% rename from src/us/kbase/workspace/test/LongTextForTestUsage.java rename to src/test/java/us/kbase/test/workspace/LongTextForTestUsage.java index 78b9d3015..5e446cd7f 100644 --- a/src/us/kbase/workspace/test/LongTextForTestUsage.java +++ b/src/test/java/us/kbase/test/workspace/LongTextForTestUsage.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test; +package us.kbase.test.workspace; public class LongTextForTestUsage { diff --git a/src/us/kbase/workspace/test/UpdateOptionsMatcher.java b/src/test/java/us/kbase/test/workspace/UpdateOptionsMatcher.java similarity index 96% rename from src/us/kbase/workspace/test/UpdateOptionsMatcher.java rename to src/test/java/us/kbase/test/workspace/UpdateOptionsMatcher.java index 56fcf4506..7ad983057 100644 --- a/src/us/kbase/workspace/test/UpdateOptionsMatcher.java +++ b/src/test/java/us/kbase/test/workspace/UpdateOptionsMatcher.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test; +package us.kbase.test.workspace; import org.mockito.ArgumentMatcher; diff --git a/src/us/kbase/workspace/test/WorkspaceMongoIndex.java b/src/test/java/us/kbase/test/workspace/WorkspaceMongoIndex.java similarity index 96% rename from src/us/kbase/workspace/test/WorkspaceMongoIndex.java rename to src/test/java/us/kbase/test/workspace/WorkspaceMongoIndex.java index 78959c14f..d4921cc5d 100644 --- a/src/us/kbase/workspace/test/WorkspaceMongoIndex.java +++ b/src/test/java/us/kbase/test/workspace/WorkspaceMongoIndex.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test; +package us.kbase.test.workspace; import com.mongodb.client.MongoDatabase; import org.bson.Document; diff --git a/src/us/kbase/workspace/test/WorkspaceServerThread.java b/src/test/java/us/kbase/test/workspace/WorkspaceServerThread.java similarity index 92% rename from src/us/kbase/workspace/test/WorkspaceServerThread.java rename to src/test/java/us/kbase/test/workspace/WorkspaceServerThread.java index d1966e406..6523f1029 100644 --- a/src/us/kbase/workspace/test/WorkspaceServerThread.java +++ b/src/test/java/us/kbase/test/workspace/WorkspaceServerThread.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test; +package us.kbase.test.workspace; import us.kbase.workspace.WorkspaceServer; diff --git a/src/us/kbase/workspace/test/WorkspaceTestCommon.java b/src/test/java/us/kbase/test/workspace/WorkspaceTestCommon.java similarity index 97% rename from src/us/kbase/workspace/test/WorkspaceTestCommon.java rename to src/test/java/us/kbase/test/workspace/WorkspaceTestCommon.java index 43d504ed9..4d70e622b 100644 --- a/src/us/kbase/workspace/test/WorkspaceTestCommon.java +++ b/src/test/java/us/kbase/test/workspace/WorkspaceTestCommon.java @@ -1,6 +1,6 @@ -package us.kbase.workspace.test; +package us.kbase.test.workspace; -import static us.kbase.common.test.TestCommon.now; +import static us.kbase.test.common.TestCommon.now; import java.util.Arrays; import java.util.Map; diff --git a/src/us/kbase/workspace/test/controllers/arango/ArangoController.java b/src/test/java/us/kbase/test/workspace/controllers/arango/ArangoController.java similarity index 98% rename from src/us/kbase/workspace/test/controllers/arango/ArangoController.java rename to src/test/java/us/kbase/test/workspace/controllers/arango/ArangoController.java index ef852ea84..4b80b519f 100644 --- a/src/us/kbase/workspace/test/controllers/arango/ArangoController.java +++ b/src/test/java/us/kbase/test/workspace/controllers/arango/ArangoController.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.controllers.arango; +package us.kbase.test.workspace.controllers.arango; import static us.kbase.common.test.controllers.ControllerCommon.checkExe; import static us.kbase.common.test.controllers.ControllerCommon.findFreePort; diff --git a/src/us/kbase/workspace/test/controllers/blobstore/BlobstoreController.java b/src/test/java/us/kbase/test/workspace/controllers/blobstore/BlobstoreController.java similarity index 98% rename from src/us/kbase/workspace/test/controllers/blobstore/BlobstoreController.java rename to src/test/java/us/kbase/test/workspace/controllers/blobstore/BlobstoreController.java index 1c6bb2961..856a32b0b 100644 --- a/src/us/kbase/workspace/test/controllers/blobstore/BlobstoreController.java +++ b/src/test/java/us/kbase/test/workspace/controllers/blobstore/BlobstoreController.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.controllers.blobstore; +package us.kbase.test.workspace.controllers.blobstore; import static us.kbase.common.test.controllers.ControllerCommon.checkExe; import static us.kbase.common.test.controllers.ControllerCommon.findFreePort; diff --git a/src/us/kbase/workspace/test/controllers/handle/HandleServiceController.java b/src/test/java/us/kbase/test/workspace/controllers/handle/HandleServiceController.java similarity index 98% rename from src/us/kbase/workspace/test/controllers/handle/HandleServiceController.java rename to src/test/java/us/kbase/test/workspace/controllers/handle/HandleServiceController.java index e38d10008..963d94163 100644 --- a/src/us/kbase/workspace/test/controllers/handle/HandleServiceController.java +++ b/src/test/java/us/kbase/test/workspace/controllers/handle/HandleServiceController.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.controllers.handle; +package us.kbase.test.workspace.controllers.handle; import static us.kbase.common.test.controllers.ControllerCommon.findFreePort; import static us.kbase.common.test.controllers.ControllerCommon.makeTempDirs; diff --git a/src/us/kbase/workspace/test/controllers/minio/MinioController.java b/src/test/java/us/kbase/test/workspace/controllers/minio/MinioController.java similarity index 98% rename from src/us/kbase/workspace/test/controllers/minio/MinioController.java rename to src/test/java/us/kbase/test/workspace/controllers/minio/MinioController.java index 0a57f983c..f8bfe04be 100644 --- a/src/us/kbase/workspace/test/controllers/minio/MinioController.java +++ b/src/test/java/us/kbase/test/workspace/controllers/minio/MinioController.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.controllers.minio; +package us.kbase.test.workspace.controllers.minio; import static us.kbase.common.test.controllers.ControllerCommon.checkExe; import static us.kbase.common.test.controllers.ControllerCommon.findFreePort; diff --git a/src/us/kbase/workspace/test/controllers/sample/SampleServiceController.java b/src/test/java/us/kbase/test/workspace/controllers/sample/SampleServiceController.java similarity index 98% rename from src/us/kbase/workspace/test/controllers/sample/SampleServiceController.java rename to src/test/java/us/kbase/test/workspace/controllers/sample/SampleServiceController.java index 3b4732cdf..ea568e189 100644 --- a/src/us/kbase/workspace/test/controllers/sample/SampleServiceController.java +++ b/src/test/java/us/kbase/test/workspace/controllers/sample/SampleServiceController.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.controllers.sample; +package us.kbase.test.workspace.controllers.sample; import static us.kbase.common.test.controllers.ControllerCommon.findFreePort; import static us.kbase.common.test.controllers.ControllerCommon.makeTempDirs; @@ -17,7 +17,7 @@ import org.ini4j.Ini; import org.ini4j.Profile.Section; -import us.kbase.workspace.test.controllers.arango.ArangoController; +import us.kbase.test.workspace.controllers.arango.ArangoController; /** Q&D Utility to run the Sample Service for the purposes of testing from Java. * @author gaprice@lbl.gov diff --git a/src/us/kbase/workspace/test/controllers/workspace/WorkspaceController.java b/src/test/java/us/kbase/test/workspace/controllers/workspace/WorkspaceController.java similarity index 98% rename from src/us/kbase/workspace/test/controllers/workspace/WorkspaceController.java rename to src/test/java/us/kbase/test/workspace/controllers/workspace/WorkspaceController.java index 0cd2e0e73..aae6691b6 100644 --- a/src/us/kbase/workspace/test/controllers/workspace/WorkspaceController.java +++ b/src/test/java/us/kbase/test/workspace/controllers/workspace/WorkspaceController.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.controllers.workspace; +package us.kbase.test.workspace.controllers.workspace; import static us.kbase.common.test.controllers.ControllerCommon.findFreePort; import static us.kbase.common.test.controllers.ControllerCommon.makeTempDirs; diff --git a/src/us/kbase/workspace/test/database/DependencyStatusTest.java b/src/test/java/us/kbase/test/workspace/database/DependencyStatusTest.java similarity index 97% rename from src/us/kbase/workspace/test/database/DependencyStatusTest.java rename to src/test/java/us/kbase/test/workspace/database/DependencyStatusTest.java index 07dca2589..57c758e28 100644 --- a/src/us/kbase/workspace/test/database/DependencyStatusTest.java +++ b/src/test/java/us/kbase/test/workspace/database/DependencyStatusTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.database; +package us.kbase.test.workspace.database; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; diff --git a/src/us/kbase/workspace/test/database/UtilTest.java b/src/test/java/us/kbase/test/workspace/database/UtilTest.java similarity index 98% rename from src/us/kbase/workspace/test/database/UtilTest.java rename to src/test/java/us/kbase/test/workspace/database/UtilTest.java index f1666bb7f..2086d077e 100644 --- a/src/us/kbase/workspace/test/database/UtilTest.java +++ b/src/test/java/us/kbase/test/workspace/database/UtilTest.java @@ -1,9 +1,9 @@ -package us.kbase.workspace.test.database; +package us.kbase.test.workspace.database; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import static us.kbase.common.test.TestCommon.list; +import static us.kbase.test.common.TestCommon.list; import java.util.Map; import java.util.HashMap; @@ -14,7 +14,7 @@ import org.junit.Test; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.workspace.database.Util; public class UtilTest { diff --git a/src/us/kbase/workspace/test/database/mongo/GridFSBlobStoreTest.java b/src/test/java/us/kbase/test/workspace/database/mongo/GridFSBlobStoreTest.java similarity index 98% rename from src/us/kbase/workspace/test/database/mongo/GridFSBlobStoreTest.java rename to src/test/java/us/kbase/test/workspace/database/mongo/GridFSBlobStoreTest.java index e98e112f6..104f3a86c 100644 --- a/src/us/kbase/workspace/test/database/mongo/GridFSBlobStoreTest.java +++ b/src/test/java/us/kbase/test/workspace/database/mongo/GridFSBlobStoreTest.java @@ -1,11 +1,11 @@ -package us.kbase.workspace.test.database.mongo; +package us.kbase.test.workspace.database.mongo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static us.kbase.common.test.TestCommon.assertExceptionCorrect; +import static us.kbase.test.common.TestCommon.assertExceptionCorrect; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -32,7 +32,7 @@ import com.mongodb.client.gridfs.GridFSBuckets; import com.mongodb.client.gridfs.model.GridFSUploadOptions; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.common.test.controllers.mongo.MongoController; import us.kbase.typedobj.core.MD5; import us.kbase.typedobj.core.Restreamable; diff --git a/src/us/kbase/workspace/test/database/mongo/MongoInternalsTest.java b/src/test/java/us/kbase/test/workspace/database/mongo/MongoInternalsTest.java similarity index 99% rename from src/us/kbase/workspace/test/database/mongo/MongoInternalsTest.java rename to src/test/java/us/kbase/test/workspace/database/mongo/MongoInternalsTest.java index d2fe6af53..f087c740e 100644 --- a/src/us/kbase/workspace/test/database/mongo/MongoInternalsTest.java +++ b/src/test/java/us/kbase/test/workspace/database/mongo/MongoInternalsTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.database.mongo; +package us.kbase.test.workspace.database.mongo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; @@ -6,10 +6,10 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static us.kbase.common.test.TestCommon.now; -import static us.kbase.common.test.TestCommon.assertCloseToNow; -import static us.kbase.common.test.TestCommon.assertExceptionCorrect; -import static us.kbase.workspace.test.WorkspaceTestCommon.basicProv; +import static us.kbase.test.common.TestCommon.assertCloseToNow; +import static us.kbase.test.common.TestCommon.assertExceptionCorrect; +import static us.kbase.test.common.TestCommon.now; +import static us.kbase.test.workspace.WorkspaceTestCommon.basicProv; import java.io.File; import java.lang.reflect.Constructor; @@ -38,9 +38,11 @@ import org.junit.Test; import us.kbase.common.service.UObject; -import us.kbase.common.test.TestCommon; import us.kbase.common.test.controllers.mongo.MongoController; import us.kbase.common.utils.sortjson.UTF8JsonSorterFactory; +import us.kbase.test.common.TestCommon; +import us.kbase.test.typedobj.DummyValidatedTypedObject; +import us.kbase.test.workspace.workspace.WorkspaceTester; import us.kbase.typedobj.core.AbsoluteTypeDefId; import us.kbase.typedobj.core.LocalTypeProvider; import us.kbase.typedobj.core.SubsetSelection; @@ -54,7 +56,6 @@ import us.kbase.typedobj.idref.IdReferenceHandlerSetFactoryBuilder; import us.kbase.typedobj.idref.IdReferenceType; import us.kbase.typedobj.idref.RemappedId; -import us.kbase.typedobj.test.DummyValidatedTypedObject; import us.kbase.workspace.database.ObjectIDNoWSNoVer; import us.kbase.workspace.database.ObjectIDResolvedWS; import us.kbase.workspace.database.ObjectIdentifier; @@ -82,7 +83,6 @@ import us.kbase.workspace.database.mongo.MongoWorkspaceDB; import us.kbase.workspace.database.mongo.ObjectSavePackage; import us.kbase.workspace.database.provenance.Provenance; -import us.kbase.workspace.test.workspace.WorkspaceTester; import com.google.common.collect.ImmutableMap; diff --git a/src/us/kbase/workspace/test/database/mongo/MongoStartUpTest.java b/src/test/java/us/kbase/test/workspace/database/mongo/MongoStartUpTest.java similarity index 98% rename from src/us/kbase/workspace/test/database/mongo/MongoStartUpTest.java rename to src/test/java/us/kbase/test/workspace/database/mongo/MongoStartUpTest.java index eb0386947..a06dfef2f 100644 --- a/src/us/kbase/workspace/test/database/mongo/MongoStartUpTest.java +++ b/src/test/java/us/kbase/test/workspace/database/mongo/MongoStartUpTest.java @@ -1,11 +1,11 @@ -package us.kbase.workspace.test.database.mongo; +package us.kbase.test.workspace.database.mongo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import static us.kbase.common.test.TestCommon.assertExceptionCorrect; -import static us.kbase.common.test.TestCommon.set; -import static us.kbase.workspace.test.WorkspaceMongoIndex.getAndNormalizeIndexes; +import static us.kbase.test.common.TestCommon.assertExceptionCorrect; +import static us.kbase.test.common.TestCommon.set; +import static us.kbase.test.workspace.WorkspaceMongoIndex.getAndNormalizeIndexes; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -29,7 +29,7 @@ import com.mongodb.client.MongoCursor; import com.mongodb.client.MongoDatabase; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.common.test.controllers.mongo.MongoController; import us.kbase.typedobj.core.TypeDefId; import us.kbase.typedobj.core.TypeDefName; diff --git a/src/us/kbase/workspace/test/database/mongo/MongoWorkspaceDBTest.java b/src/test/java/us/kbase/test/workspace/database/mongo/MongoWorkspaceDBTest.java similarity index 99% rename from src/us/kbase/workspace/test/database/mongo/MongoWorkspaceDBTest.java rename to src/test/java/us/kbase/test/workspace/database/mongo/MongoWorkspaceDBTest.java index 602e7366f..a3c2bcc99 100644 --- a/src/us/kbase/workspace/test/database/mongo/MongoWorkspaceDBTest.java +++ b/src/test/java/us/kbase/test/workspace/database/mongo/MongoWorkspaceDBTest.java @@ -1,15 +1,15 @@ -package us.kbase.workspace.test.database.mongo; +package us.kbase.test.workspace.database.mongo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static us.kbase.common.test.TestCommon.inst; -import static us.kbase.common.test.TestCommon.list; -import static us.kbase.common.test.TestCommon.opt; -import static us.kbase.common.test.TestCommon.set; -import static us.kbase.workspace.test.WorkspaceTestCommon.basicProv; +import static us.kbase.test.common.TestCommon.inst; +import static us.kbase.test.common.TestCommon.list; +import static us.kbase.test.common.TestCommon.opt; +import static us.kbase.test.common.TestCommon.set; +import static us.kbase.test.workspace.WorkspaceTestCommon.basicProv; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -44,16 +44,16 @@ import com.mongodb.client.MongoDatabase; import us.kbase.common.service.UObject; -import us.kbase.common.test.TestCommon; import us.kbase.common.test.controllers.mongo.MongoController; import us.kbase.common.utils.sortjson.UTF8JsonSorterFactory; +import us.kbase.test.common.TestCommon; +import us.kbase.test.typedobj.DummyValidatedTypedObject; import us.kbase.typedobj.core.AbsoluteTypeDefId; import us.kbase.typedobj.core.MD5; import us.kbase.typedobj.core.SubsetSelection; import us.kbase.typedobj.core.TypeDefId; import us.kbase.typedobj.core.TypeDefName; import us.kbase.typedobj.exceptions.TypedObjectExtractionException; -import us.kbase.typedobj.test.DummyValidatedTypedObject; import us.kbase.workspace.database.ByteArrayFileCacheManager; import us.kbase.workspace.database.ObjectIDResolvedWS; import us.kbase.workspace.database.ObjectInformation; diff --git a/src/us/kbase/workspace/test/database/mongo/ObjectListerTest.java b/src/test/java/us/kbase/test/workspace/database/mongo/ObjectListerTest.java similarity index 99% rename from src/us/kbase/workspace/test/database/mongo/ObjectListerTest.java rename to src/test/java/us/kbase/test/workspace/database/mongo/ObjectListerTest.java index 6a4bbcf9f..867a32c88 100644 --- a/src/us/kbase/workspace/test/database/mongo/ObjectListerTest.java +++ b/src/test/java/us/kbase/test/workspace/database/mongo/ObjectListerTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.database.mongo; +package us.kbase.test.workspace.database.mongo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -8,8 +8,8 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static us.kbase.common.test.TestCommon.assertExceptionCorrect; -import static us.kbase.common.test.TestCommon.inst; +import static us.kbase.test.common.TestCommon.assertExceptionCorrect; +import static us.kbase.test.common.TestCommon.inst; import java.util.Arrays; import java.util.BitSet; @@ -32,7 +32,7 @@ import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoCursor; -import us.kbase.common.test.MapBuilder; +import us.kbase.test.common.MapBuilder; import us.kbase.typedobj.core.AbsoluteTypeDefId; import us.kbase.typedobj.core.TypeDefId; import us.kbase.typedobj.core.TypeDefName; diff --git a/src/us/kbase/workspace/test/database/mongo/PartialMock.java b/src/test/java/us/kbase/test/workspace/database/mongo/PartialMock.java similarity index 97% rename from src/us/kbase/workspace/test/database/mongo/PartialMock.java rename to src/test/java/us/kbase/test/workspace/database/mongo/PartialMock.java index d9e25cb96..a9f125d36 100644 --- a/src/us/kbase/workspace/test/database/mongo/PartialMock.java +++ b/src/test/java/us/kbase/test/workspace/database/mongo/PartialMock.java @@ -1,8 +1,8 @@ -package us.kbase.workspace.test.database.mongo; +package us.kbase.test.workspace.database.mongo; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static us.kbase.common.test.TestCommon.set; +import static us.kbase.test.common.TestCommon.set; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; diff --git a/src/us/kbase/workspace/test/database/mongo/S3BlobStoreIntegrationTest.java b/src/test/java/us/kbase/test/workspace/database/mongo/S3BlobStoreIntegrationTest.java similarity index 98% rename from src/us/kbase/workspace/test/database/mongo/S3BlobStoreIntegrationTest.java rename to src/test/java/us/kbase/test/workspace/database/mongo/S3BlobStoreIntegrationTest.java index 250d80d56..2def675bd 100644 --- a/src/us/kbase/workspace/test/database/mongo/S3BlobStoreIntegrationTest.java +++ b/src/test/java/us/kbase/test/workspace/database/mongo/S3BlobStoreIntegrationTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.database.mongo; +package us.kbase.test.workspace.database.mongo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.startsWith; @@ -24,8 +24,9 @@ import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.s3.model.DeleteBucketRequest; import software.amazon.awssdk.services.s3.model.PutObjectRequest; -import us.kbase.common.test.TestCommon; import us.kbase.common.test.controllers.mongo.MongoController; +import us.kbase.test.common.TestCommon; +import us.kbase.test.workspace.controllers.minio.MinioController; import us.kbase.typedobj.core.MD5; import us.kbase.typedobj.core.Restreamable; import us.kbase.workspace.database.ByteArrayFileCacheManager; @@ -35,7 +36,6 @@ import us.kbase.workspace.database.mongo.S3ClientWithPresign; import us.kbase.workspace.database.mongo.exceptions.BlobStoreCommunicationException; import us.kbase.workspace.database.mongo.exceptions.NoSuchBlobException; -import us.kbase.workspace.test.controllers.minio.MinioController; public class S3BlobStoreIntegrationTest { diff --git a/src/us/kbase/workspace/test/database/mongo/S3BlobStoreTest.java b/src/test/java/us/kbase/test/workspace/database/mongo/S3BlobStoreTest.java similarity index 99% rename from src/us/kbase/workspace/test/database/mongo/S3BlobStoreTest.java rename to src/test/java/us/kbase/test/workspace/database/mongo/S3BlobStoreTest.java index 78b5e7c69..1541184c2 100644 --- a/src/us/kbase/workspace/test/database/mongo/S3BlobStoreTest.java +++ b/src/test/java/us/kbase/test/workspace/database/mongo/S3BlobStoreTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.database.mongo; +package us.kbase.test.workspace.database.mongo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -12,7 +12,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import static us.kbase.common.test.TestCommon.assertLogEventsCorrect; +import static us.kbase.test.common.TestCommon.assertLogEventsCorrect; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -47,8 +47,9 @@ import software.amazon.awssdk.services.s3.model.HeadObjectResponse; import software.amazon.awssdk.services.s3.model.NoSuchKeyException; import software.amazon.awssdk.services.s3.model.PutObjectRequest; -import us.kbase.common.test.TestCommon; -import us.kbase.common.test.TestCommon.LogEvent; +import us.kbase.test.common.TestCommon; +import us.kbase.test.common.TestCommon.LogEvent; +import us.kbase.test.workspace.UpdateOptionsMatcher; import us.kbase.typedobj.core.MD5; import us.kbase.typedobj.core.Restreamable; import us.kbase.workspace.database.ByteArrayFileCacheManager; @@ -59,7 +60,6 @@ import us.kbase.workspace.database.mongo.S3ClientWithPresign; import us.kbase.workspace.database.mongo.exceptions.BlobStoreCommunicationException; import us.kbase.workspace.database.mongo.exceptions.NoSuchBlobException; -import us.kbase.workspace.test.UpdateOptionsMatcher; public class S3BlobStoreTest { diff --git a/src/us/kbase/workspace/test/database/mongo/SchemaUpdaterTest.java b/src/test/java/us/kbase/test/workspace/database/mongo/SchemaUpdaterTest.java similarity index 98% rename from src/us/kbase/workspace/test/database/mongo/SchemaUpdaterTest.java rename to src/test/java/us/kbase/test/workspace/database/mongo/SchemaUpdaterTest.java index 40298e6ea..a7351de66 100644 --- a/src/us/kbase/workspace/test/database/mongo/SchemaUpdaterTest.java +++ b/src/test/java/us/kbase/test/workspace/database/mongo/SchemaUpdaterTest.java @@ -1,11 +1,11 @@ -package us.kbase.workspace.test.database.mongo; +package us.kbase.test.workspace.database.mongo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; import static org.mockito.Mockito.when; -import static us.kbase.workspace.test.WorkspaceTestCommon.basicProv; -import static us.kbase.workspace.test.WorkspaceMongoIndex.getAndNormalizeIndexes; +import static us.kbase.test.workspace.WorkspaceMongoIndex.getAndNormalizeIndexes; +import static us.kbase.test.workspace.WorkspaceTestCommon.basicProv; import java.nio.file.Paths; import java.time.Instant; @@ -28,7 +28,7 @@ import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.common.test.controllers.mongo.MongoController; import us.kbase.workspace.database.ResolvedWorkspaceID; import us.kbase.workspace.database.WorkspaceUser; diff --git a/src/us/kbase/workspace/test/database/provenance/ExternalDataTest.java b/src/test/java/us/kbase/test/workspace/database/provenance/ExternalDataTest.java similarity index 98% rename from src/us/kbase/workspace/test/database/provenance/ExternalDataTest.java rename to src/test/java/us/kbase/test/workspace/database/provenance/ExternalDataTest.java index 9e7d4721f..380779f2d 100644 --- a/src/us/kbase/workspace/test/database/provenance/ExternalDataTest.java +++ b/src/test/java/us/kbase/test/workspace/database/provenance/ExternalDataTest.java @@ -1,19 +1,18 @@ -package us.kbase.workspace.test.database.provenance; +package us.kbase.test.workspace.database.provenance; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import static us.kbase.common.test.TestCommon.opt; -import static us.kbase.common.test.TestCommon.inst; -import static us.kbase.common.test.TestCommon.ES; +import static us.kbase.test.common.TestCommon.ES; +import static us.kbase.test.common.TestCommon.inst; +import static us.kbase.test.common.TestCommon.opt; import java.net.URL; import java.time.Instant; import java.util.Optional; import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; - -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.workspace.database.provenance.ExternalData; public class ExternalDataTest { diff --git a/src/us/kbase/workspace/test/database/provenance/ProvenanceActionTest.java b/src/test/java/us/kbase/test/workspace/database/provenance/ProvenanceActionTest.java similarity index 99% rename from src/us/kbase/workspace/test/database/provenance/ProvenanceActionTest.java rename to src/test/java/us/kbase/test/workspace/database/provenance/ProvenanceActionTest.java index d5724c47d..7b821c0b7 100644 --- a/src/us/kbase/workspace/test/database/provenance/ProvenanceActionTest.java +++ b/src/test/java/us/kbase/test/workspace/database/provenance/ProvenanceActionTest.java @@ -1,11 +1,11 @@ -package us.kbase.workspace.test.database.provenance; +package us.kbase.test.workspace.database.provenance; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import static us.kbase.common.test.TestCommon.inst; -import static us.kbase.common.test.TestCommon.list; -import static us.kbase.common.test.TestCommon.opt; +import static us.kbase.test.common.TestCommon.inst; +import static us.kbase.test.common.TestCommon.list; +import static us.kbase.test.common.TestCommon.opt; import java.io.ByteArrayOutputStream; import java.time.Instant; @@ -22,8 +22,8 @@ import com.google.common.collect.ImmutableMap; import nl.jqno.equalsverifier.EqualsVerifier; -import us.kbase.common.test.MapBuilder; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.MapBuilder; +import us.kbase.test.common.TestCommon; import us.kbase.workspace.database.WorkspaceUser; import us.kbase.workspace.database.provenance.ExternalData; import us.kbase.workspace.database.provenance.ProvenanceAction; diff --git a/src/us/kbase/workspace/test/database/provenance/ProvenanceTest.java b/src/test/java/us/kbase/test/workspace/database/provenance/ProvenanceTest.java similarity index 97% rename from src/us/kbase/workspace/test/database/provenance/ProvenanceTest.java rename to src/test/java/us/kbase/test/workspace/database/provenance/ProvenanceTest.java index 3ac584850..6e5e9e0c3 100644 --- a/src/us/kbase/workspace/test/database/provenance/ProvenanceTest.java +++ b/src/test/java/us/kbase/test/workspace/database/provenance/ProvenanceTest.java @@ -1,10 +1,10 @@ -package us.kbase.workspace.test.database.provenance; +package us.kbase.test.workspace.database.provenance; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import static us.kbase.common.test.TestCommon.inst; -import static us.kbase.common.test.TestCommon.list; +import static us.kbase.test.common.TestCommon.inst; +import static us.kbase.test.common.TestCommon.list; import java.time.Instant; import java.util.Collections; @@ -13,7 +13,7 @@ import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.workspace.database.WorkspaceUser; import us.kbase.workspace.database.provenance.Provenance; import us.kbase.workspace.database.provenance.ProvenanceAction; diff --git a/src/us/kbase/workspace/test/database/provenance/SubActionTest.java b/src/test/java/us/kbase/test/workspace/database/provenance/SubActionTest.java similarity index 98% rename from src/us/kbase/workspace/test/database/provenance/SubActionTest.java rename to src/test/java/us/kbase/test/workspace/database/provenance/SubActionTest.java index e5b1a098b..48f0b8712 100644 --- a/src/us/kbase/workspace/test/database/provenance/SubActionTest.java +++ b/src/test/java/us/kbase/test/workspace/database/provenance/SubActionTest.java @@ -1,10 +1,10 @@ -package us.kbase.workspace.test.database.provenance; +package us.kbase.test.workspace.database.provenance; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import static us.kbase.common.test.TestCommon.opt; -import static us.kbase.common.test.TestCommon.ES; +import static us.kbase.test.common.TestCommon.ES; +import static us.kbase.test.common.TestCommon.opt; import java.net.URL; import java.util.Optional; @@ -12,7 +12,7 @@ import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.workspace.database.provenance.SubAction; public class SubActionTest { diff --git a/src/us/kbase/workspace/test/docserver/DocServerTest.java b/src/test/java/us/kbase/test/workspace/docserver/DocServerTest.java similarity index 97% rename from src/us/kbase/workspace/test/docserver/DocServerTest.java rename to src/test/java/us/kbase/test/workspace/docserver/DocServerTest.java index 269d67ffb..35c780881 100644 --- a/src/us/kbase/workspace/test/docserver/DocServerTest.java +++ b/src/test/java/us/kbase/test/workspace/docserver/DocServerTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.docserver; +package us.kbase.test.workspace.docserver; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.startsWith; @@ -37,7 +37,7 @@ import us.kbase.common.service.JsonServerSyslog; import us.kbase.common.service.JsonServerSyslog.SyslogOutput; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.workspace.docserver.DocServer; public class DocServerTest { @@ -76,7 +76,7 @@ public static void setUpClass() throws Exception { .toAbsolutePath()); server = createServer("TestDocServer", - "/us/kbase/workspace/test/docserver"); + "/us/kbase/test/workspace/docserver"); iniFile = new File(TestCommon.getenv().get("KB_DEPLOYMENT_CONFIG")); docURL = getServerURL(server); System.out.println("Started doc server at " + docURL); @@ -228,31 +228,31 @@ public void beforeTest() throws Exception { @Test public void serverNameNull() throws Exception { - checkStartup(null, "DocServ", "/us/kbase/workspace/test/docserver", CT_HTML, + checkStartup(null, "DocServ", "/us/kbase/test/workspace/docserver", CT_HTML, IDX1_CONTENTS); } @Test public void serverNameEmpty() throws Exception { - checkStartup("", "DocServ", "/us/kbase/workspace/test/docserver", CT_HTML, IDX1_CONTENTS); + checkStartup("", "DocServ", "/us/kbase/test/workspace/docserver", CT_HTML, IDX1_CONTENTS); } @Test public void docsLocNull() throws Exception { - DocServer.setDefaultDocsLocation("/us/kbase/workspace/test/docserver/files"); + DocServer.setDefaultDocsLocation("/us/kbase/test/workspace/docserver/files"); checkStartup("WhooptyWoo", "WhooptyWoo", null, CT_HTML, IDX2_CONTENTS); } @Test public void docsLocEmpty() throws Exception { - DocServer.setDefaultDocsLocation("/us/kbase/workspace/test/docserver/files"); + DocServer.setDefaultDocsLocation("/us/kbase/test/workspace/docserver/files"); checkStartup("WhooptyWoo", "WhooptyWoo", "", CT_HTML, IDX2_CONTENTS); } @Test public void docsLocNoSlash() throws Exception { checkStartup("WhooptyWoo", "WhooptyWoo", - "us/kbase/workspace/test/docserver/files", CT_HTML, IDX2_CONTENTS); + "us/kbase/test/workspace/docserver/files", CT_HTML, IDX2_CONTENTS); } private void checkStartup( diff --git a/src/us/kbase/workspace/test/docserver/HttpServletRequestMock.java b/src/test/java/us/kbase/test/workspace/docserver/HttpServletRequestMock.java similarity index 99% rename from src/us/kbase/workspace/test/docserver/HttpServletRequestMock.java rename to src/test/java/us/kbase/test/workspace/docserver/HttpServletRequestMock.java index eb83baccb..5e3e6b9fb 100644 --- a/src/us/kbase/workspace/test/docserver/HttpServletRequestMock.java +++ b/src/test/java/us/kbase/test/workspace/docserver/HttpServletRequestMock.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.docserver; +package us.kbase.test.workspace.docserver; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/us/kbase/workspace/test/docserver/HttpServletResponseMock.java b/src/test/java/us/kbase/test/workspace/docserver/HttpServletResponseMock.java similarity index 98% rename from src/us/kbase/workspace/test/docserver/HttpServletResponseMock.java rename to src/test/java/us/kbase/test/workspace/docserver/HttpServletResponseMock.java index 746f7660d..9ee5728ea 100644 --- a/src/us/kbase/workspace/test/docserver/HttpServletResponseMock.java +++ b/src/test/java/us/kbase/test/workspace/docserver/HttpServletResponseMock.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.docserver; +package us.kbase.test.workspace.docserver; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/us/kbase/workspace/test/kbase/ArgUtilsTest.java b/src/test/java/us/kbase/test/workspace/kbase/ArgUtilsTest.java similarity index 99% rename from src/us/kbase/workspace/test/kbase/ArgUtilsTest.java rename to src/test/java/us/kbase/test/workspace/kbase/ArgUtilsTest.java index f33a7626e..364735746 100644 --- a/src/us/kbase/workspace/test/kbase/ArgUtilsTest.java +++ b/src/test/java/us/kbase/test/workspace/kbase/ArgUtilsTest.java @@ -1,12 +1,12 @@ -package us.kbase.workspace.test.kbase; +package us.kbase.test.workspace.kbase; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; +import static us.kbase.test.common.TestCommon.inst; +import static us.kbase.test.common.TestCommon.list; import static us.kbase.workspace.kbase.ArgUtils.chooseInstant; import static us.kbase.workspace.kbase.ArgUtils.processProvenance; -import static us.kbase.common.test.TestCommon.inst; -import static us.kbase.common.test.TestCommon.list; import java.time.Instant; import java.util.HashMap; @@ -18,7 +18,7 @@ import com.google.common.collect.ImmutableMap; import us.kbase.common.service.UObject; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.workspace.ExternalDataUnit; import us.kbase.workspace.database.WorkspaceUser; import us.kbase.workspace.database.provenance.ExternalData; diff --git a/src/us/kbase/workspace/test/kbase/BytestreamIdHandlerFactoryTest.java b/src/test/java/us/kbase/test/workspace/kbase/BytestreamIdHandlerFactoryTest.java similarity index 99% rename from src/us/kbase/workspace/test/kbase/BytestreamIdHandlerFactoryTest.java rename to src/test/java/us/kbase/test/workspace/kbase/BytestreamIdHandlerFactoryTest.java index f362e0a1d..cdfb5097f 100644 --- a/src/us/kbase/workspace/test/kbase/BytestreamIdHandlerFactoryTest.java +++ b/src/test/java/us/kbase/test/workspace/kbase/BytestreamIdHandlerFactoryTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.kbase; +package us.kbase.test.workspace.kbase; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -12,7 +12,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import static us.kbase.common.test.TestCommon.set; +import static us.kbase.test.common.TestCommon.set; import java.io.IOException; import java.util.Arrays; @@ -25,7 +25,6 @@ import org.junit.Test; import us.kbase.auth.AuthToken; -import us.kbase.common.test.TestCommon; import us.kbase.shock.client.BasicShockClient; import us.kbase.shock.client.ShockACL; import us.kbase.shock.client.ShockACLType; @@ -35,6 +34,7 @@ import us.kbase.shock.client.exceptions.ShockAuthorizationException; import us.kbase.shock.client.exceptions.ShockHttpException; import us.kbase.shock.client.exceptions.ShockNoNodeException; +import us.kbase.test.common.TestCommon; import us.kbase.typedobj.idref.IdReferenceType; import us.kbase.typedobj.idref.SimpleRemappedId; import us.kbase.typedobj.idref.IdReferenceHandlerSet.IdReferenceException; diff --git a/src/us/kbase/workspace/test/kbase/DelegatingTypeProviderTest.java b/src/test/java/us/kbase/test/workspace/kbase/DelegatingTypeProviderTest.java similarity index 99% rename from src/us/kbase/workspace/test/kbase/DelegatingTypeProviderTest.java rename to src/test/java/us/kbase/test/workspace/kbase/DelegatingTypeProviderTest.java index 6d51c19da..a73160778 100644 --- a/src/us/kbase/workspace/test/kbase/DelegatingTypeProviderTest.java +++ b/src/test/java/us/kbase/test/workspace/kbase/DelegatingTypeProviderTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.kbase; +package us.kbase.test.workspace.kbase; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -7,8 +7,8 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static us.kbase.common.test.TestCommon.list; -import static us.kbase.common.test.TestCommon.LONG1001; +import static us.kbase.test.common.TestCommon.LONG1001; +import static us.kbase.test.common.TestCommon.list; import java.io.IOException; import java.util.List; @@ -20,7 +20,7 @@ import us.kbase.common.service.JsonClientException; import us.kbase.common.service.ServerException; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.typedobj.core.AbsoluteTypeDefId; import us.kbase.typedobj.core.MD5; import us.kbase.typedobj.core.TypeDefId; diff --git a/src/us/kbase/workspace/test/kbase/HandleAndBytestreamIntegrationTest.java b/src/test/java/us/kbase/test/workspace/kbase/HandleAndBytestreamIntegrationTest.java similarity index 98% rename from src/us/kbase/workspace/test/kbase/HandleAndBytestreamIntegrationTest.java rename to src/test/java/us/kbase/test/workspace/kbase/HandleAndBytestreamIntegrationTest.java index d59b783d7..95a989639 100644 --- a/src/us/kbase/workspace/test/kbase/HandleAndBytestreamIntegrationTest.java +++ b/src/test/java/us/kbase/test/workspace/kbase/HandleAndBytestreamIntegrationTest.java @@ -1,13 +1,13 @@ -package us.kbase.workspace.test.kbase; +package us.kbase.test.workspace.kbase; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.CoreMatchers.startsWith; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import static us.kbase.common.test.TestCommon.list; -import static us.kbase.common.test.TestCommon.set; -import static us.kbase.workspace.test.kbase.JSONRPCLayerTester.administerCommand; +import static us.kbase.test.common.TestCommon.list; +import static us.kbase.test.common.TestCommon.set; +import static us.kbase.test.workspace.kbase.JSONRPCLayerTester.administerCommand; import java.io.ByteArrayInputStream; import java.io.File; @@ -42,7 +42,6 @@ import us.kbase.common.mongo.exceptions.InvalidHostException; import us.kbase.common.service.ServerException; import us.kbase.common.service.UObject; -import us.kbase.common.test.TestCommon; import us.kbase.common.test.TestException; import us.kbase.common.test.controllers.mongo.MongoController; import us.kbase.shock.client.BasicShockClient; @@ -52,6 +51,11 @@ import us.kbase.shock.client.ShockNodeId; import us.kbase.shock.client.ShockUserId; import us.kbase.test.auth2.authcontroller.AuthController; +import us.kbase.test.common.TestCommon; +import us.kbase.test.workspace.WorkspaceServerThread; +import us.kbase.test.workspace.controllers.blobstore.BlobstoreController; +import us.kbase.test.workspace.controllers.handle.HandleServiceController; +import us.kbase.test.workspace.controllers.minio.MinioController; import us.kbase.typedobj.idref.IdReference; import us.kbase.typedobj.idref.IdReferenceHandlerSet; import us.kbase.typedobj.idref.IdReferenceHandlerSet.TooManyIdsException; @@ -71,10 +75,6 @@ import us.kbase.workspace.WorkspaceClient; import us.kbase.workspace.WorkspaceServer; import us.kbase.workspace.kbase.HandleIdHandlerFactory; -import us.kbase.workspace.test.WorkspaceServerThread; -import us.kbase.workspace.test.controllers.blobstore.BlobstoreController; -import us.kbase.workspace.test.controllers.handle.HandleServiceController; -import us.kbase.workspace.test.controllers.minio.MinioController; public class HandleAndBytestreamIntegrationTest { diff --git a/src/us/kbase/workspace/test/kbase/HandleIdHandlerFactoryTest.java b/src/test/java/us/kbase/test/workspace/kbase/HandleIdHandlerFactoryTest.java similarity index 98% rename from src/us/kbase/workspace/test/kbase/HandleIdHandlerFactoryTest.java rename to src/test/java/us/kbase/test/workspace/kbase/HandleIdHandlerFactoryTest.java index 7069b39a0..08b96d8d9 100644 --- a/src/us/kbase/workspace/test/kbase/HandleIdHandlerFactoryTest.java +++ b/src/test/java/us/kbase/test/workspace/kbase/HandleIdHandlerFactoryTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.kbase; +package us.kbase.test.workspace.kbase; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -8,7 +8,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; -import static us.kbase.common.test.TestCommon.set; +import static us.kbase.test.common.TestCommon.set; import java.io.IOException; import java.util.Arrays; @@ -19,11 +19,11 @@ import com.google.common.collect.ImmutableMap; +import us.kbase.abstracthandle.AbstractHandleClient; import us.kbase.common.service.JsonClientException; import us.kbase.common.service.ServerException; import us.kbase.common.service.UnauthorizedException; -import us.kbase.common.test.TestCommon; -import us.kbase.abstracthandle.AbstractHandleClient; +import us.kbase.test.common.TestCommon; import us.kbase.typedobj.idref.IdReferencePermissionHandlerSet.IdReferencePermissionHandler; import us.kbase.typedobj.idref.IdReferencePermissionHandlerSet.IdReferencePermissionHandlerException; import us.kbase.typedobj.idref.IdReferenceType; diff --git a/src/us/kbase/workspace/test/kbase/IdentifierUtilsTest.java b/src/test/java/us/kbase/test/workspace/kbase/IdentifierUtilsTest.java similarity index 99% rename from src/us/kbase/workspace/test/kbase/IdentifierUtilsTest.java rename to src/test/java/us/kbase/test/workspace/kbase/IdentifierUtilsTest.java index 82826dbf6..4829b165c 100644 --- a/src/us/kbase/workspace/test/kbase/IdentifierUtilsTest.java +++ b/src/test/java/us/kbase/test/workspace/kbase/IdentifierUtilsTest.java @@ -1,13 +1,13 @@ -package us.kbase.workspace.test.kbase; +package us.kbase.test.workspace.kbase; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import static us.kbase.common.test.TestCommon.ES; -import static us.kbase.common.test.TestCommon.EL; -import static us.kbase.common.test.TestCommon.EI; -import static us.kbase.common.test.TestCommon.opt; -import static us.kbase.common.test.TestCommon.optn; +import static us.kbase.test.common.TestCommon.EI; +import static us.kbase.test.common.TestCommon.EL; +import static us.kbase.test.common.TestCommon.ES; +import static us.kbase.test.common.TestCommon.opt; +import static us.kbase.test.common.TestCommon.optn; import java.util.Arrays; import java.util.Collections; @@ -17,7 +17,7 @@ import org.junit.Test; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.typedobj.core.SubsetSelection; import us.kbase.workspace.ObjectIdentity; import us.kbase.workspace.ObjectSpecification; diff --git a/src/us/kbase/workspace/test/kbase/JSONRPCLayerLongTest.java b/src/test/java/us/kbase/test/workspace/kbase/JSONRPCLayerLongTest.java similarity index 99% rename from src/us/kbase/workspace/test/kbase/JSONRPCLayerLongTest.java rename to src/test/java/us/kbase/test/workspace/kbase/JSONRPCLayerLongTest.java index a97c4fdcf..9cd3c2c8a 100644 --- a/src/us/kbase/workspace/test/kbase/JSONRPCLayerLongTest.java +++ b/src/test/java/us/kbase/test/workspace/kbase/JSONRPCLayerLongTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.kbase; +package us.kbase.test.workspace.kbase; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -30,6 +30,7 @@ import us.kbase.kidl.KbStruct; import us.kbase.kidl.KbStructItem; import us.kbase.kidl.KbType; +import us.kbase.test.workspace.workspace.WorkspaceTest; import us.kbase.workspace.CreateWorkspaceParams; import us.kbase.workspace.GetObjects2Params; import us.kbase.workspace.ObjectData; @@ -37,7 +38,6 @@ import us.kbase.workspace.ObjectSpecification; import us.kbase.workspace.RegisterTypespecParams; import us.kbase.workspace.SaveObjectsParams; -import us.kbase.workspace.test.workspace.WorkspaceTest; import com.fasterxml.jackson.core.JsonEncoding; import com.fasterxml.jackson.core.JsonGenerator; diff --git a/src/us/kbase/workspace/test/kbase/JSONRPCLayerTest.java b/src/test/java/us/kbase/test/workspace/kbase/JSONRPCLayerTest.java similarity index 99% rename from src/us/kbase/workspace/test/kbase/JSONRPCLayerTest.java rename to src/test/java/us/kbase/test/workspace/kbase/JSONRPCLayerTest.java index b606ba6ce..bc5f12422 100644 --- a/src/us/kbase/workspace/test/kbase/JSONRPCLayerTest.java +++ b/src/test/java/us/kbase/test/workspace/kbase/JSONRPCLayerTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.kbase; +package us.kbase.test.workspace.kbase; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.containsString; @@ -7,9 +7,9 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import static us.kbase.common.test.TestCommon.assertExceptionCorrect; -import static us.kbase.common.test.TestCommon.list; -import static us.kbase.common.test.TestCommon.set; +import static us.kbase.test.common.TestCommon.assertExceptionCorrect; +import static us.kbase.test.common.TestCommon.list; +import static us.kbase.test.common.TestCommon.set; import java.io.InputStream; import java.net.HttpURLConnection; diff --git a/src/us/kbase/workspace/test/kbase/JSONRPCLayerTester.java b/src/test/java/us/kbase/test/workspace/kbase/JSONRPCLayerTester.java similarity index 99% rename from src/us/kbase/workspace/test/kbase/JSONRPCLayerTester.java rename to src/test/java/us/kbase/test/workspace/kbase/JSONRPCLayerTester.java index c6c0ef844..3a5bad2f9 100644 --- a/src/us/kbase/workspace/test/kbase/JSONRPCLayerTester.java +++ b/src/test/java/us/kbase/test/workspace/kbase/JSONRPCLayerTester.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.kbase; +package us.kbase.test.workspace.kbase; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.containsString; @@ -7,8 +7,8 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static us.kbase.common.test.TestCommon.assertExceptionCorrect; -import static us.kbase.common.test.TestCommon.list; +import static us.kbase.test.common.TestCommon.assertExceptionCorrect; +import static us.kbase.test.common.TestCommon.list; import java.io.File; import java.io.IOException; @@ -47,9 +47,11 @@ import us.kbase.common.service.Tuple11; import us.kbase.common.service.Tuple9; import us.kbase.common.service.UObject; -import us.kbase.common.test.TestCommon; import us.kbase.common.test.controllers.mongo.MongoController; import us.kbase.test.auth2.authcontroller.AuthController; +import us.kbase.test.common.TestCommon; +import us.kbase.test.workspace.JsonTokenStreamOCStat; +import us.kbase.test.workspace.WorkspaceServerThread; import us.kbase.typedobj.core.AbsoluteTypeDefId; import us.kbase.typedobj.core.TempFilesManager; import us.kbase.workspace.AlterWorkspaceMetadataParams; @@ -81,8 +83,6 @@ import us.kbase.workspace.database.UncheckedUserMetadata; import us.kbase.workspace.database.WorkspaceUser; import us.kbase.workspace.kbase.InitWorkspaceServer; -import us.kbase.workspace.test.JsonTokenStreamOCStat; -import us.kbase.workspace.test.WorkspaceServerThread; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.JsonMappingException; diff --git a/src/us/kbase/workspace/test/kbase/KBaseWorkspaceConfigTest.java b/src/test/java/us/kbase/test/workspace/kbase/KBaseWorkspaceConfigTest.java similarity index 99% rename from src/us/kbase/workspace/test/kbase/KBaseWorkspaceConfigTest.java rename to src/test/java/us/kbase/test/workspace/kbase/KBaseWorkspaceConfigTest.java index 6fc16640c..be6b86966 100644 --- a/src/us/kbase/workspace/test/kbase/KBaseWorkspaceConfigTest.java +++ b/src/test/java/us/kbase/test/workspace/kbase/KBaseWorkspaceConfigTest.java @@ -1,9 +1,9 @@ -package us.kbase.workspace.test.kbase; +package us.kbase.test.workspace.kbase; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import static us.kbase.common.test.TestCommon.set; +import static us.kbase.test.common.TestCommon.set; import static us.kbase.common.test.controllers.ControllerCommon.makeTempDirs; import java.io.BufferedWriter; @@ -30,8 +30,8 @@ import nl.jqno.equalsverifier.EqualsVerifier; import software.amazon.awssdk.regions.Region; -import us.kbase.common.test.MapBuilder; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.MapBuilder; +import us.kbase.test.common.TestCommon; import us.kbase.workspace.kbase.BackendType; import us.kbase.workspace.kbase.KBaseWorkspaceConfig; import us.kbase.workspace.kbase.KBaseWorkspaceConfig.KBaseWorkspaceConfigException; diff --git a/src/us/kbase/workspace/test/kbase/LoggingTest.java b/src/test/java/us/kbase/test/workspace/kbase/LoggingTest.java similarity index 99% rename from src/us/kbase/workspace/test/kbase/LoggingTest.java rename to src/test/java/us/kbase/test/workspace/kbase/LoggingTest.java index fe5bbaa39..ca5b7a8fc 100644 --- a/src/us/kbase/workspace/test/kbase/LoggingTest.java +++ b/src/test/java/us/kbase/test/workspace/kbase/LoggingTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.kbase; +package us.kbase.test.workspace.kbase; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -31,9 +31,10 @@ import us.kbase.common.service.UObject; import us.kbase.common.service.JsonServerSyslog.SyslogOutput; import us.kbase.common.service.Tuple11; -import us.kbase.common.test.TestCommon; import us.kbase.common.test.controllers.mongo.MongoController; import us.kbase.test.auth2.authcontroller.AuthController; +import us.kbase.test.common.TestCommon; +import us.kbase.test.workspace.WorkspaceServerThread; import us.kbase.workspace.AlterAdminObjectMetadataParams; import us.kbase.workspace.CopyObjectParams; import us.kbase.workspace.CreateWorkspaceParams; @@ -50,12 +51,12 @@ import us.kbase.workspace.WorkspaceClient; import us.kbase.workspace.WorkspaceServer; import us.kbase.workspace.database.DynamicConfig; -import us.kbase.workspace.test.WorkspaceServerThread; import com.mongodb.client.MongoClient; import com.mongodb.client.MongoClients; import com.mongodb.client.MongoDatabase; + /** Tests application logging only - not the standard logging that comes with * JsonServerServlet. * @author gaprice@lbl.gov diff --git a/src/us/kbase/workspace/test/kbase/SampleIDHandlerFactoryTest.java b/src/test/java/us/kbase/test/workspace/kbase/SampleIDHandlerFactoryTest.java similarity index 99% rename from src/us/kbase/workspace/test/kbase/SampleIDHandlerFactoryTest.java rename to src/test/java/us/kbase/test/workspace/kbase/SampleIDHandlerFactoryTest.java index 34da13d6b..0f7533798 100644 --- a/src/us/kbase/workspace/test/kbase/SampleIDHandlerFactoryTest.java +++ b/src/test/java/us/kbase/test/workspace/kbase/SampleIDHandlerFactoryTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.kbase; +package us.kbase.test.workspace.kbase; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -25,11 +25,11 @@ import us.kbase.common.service.JsonClientException; import us.kbase.common.service.ServerException; import us.kbase.common.service.UnauthorizedException; -import us.kbase.common.test.TestCommon; import us.kbase.sampleservice.GetSampleACLsParams; import us.kbase.sampleservice.SampleACLs; import us.kbase.sampleservice.SampleServiceClient; import us.kbase.sampleservice.UpdateSamplesACLsParams; +import us.kbase.test.common.TestCommon; import us.kbase.typedobj.idref.IdReferenceType; import us.kbase.typedobj.idref.SimpleRemappedId; import us.kbase.typedobj.idref.IdReferenceHandlerSet.IdReferenceException; diff --git a/src/us/kbase/workspace/test/kbase/SampleServiceIntegrationTest.java b/src/test/java/us/kbase/test/workspace/kbase/SampleServiceIntegrationTest.java similarity index 98% rename from src/us/kbase/workspace/test/kbase/SampleServiceIntegrationTest.java rename to src/test/java/us/kbase/test/workspace/kbase/SampleServiceIntegrationTest.java index 0706b22ab..f17ad8746 100644 --- a/src/us/kbase/workspace/test/kbase/SampleServiceIntegrationTest.java +++ b/src/test/java/us/kbase/test/workspace/kbase/SampleServiceIntegrationTest.java @@ -1,11 +1,11 @@ -package us.kbase.workspace.test.kbase; +package us.kbase.test.workspace.kbase; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; import static us.kbase.common.test.controllers.ControllerCommon.findFreePort; -import static us.kbase.common.test.TestCommon.set; -import static us.kbase.workspace.test.kbase.JSONRPCLayerTester.administerCommand; +import static us.kbase.test.common.TestCommon.set; +import static us.kbase.test.workspace.kbase.JSONRPCLayerTester.administerCommand; import java.io.File; import java.io.IOException; @@ -39,7 +39,6 @@ import us.kbase.common.service.JsonClientException; import us.kbase.common.service.ServerException; import us.kbase.common.service.UObject; -import us.kbase.common.test.TestCommon; import us.kbase.common.test.TestException; import us.kbase.common.test.controllers.mongo.MongoController; import us.kbase.sampleservice.CreateSampleParams; @@ -51,6 +50,10 @@ import us.kbase.sampleservice.SampleServiceClient; import us.kbase.sampleservice.UpdateSampleACLsParams; import us.kbase.test.auth2.authcontroller.AuthController; +import us.kbase.test.common.TestCommon; +import us.kbase.test.workspace.WorkspaceServerThread; +import us.kbase.test.workspace.controllers.arango.ArangoController; +import us.kbase.test.workspace.controllers.sample.SampleServiceController; import us.kbase.workspace.CreateWorkspaceParams; import us.kbase.workspace.GetObjects2Params; import us.kbase.workspace.ObjectData; @@ -63,9 +66,6 @@ import us.kbase.workspace.WorkspaceClient; import us.kbase.workspace.WorkspaceServer; import us.kbase.workspace.database.DynamicConfig; -import us.kbase.workspace.test.WorkspaceServerThread; -import us.kbase.workspace.test.controllers.arango.ArangoController; -import us.kbase.workspace.test.controllers.sample.SampleServiceController; public class SampleServiceIntegrationTest { diff --git a/src/us/kbase/workspace/test/kbase/SchemaUpdaterCLITest.java b/src/test/java/us/kbase/test/workspace/kbase/SchemaUpdaterCLITest.java similarity index 98% rename from src/us/kbase/workspace/test/kbase/SchemaUpdaterCLITest.java rename to src/test/java/us/kbase/test/workspace/kbase/SchemaUpdaterCLITest.java index 8e633b75e..7d90cf1cf 100644 --- a/src/us/kbase/workspace/test/kbase/SchemaUpdaterCLITest.java +++ b/src/test/java/us/kbase/test/workspace/kbase/SchemaUpdaterCLITest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.kbase; +package us.kbase.test.workspace.kbase; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.containsString; @@ -30,8 +30,8 @@ import com.mongodb.client.MongoClient; import com.mongodb.client.MongoDatabase; -import us.kbase.common.test.MapBuilder; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.MapBuilder; +import us.kbase.test.common.TestCommon; import us.kbase.workspace.database.mongo.SchemaUpdater; import us.kbase.workspace.database.mongo.SchemaUpdater.SchemaUpdateException; import us.kbase.workspace.kbase.KBaseWorkspaceConfig; diff --git a/src/us/kbase/workspace/test/kbase/TypeClientTest.java b/src/test/java/us/kbase/test/workspace/kbase/TypeClientTest.java similarity index 99% rename from src/us/kbase/workspace/test/kbase/TypeClientTest.java rename to src/test/java/us/kbase/test/workspace/kbase/TypeClientTest.java index 6d4b2ae91..338bfbee0 100644 --- a/src/us/kbase/workspace/test/kbase/TypeClientTest.java +++ b/src/test/java/us/kbase/test/workspace/kbase/TypeClientTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.kbase; +package us.kbase.test.workspace.kbase; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -8,7 +8,7 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static us.kbase.common.test.TestCommon.list; +import static us.kbase.test.common.TestCommon.list; import java.io.IOException; import java.net.URL; @@ -24,7 +24,7 @@ import us.kbase.common.service.ServerException; import us.kbase.common.service.UObject; import us.kbase.common.service.UnauthorizedException; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.workspace.GetModuleInfoParams; import us.kbase.workspace.GrantModuleOwnershipParams; import us.kbase.workspace.ListAllTypesParams; diff --git a/src/us/kbase/workspace/test/kbase/TypeDelegationTest.java b/src/test/java/us/kbase/test/workspace/kbase/TypeDelegationTest.java similarity index 99% rename from src/us/kbase/workspace/test/kbase/TypeDelegationTest.java rename to src/test/java/us/kbase/test/workspace/kbase/TypeDelegationTest.java index 4f38b53ec..b397ca70d 100644 --- a/src/us/kbase/workspace/test/kbase/TypeDelegationTest.java +++ b/src/test/java/us/kbase/test/workspace/kbase/TypeDelegationTest.java @@ -1,12 +1,12 @@ -package us.kbase.workspace.test.kbase; +package us.kbase.test.workspace.kbase; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import static us.kbase.common.test.TestCommon.list; -import static us.kbase.workspace.test.kbase.JSONRPCLayerTester.startupWorkspaceServer; +import static us.kbase.test.common.TestCommon.list; +import static us.kbase.test.workspace.kbase.JSONRPCLayerTester.startupWorkspaceServer; import java.net.URL; import java.nio.file.Paths; @@ -30,10 +30,10 @@ import us.kbase.auth.AuthToken; import us.kbase.common.service.ServerException; import us.kbase.common.service.UObject; -import us.kbase.common.test.MapBuilder; -import us.kbase.common.test.TestCommon; import us.kbase.common.test.controllers.mongo.MongoController; import us.kbase.test.auth2.authcontroller.AuthController; +import us.kbase.test.common.MapBuilder; +import us.kbase.test.common.TestCommon; import us.kbase.typedobj.db.TypeDefinitionDB; import us.kbase.workspace.CreateWorkspaceParams; import us.kbase.workspace.GetModuleInfoParams; diff --git a/src/us/kbase/workspace/test/kbase/WorkspaceServerMethodsTest.java b/src/test/java/us/kbase/test/workspace/kbase/WorkspaceServerMethodsTest.java similarity index 98% rename from src/us/kbase/workspace/test/kbase/WorkspaceServerMethodsTest.java rename to src/test/java/us/kbase/test/workspace/kbase/WorkspaceServerMethodsTest.java index 7d1ada250..7c6297a25 100644 --- a/src/us/kbase/workspace/test/kbase/WorkspaceServerMethodsTest.java +++ b/src/test/java/us/kbase/test/workspace/kbase/WorkspaceServerMethodsTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.kbase; +package us.kbase.test.workspace.kbase; import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; @@ -20,8 +20,8 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.ILoggingEvent; -import us.kbase.common.test.TestCommon; -import us.kbase.common.test.TestCommon.LogEvent; +import us.kbase.test.common.TestCommon; +import us.kbase.test.common.TestCommon.LogEvent; import us.kbase.workspace.AlterAdminObjectMetadataParams; import us.kbase.workspace.ObjectIdentity; import us.kbase.workspace.ObjectMetadataUpdate; diff --git a/src/us/kbase/workspace/test/kbase/admin/AdministrationCommandSetInstallerTest.java b/src/test/java/us/kbase/test/workspace/kbase/admin/AdministrationCommandSetInstallerTest.java similarity index 99% rename from src/us/kbase/workspace/test/kbase/admin/AdministrationCommandSetInstallerTest.java rename to src/test/java/us/kbase/test/workspace/kbase/admin/AdministrationCommandSetInstallerTest.java index 7801be18b..5f4e6bb55 100644 --- a/src/us/kbase/workspace/test/kbase/admin/AdministrationCommandSetInstallerTest.java +++ b/src/test/java/us/kbase/test/workspace/kbase/admin/AdministrationCommandSetInstallerTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.kbase.admin; +package us.kbase.test.workspace.kbase.admin; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.is; @@ -11,10 +11,10 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static us.kbase.common.test.TestCommon.assertLogEventsCorrect; -import static us.kbase.common.test.TestCommon.inst; -import static us.kbase.common.test.TestCommon.list; -import static us.kbase.common.test.TestCommon.set; +import static us.kbase.test.common.TestCommon.assertLogEventsCorrect; +import static us.kbase.test.common.TestCommon.inst; +import static us.kbase.test.common.TestCommon.list; +import static us.kbase.test.common.TestCommon.set; import java.net.URL; import java.util.Arrays; @@ -41,9 +41,9 @@ import us.kbase.common.service.Tuple11; import us.kbase.common.service.Tuple9; import us.kbase.common.service.UObject; -import us.kbase.common.test.MapBuilder; -import us.kbase.common.test.TestCommon; -import us.kbase.common.test.TestCommon.LogEvent; +import us.kbase.test.common.MapBuilder; +import us.kbase.test.common.TestCommon; +import us.kbase.test.common.TestCommon.LogEvent; import us.kbase.typedobj.db.OwnerInfo; import us.kbase.workspace.CreateWorkspaceParams; import us.kbase.workspace.GetObjectInfo3Params; diff --git a/src/us/kbase/workspace/test/kbase/admin/DefaultAdminHandlerTest.java b/src/test/java/us/kbase/test/workspace/kbase/admin/DefaultAdminHandlerTest.java similarity index 97% rename from src/us/kbase/workspace/test/kbase/admin/DefaultAdminHandlerTest.java rename to src/test/java/us/kbase/test/workspace/kbase/admin/DefaultAdminHandlerTest.java index 22eda9805..e62d6fcc3 100644 --- a/src/us/kbase/workspace/test/kbase/admin/DefaultAdminHandlerTest.java +++ b/src/test/java/us/kbase/test/workspace/kbase/admin/DefaultAdminHandlerTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.kbase.admin; +package us.kbase.test.workspace.kbase.admin; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -7,12 +7,12 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static us.kbase.common.test.TestCommon.set; +import static us.kbase.test.common.TestCommon.set; import org.junit.Test; import us.kbase.auth.AuthToken; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.workspace.database.Workspace; import us.kbase.workspace.database.WorkspaceUser; import us.kbase.workspace.database.exceptions.WorkspaceCommunicationException; diff --git a/src/us/kbase/workspace/test/kbase/admin/KBaseAuth2AdminHandlerTest.java b/src/test/java/us/kbase/test/workspace/kbase/admin/KBaseAuth2AdminHandlerTest.java similarity index 99% rename from src/us/kbase/workspace/test/kbase/admin/KBaseAuth2AdminHandlerTest.java rename to src/test/java/us/kbase/test/workspace/kbase/admin/KBaseAuth2AdminHandlerTest.java index 56a74180e..15adf44fd 100644 --- a/src/us/kbase/workspace/test/kbase/admin/KBaseAuth2AdminHandlerTest.java +++ b/src/test/java/us/kbase/test/workspace/kbase/admin/KBaseAuth2AdminHandlerTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.kbase.admin; +package us.kbase.test.workspace.kbase.admin; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.containsString; @@ -10,7 +10,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static us.kbase.common.test.TestCommon.set; +import static us.kbase.test.common.TestCommon.set; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -38,7 +38,7 @@ import com.google.common.collect.ImmutableMap; import us.kbase.auth.AuthToken; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.workspace.database.WorkspaceUser; import us.kbase.workspace.kbase.admin.AdminRole; import us.kbase.workspace.kbase.admin.AdministratorHandlerException; diff --git a/src/us/kbase/workspace/test/kbase/admin/WorkspaceAdministrationTest.java b/src/test/java/us/kbase/test/workspace/kbase/admin/WorkspaceAdministrationTest.java similarity index 99% rename from src/us/kbase/workspace/test/kbase/admin/WorkspaceAdministrationTest.java rename to src/test/java/us/kbase/test/workspace/kbase/admin/WorkspaceAdministrationTest.java index c6422a046..060376539 100644 --- a/src/us/kbase/workspace/test/kbase/admin/WorkspaceAdministrationTest.java +++ b/src/test/java/us/kbase/test/workspace/kbase/admin/WorkspaceAdministrationTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.kbase.admin; +package us.kbase.test.workspace.kbase.admin; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.is; @@ -12,8 +12,8 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static us.kbase.common.test.TestCommon.assertLogEventsCorrect; -import static us.kbase.common.test.TestCommon.set; +import static us.kbase.test.common.TestCommon.assertLogEventsCorrect; +import static us.kbase.test.common.TestCommon.set; import java.io.IOException; import java.util.Arrays; @@ -36,8 +36,8 @@ import us.kbase.auth.AuthToken; import us.kbase.common.service.JsonTokenStream; import us.kbase.common.service.UObject; -import us.kbase.common.test.TestCommon; -import us.kbase.common.test.TestCommon.LogEvent; +import us.kbase.test.common.TestCommon; +import us.kbase.test.common.TestCommon.LogEvent; import us.kbase.workspace.database.WorkspaceObjectData; import us.kbase.workspace.database.WorkspaceUser; import us.kbase.workspace.kbase.admin.AdminCommand; diff --git a/src/us/kbase/workspace/test/listener/BadListenerFactory.java b/src/test/java/us/kbase/test/workspace/listener/BadListenerFactory.java similarity index 98% rename from src/us/kbase/workspace/test/listener/BadListenerFactory.java rename to src/test/java/us/kbase/test/workspace/listener/BadListenerFactory.java index 6f70746d4..91d2d8f1d 100644 --- a/src/us/kbase/workspace/test/listener/BadListenerFactory.java +++ b/src/test/java/us/kbase/test/workspace/listener/BadListenerFactory.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.listener; +package us.kbase.test.workspace.listener; import java.time.Instant; import java.util.List; diff --git a/src/us/kbase/workspace/test/listener/NullListenerFactory.java b/src/test/java/us/kbase/test/workspace/listener/NullListenerFactory.java similarity index 99% rename from src/us/kbase/workspace/test/listener/NullListenerFactory.java rename to src/test/java/us/kbase/test/workspace/listener/NullListenerFactory.java index 1a1ee5f7a..9da5f029d 100644 --- a/src/us/kbase/workspace/test/listener/NullListenerFactory.java +++ b/src/test/java/us/kbase/test/workspace/listener/NullListenerFactory.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.listener; +package us.kbase.test.workspace.listener; import java.time.Instant; import java.util.List; diff --git a/src/us/kbase/workspace/test/modules/KafkaNotifierFactoryTest.java b/src/test/java/us/kbase/test/workspace/modules/KafkaNotifierFactoryTest.java similarity index 99% rename from src/us/kbase/workspace/test/modules/KafkaNotifierFactoryTest.java rename to src/test/java/us/kbase/test/workspace/modules/KafkaNotifierFactoryTest.java index bd6dec46e..412807d95 100644 --- a/src/us/kbase/workspace/test/modules/KafkaNotifierFactoryTest.java +++ b/src/test/java/us/kbase/test/workspace/modules/KafkaNotifierFactoryTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.modules; +package us.kbase.test.workspace.modules; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -6,7 +6,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static us.kbase.common.test.TestCommon.inst; +import static us.kbase.test.common.TestCommon.inst; import java.io.ByteArrayOutputStream; import java.lang.reflect.Constructor; @@ -30,8 +30,8 @@ import com.google.common.collect.ImmutableMap; -import us.kbase.common.test.MapBuilder; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.MapBuilder; +import us.kbase.test.common.TestCommon; import us.kbase.typedobj.core.AbsoluteTypeDefId; import us.kbase.typedobj.core.TypeDefName; import us.kbase.workspace.database.ObjectInformation; diff --git a/src/us/kbase/workspace/test/workspace/ByteArrayFileCacheManagerTest.java b/src/test/java/us/kbase/test/workspace/workspace/ByteArrayFileCacheManagerTest.java similarity index 99% rename from src/us/kbase/workspace/test/workspace/ByteArrayFileCacheManagerTest.java rename to src/test/java/us/kbase/test/workspace/workspace/ByteArrayFileCacheManagerTest.java index 277b9aac2..788656b96 100644 --- a/src/us/kbase/workspace/test/workspace/ByteArrayFileCacheManagerTest.java +++ b/src/test/java/us/kbase/test/workspace/workspace/ByteArrayFileCacheManagerTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.workspace; +package us.kbase.test.workspace.workspace; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -7,7 +7,7 @@ import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static us.kbase.common.test.TestCommon.list; +import static us.kbase.test.common.TestCommon.list; import java.io.ByteArrayInputStream; import java.io.File; @@ -24,7 +24,7 @@ import com.google.common.collect.ImmutableMap; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.typedobj.core.SubsetSelection; import us.kbase.typedobj.core.TempFileListener; import us.kbase.typedobj.core.TempFilesManager; diff --git a/src/us/kbase/workspace/test/workspace/DynamicConfigTest.java b/src/test/java/us/kbase/test/workspace/workspace/DynamicConfigTest.java similarity index 98% rename from src/us/kbase/workspace/test/workspace/DynamicConfigTest.java rename to src/test/java/us/kbase/test/workspace/workspace/DynamicConfigTest.java index 68a796d90..a103ce0f9 100644 --- a/src/us/kbase/workspace/test/workspace/DynamicConfigTest.java +++ b/src/test/java/us/kbase/test/workspace/workspace/DynamicConfigTest.java @@ -1,10 +1,10 @@ -package us.kbase.workspace.test.workspace; +package us.kbase.test.workspace.workspace; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import static us.kbase.common.test.TestCommon.opt; -import static us.kbase.common.test.TestCommon.EI; +import static us.kbase.test.common.TestCommon.EI; +import static us.kbase.test.common.TestCommon.opt; import java.util.Collections; import java.util.Map; @@ -14,7 +14,7 @@ import com.google.common.collect.ImmutableMap; import nl.jqno.equalsverifier.EqualsVerifier; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.workspace.database.DynamicConfig; import us.kbase.workspace.database.DynamicConfig.DynamicConfigUpdate; diff --git a/src/us/kbase/workspace/test/workspace/ErrorOrTest.java b/src/test/java/us/kbase/test/workspace/workspace/ErrorOrTest.java similarity index 96% rename from src/us/kbase/workspace/test/workspace/ErrorOrTest.java rename to src/test/java/us/kbase/test/workspace/workspace/ErrorOrTest.java index f6c426ee6..334faa9ac 100644 --- a/src/us/kbase/workspace/test/workspace/ErrorOrTest.java +++ b/src/test/java/us/kbase/test/workspace/workspace/ErrorOrTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.workspace; +package us.kbase.test.workspace.workspace; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; @@ -10,7 +10,7 @@ import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.workspace.database.exceptions.ErrorOr; import us.kbase.workspace.database.exceptions.ErrorType; diff --git a/src/us/kbase/workspace/test/workspace/ListObjectParametersTest.java b/src/test/java/us/kbase/test/workspace/workspace/ListObjectParametersTest.java similarity index 99% rename from src/us/kbase/workspace/test/workspace/ListObjectParametersTest.java rename to src/test/java/us/kbase/test/workspace/workspace/ListObjectParametersTest.java index 0b1ea4b1a..a946f4530 100644 --- a/src/us/kbase/workspace/test/workspace/ListObjectParametersTest.java +++ b/src/test/java/us/kbase/test/workspace/workspace/ListObjectParametersTest.java @@ -1,9 +1,9 @@ -package us.kbase.workspace.test.workspace; +package us.kbase.test.workspace.workspace; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import static us.kbase.common.test.TestCommon.assertExceptionCorrect; +import static us.kbase.test.common.TestCommon.assertExceptionCorrect; import java.time.Instant; import java.util.ArrayList; @@ -21,7 +21,7 @@ import com.google.common.collect.ImmutableMap; -import us.kbase.common.test.MapBuilder; +import us.kbase.test.common.MapBuilder; import us.kbase.typedobj.core.TypeDefId; import us.kbase.workspace.database.AllUsers; import us.kbase.workspace.database.ListObjectsParameters; diff --git a/src/us/kbase/workspace/test/workspace/MetadataUpdateTest.java b/src/test/java/us/kbase/test/workspace/workspace/MetadataUpdateTest.java similarity index 94% rename from src/us/kbase/workspace/test/workspace/MetadataUpdateTest.java rename to src/test/java/us/kbase/test/workspace/workspace/MetadataUpdateTest.java index 7d2301d96..b684c3195 100644 --- a/src/us/kbase/workspace/test/workspace/MetadataUpdateTest.java +++ b/src/test/java/us/kbase/test/workspace/workspace/MetadataUpdateTest.java @@ -1,10 +1,10 @@ -package us.kbase.workspace.test.workspace; +package us.kbase.test.workspace.workspace; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import static us.kbase.common.test.TestCommon.assertExceptionCorrect; -import static us.kbase.common.test.TestCommon.set; +import static us.kbase.test.common.TestCommon.assertExceptionCorrect; +import static us.kbase.test.common.TestCommon.set; import java.util.Arrays; import java.util.Optional; diff --git a/src/us/kbase/workspace/test/workspace/ObjectIDNoWSNoVerTest.java b/src/test/java/us/kbase/test/workspace/workspace/ObjectIDNoWSNoVerTest.java similarity index 98% rename from src/us/kbase/workspace/test/workspace/ObjectIDNoWSNoVerTest.java rename to src/test/java/us/kbase/test/workspace/workspace/ObjectIDNoWSNoVerTest.java index dc584a040..1aa769a7d 100644 --- a/src/us/kbase/workspace/test/workspace/ObjectIDNoWSNoVerTest.java +++ b/src/test/java/us/kbase/test/workspace/workspace/ObjectIDNoWSNoVerTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.workspace; +package us.kbase.test.workspace.workspace; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -9,7 +9,7 @@ import com.google.common.base.Optional; import nl.jqno.equalsverifier.EqualsVerifier; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.workspace.database.ObjectIDNoWSNoVer; public class ObjectIDNoWSNoVerTest { diff --git a/src/us/kbase/workspace/test/workspace/ObjectIdentifierTest.java b/src/test/java/us/kbase/test/workspace/workspace/ObjectIdentifierTest.java similarity index 98% rename from src/us/kbase/workspace/test/workspace/ObjectIdentifierTest.java rename to src/test/java/us/kbase/test/workspace/workspace/ObjectIdentifierTest.java index c23fbd3f9..9b18bca6c 100644 --- a/src/us/kbase/workspace/test/workspace/ObjectIdentifierTest.java +++ b/src/test/java/us/kbase/test/workspace/workspace/ObjectIdentifierTest.java @@ -1,15 +1,15 @@ -package us.kbase.workspace.test.workspace; +package us.kbase.test.workspace.workspace; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import static us.kbase.workspace.test.LongTextForTestUsage.TEXT255; -import static us.kbase.workspace.test.LongTextForTestUsage.TEXT256; -import static us.kbase.common.test.TestCommon.list; -import static us.kbase.common.test.TestCommon.ES; -import static us.kbase.common.test.TestCommon.EL; -import static us.kbase.common.test.TestCommon.EI; -import static us.kbase.common.test.TestCommon.opt; +import static us.kbase.test.common.TestCommon.EI; +import static us.kbase.test.common.TestCommon.EL; +import static us.kbase.test.common.TestCommon.ES; +import static us.kbase.test.common.TestCommon.list; +import static us.kbase.test.common.TestCommon.opt; +import static us.kbase.test.workspace.LongTextForTestUsage.TEXT255; +import static us.kbase.test.workspace.LongTextForTestUsage.TEXT256; import java.util.ArrayList; import java.util.Arrays; @@ -21,8 +21,8 @@ import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; -import us.kbase.common.test.MapBuilder; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.MapBuilder; +import us.kbase.test.common.TestCommon; import us.kbase.typedobj.core.SubsetSelection; import us.kbase.workspace.database.ObjectIdentifier; import us.kbase.workspace.database.WorkspaceIdentifier; diff --git a/src/us/kbase/workspace/test/workspace/ObjectInformationTest.java b/src/test/java/us/kbase/test/workspace/workspace/ObjectInformationTest.java similarity index 99% rename from src/us/kbase/workspace/test/workspace/ObjectInformationTest.java rename to src/test/java/us/kbase/test/workspace/workspace/ObjectInformationTest.java index 8b9c37787..9680642d3 100644 --- a/src/us/kbase/workspace/test/workspace/ObjectInformationTest.java +++ b/src/test/java/us/kbase/test/workspace/workspace/ObjectInformationTest.java @@ -1,11 +1,11 @@ -package us.kbase.workspace.test.workspace; +package us.kbase.test.workspace.workspace; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import static us.kbase.common.test.TestCommon.inst; -import static us.kbase.common.test.TestCommon.assertExceptionCorrect; +import static us.kbase.test.common.TestCommon.assertExceptionCorrect; +import static us.kbase.test.common.TestCommon.inst; import java.time.Instant; import java.util.Arrays; @@ -22,7 +22,7 @@ import com.google.common.collect.ImmutableMap; import nl.jqno.equalsverifier.EqualsVerifier; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.typedobj.core.AbsoluteTypeDefId; import us.kbase.typedobj.core.MD5; import us.kbase.typedobj.core.TypeDefName; diff --git a/src/us/kbase/workspace/test/workspace/ObjectResolverTest.java b/src/test/java/us/kbase/test/workspace/workspace/ObjectResolverTest.java similarity index 99% rename from src/us/kbase/workspace/test/workspace/ObjectResolverTest.java rename to src/test/java/us/kbase/test/workspace/workspace/ObjectResolverTest.java index 37748f8cc..9c1ea670b 100644 --- a/src/us/kbase/workspace/test/workspace/ObjectResolverTest.java +++ b/src/test/java/us/kbase/test/workspace/workspace/ObjectResolverTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.workspace; +package us.kbase.test.workspace.workspace; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -6,7 +6,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mockingDetails; import static org.mockito.Mockito.when; -import static us.kbase.common.test.TestCommon.set; +import static us.kbase.test.common.TestCommon.set; import java.util.Arrays; import java.util.Collections; @@ -17,7 +17,7 @@ import com.google.common.collect.ImmutableMap; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.common.test.TestException; import us.kbase.workspace.database.AllUsers; import us.kbase.workspace.database.ObjectIDResolvedWS; diff --git a/src/us/kbase/workspace/test/workspace/PermissionSetTest.java b/src/test/java/us/kbase/test/workspace/workspace/PermissionSetTest.java similarity index 98% rename from src/us/kbase/workspace/test/workspace/PermissionSetTest.java rename to src/test/java/us/kbase/test/workspace/workspace/PermissionSetTest.java index ff58fb51a..e31e35246 100644 --- a/src/us/kbase/workspace/test/workspace/PermissionSetTest.java +++ b/src/test/java/us/kbase/test/workspace/workspace/PermissionSetTest.java @@ -1,11 +1,10 @@ -package us.kbase.workspace.test.workspace; +package us.kbase.test.workspace.workspace; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; - -import static us.kbase.common.test.TestCommon.set; +import static us.kbase.test.common.TestCommon.set; import java.util.Arrays; import java.util.List; @@ -13,7 +12,7 @@ import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.workspace.database.AllUsers; import us.kbase.workspace.database.Permission; import us.kbase.workspace.database.PermissionSet; diff --git a/src/us/kbase/workspace/test/workspace/PermissionsCheckerFactoryTest.java b/src/test/java/us/kbase/test/workspace/workspace/PermissionsCheckerFactoryTest.java similarity index 99% rename from src/us/kbase/workspace/test/workspace/PermissionsCheckerFactoryTest.java rename to src/test/java/us/kbase/test/workspace/workspace/PermissionsCheckerFactoryTest.java index f34fc13f5..2b53d36c8 100644 --- a/src/us/kbase/workspace/test/workspace/PermissionsCheckerFactoryTest.java +++ b/src/test/java/us/kbase/test/workspace/workspace/PermissionsCheckerFactoryTest.java @@ -1,12 +1,12 @@ -package us.kbase.workspace.test.workspace; +package us.kbase.test.workspace.workspace; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static us.kbase.common.test.TestCommon.opt; -import static us.kbase.common.test.TestCommon.set; +import static us.kbase.test.common.TestCommon.opt; +import static us.kbase.test.common.TestCommon.set; import java.util.Arrays; import java.util.Collections; @@ -18,8 +18,8 @@ import com.google.common.collect.ImmutableMap; -import us.kbase.common.test.MapBuilder; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.MapBuilder; +import us.kbase.test.common.TestCommon; import us.kbase.workspace.database.AllUsers; import us.kbase.workspace.database.ObjectIDResolvedWS; import us.kbase.workspace.database.ObjectIdentifier; diff --git a/src/us/kbase/workspace/test/workspace/RefLimitTest.java b/src/test/java/us/kbase/test/workspace/workspace/RefLimitTest.java similarity index 98% rename from src/us/kbase/workspace/test/workspace/RefLimitTest.java rename to src/test/java/us/kbase/test/workspace/workspace/RefLimitTest.java index 024b64449..8c4da81e8 100644 --- a/src/us/kbase/workspace/test/workspace/RefLimitTest.java +++ b/src/test/java/us/kbase/test/workspace/workspace/RefLimitTest.java @@ -1,9 +1,9 @@ -package us.kbase.workspace.test.workspace; +package us.kbase.test.workspace.workspace; -import static us.kbase.common.test.TestCommon.assertExceptionCorrect; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; +import static us.kbase.test.common.TestCommon.assertExceptionCorrect; import java.util.Arrays; import java.util.Map; @@ -13,7 +13,7 @@ import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; -import us.kbase.common.test.MapBuilder; +import us.kbase.test.common.MapBuilder; import us.kbase.workspace.database.RefLimit; public class RefLimitTest { diff --git a/src/us/kbase/workspace/test/workspace/ReferenceGraphSearchTest.java b/src/test/java/us/kbase/test/workspace/workspace/ReferenceGraphSearchTest.java similarity index 97% rename from src/us/kbase/workspace/test/workspace/ReferenceGraphSearchTest.java rename to src/test/java/us/kbase/test/workspace/workspace/ReferenceGraphSearchTest.java index 08ca58562..7b609075d 100644 --- a/src/us/kbase/workspace/test/workspace/ReferenceGraphSearchTest.java +++ b/src/test/java/us/kbase/test/workspace/workspace/ReferenceGraphSearchTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.workspace; +package us.kbase.test.workspace.workspace; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -14,7 +14,7 @@ import com.google.common.collect.Sets; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.workspace.database.Reference; import us.kbase.workspace.database.refsearch.ReferenceGraphSearch; import us.kbase.workspace.database.refsearch.ReferenceGraphTopologyProvider; diff --git a/src/us/kbase/workspace/test/workspace/ReferenceSearchTreeTest.java b/src/test/java/us/kbase/test/workspace/workspace/ReferenceSearchTreeTest.java similarity index 99% rename from src/us/kbase/workspace/test/workspace/ReferenceSearchTreeTest.java rename to src/test/java/us/kbase/test/workspace/workspace/ReferenceSearchTreeTest.java index 567097f21..bf8e4ddfb 100644 --- a/src/us/kbase/workspace/test/workspace/ReferenceSearchTreeTest.java +++ b/src/test/java/us/kbase/test/workspace/workspace/ReferenceSearchTreeTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.workspace; +package us.kbase.test.workspace.workspace; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; diff --git a/src/us/kbase/workspace/test/workspace/ReferenceTest.java b/src/test/java/us/kbase/test/workspace/workspace/ReferenceTest.java similarity index 98% rename from src/us/kbase/workspace/test/workspace/ReferenceTest.java rename to src/test/java/us/kbase/test/workspace/workspace/ReferenceTest.java index 53f2ee96a..1efd4e902 100644 --- a/src/us/kbase/workspace/test/workspace/ReferenceTest.java +++ b/src/test/java/us/kbase/test/workspace/workspace/ReferenceTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.workspace; +package us.kbase.test.workspace.workspace; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; diff --git a/src/us/kbase/workspace/test/workspace/ReferenceTreeNodeTest.java b/src/test/java/us/kbase/test/workspace/workspace/ReferenceTreeNodeTest.java similarity index 97% rename from src/us/kbase/workspace/test/workspace/ReferenceTreeNodeTest.java rename to src/test/java/us/kbase/test/workspace/workspace/ReferenceTreeNodeTest.java index 08562d0b5..7d3cbb53b 100644 --- a/src/us/kbase/workspace/test/workspace/ReferenceTreeNodeTest.java +++ b/src/test/java/us/kbase/test/workspace/workspace/ReferenceTreeNodeTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.workspace; +package us.kbase.test.workspace.workspace; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; diff --git a/src/us/kbase/workspace/test/workspace/ResolvedObjectIdentifierTest.java b/src/test/java/us/kbase/test/workspace/workspace/ResolvedObjectIdentifierTest.java similarity index 98% rename from src/us/kbase/workspace/test/workspace/ResolvedObjectIdentifierTest.java rename to src/test/java/us/kbase/test/workspace/workspace/ResolvedObjectIdentifierTest.java index d8d696a15..e82b19eca 100644 --- a/src/us/kbase/workspace/test/workspace/ResolvedObjectIdentifierTest.java +++ b/src/test/java/us/kbase/test/workspace/workspace/ResolvedObjectIdentifierTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.workspace; +package us.kbase.test.workspace.workspace; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -7,7 +7,7 @@ import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.workspace.database.Reference; import us.kbase.workspace.database.ResolvedObjectID; import us.kbase.workspace.database.ResolvedObjectIDNoVer; diff --git a/src/us/kbase/workspace/test/workspace/ResolvedWorkspaceIDTest.java b/src/test/java/us/kbase/test/workspace/workspace/ResolvedWorkspaceIDTest.java similarity index 96% rename from src/us/kbase/workspace/test/workspace/ResolvedWorkspaceIDTest.java rename to src/test/java/us/kbase/test/workspace/workspace/ResolvedWorkspaceIDTest.java index f716e0573..ffc2c1fb0 100644 --- a/src/us/kbase/workspace/test/workspace/ResolvedWorkspaceIDTest.java +++ b/src/test/java/us/kbase/test/workspace/workspace/ResolvedWorkspaceIDTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.workspace; +package us.kbase.test.workspace.workspace; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -7,7 +7,7 @@ import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.workspace.database.ResolvedWorkspaceID; diff --git a/src/us/kbase/workspace/test/workspace/TestIDReferenceHandlerFactory.java b/src/test/java/us/kbase/test/workspace/workspace/TestIDReferenceHandlerFactory.java similarity index 99% rename from src/us/kbase/workspace/test/workspace/TestIDReferenceHandlerFactory.java rename to src/test/java/us/kbase/test/workspace/workspace/TestIDReferenceHandlerFactory.java index 587992d8e..53e68679f 100644 --- a/src/us/kbase/workspace/test/workspace/TestIDReferenceHandlerFactory.java +++ b/src/test/java/us/kbase/test/workspace/workspace/TestIDReferenceHandlerFactory.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.workspace; +package us.kbase.test.workspace.workspace; import java.util.Arrays; import java.util.HashMap; diff --git a/src/us/kbase/workspace/test/workspace/UncheckedUserMetadataTest.java b/src/test/java/us/kbase/test/workspace/workspace/UncheckedUserMetadataTest.java similarity index 98% rename from src/us/kbase/workspace/test/workspace/UncheckedUserMetadataTest.java rename to src/test/java/us/kbase/test/workspace/workspace/UncheckedUserMetadataTest.java index 24723b6b1..66cb8d3c7 100644 --- a/src/us/kbase/workspace/test/workspace/UncheckedUserMetadataTest.java +++ b/src/test/java/us/kbase/test/workspace/workspace/UncheckedUserMetadataTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.workspace; +package us.kbase.test.workspace.workspace; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; diff --git a/src/us/kbase/workspace/test/workspace/UserWorkspaceIDsTest.java b/src/test/java/us/kbase/test/workspace/workspace/UserWorkspaceIDsTest.java similarity index 97% rename from src/us/kbase/workspace/test/workspace/UserWorkspaceIDsTest.java rename to src/test/java/us/kbase/test/workspace/workspace/UserWorkspaceIDsTest.java index 76ccc255c..725d5206f 100644 --- a/src/us/kbase/workspace/test/workspace/UserWorkspaceIDsTest.java +++ b/src/test/java/us/kbase/test/workspace/workspace/UserWorkspaceIDsTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.workspace; +package us.kbase.test.workspace.workspace; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -14,7 +14,7 @@ import org.junit.Test; import nl.jqno.equalsverifier.EqualsVerifier; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.workspace.database.Permission; import us.kbase.workspace.database.UserWorkspaceIDs; import us.kbase.workspace.database.WorkspaceUser; diff --git a/src/us/kbase/workspace/test/workspace/WorkspaceConstructorTest.java b/src/test/java/us/kbase/test/workspace/workspace/WorkspaceConstructorTest.java similarity index 98% rename from src/us/kbase/workspace/test/workspace/WorkspaceConstructorTest.java rename to src/test/java/us/kbase/test/workspace/workspace/WorkspaceConstructorTest.java index 67cfe5706..e71a05c9d 100644 --- a/src/us/kbase/workspace/test/workspace/WorkspaceConstructorTest.java +++ b/src/test/java/us/kbase/test/workspace/workspace/WorkspaceConstructorTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.workspace; +package us.kbase.test.workspace.workspace; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -10,7 +10,7 @@ import org.junit.Test; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.typedobj.core.TempFilesManager; import us.kbase.typedobj.core.TypedObjectValidator; import us.kbase.workspace.database.ResourceUsageConfigurationBuilder; diff --git a/src/us/kbase/workspace/test/workspace/WorkspaceInformationTest.java b/src/test/java/us/kbase/test/workspace/workspace/WorkspaceInformationTest.java similarity index 99% rename from src/us/kbase/workspace/test/workspace/WorkspaceInformationTest.java rename to src/test/java/us/kbase/test/workspace/workspace/WorkspaceInformationTest.java index 2a2900e2a..e6e82fe34 100644 --- a/src/us/kbase/workspace/test/workspace/WorkspaceInformationTest.java +++ b/src/test/java/us/kbase/test/workspace/workspace/WorkspaceInformationTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.workspace; +package us.kbase.test.workspace.workspace; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.fail; @@ -11,7 +11,7 @@ import com.google.common.collect.ImmutableMap; import nl.jqno.equalsverifier.EqualsVerifier; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.workspace.database.Permission; import us.kbase.workspace.database.UncheckedUserMetadata; import us.kbase.workspace.database.WorkspaceInformation; diff --git a/src/us/kbase/workspace/test/workspace/WorkspaceIntegrationWithGridFSTest.java b/src/test/java/us/kbase/test/workspace/workspace/WorkspaceIntegrationWithGridFSTest.java similarity index 97% rename from src/us/kbase/workspace/test/workspace/WorkspaceIntegrationWithGridFSTest.java rename to src/test/java/us/kbase/test/workspace/workspace/WorkspaceIntegrationWithGridFSTest.java index 5a28058ca..b806f6778 100644 --- a/src/us/kbase/workspace/test/workspace/WorkspaceIntegrationWithGridFSTest.java +++ b/src/test/java/us/kbase/test/workspace/workspace/WorkspaceIntegrationWithGridFSTest.java @@ -1,18 +1,18 @@ -package us.kbase.workspace.test.workspace; +package us.kbase.test.workspace.workspace; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; -import static us.kbase.workspace.test.WorkspaceTestCommon.basicProv; -import static us.kbase.workspace.test.WorkspaceTestCommon.SAFE_DATA; -import static us.kbase.workspace.test.WorkspaceTestCommon.SAFE_DATA_MD5; -import static us.kbase.workspace.test.WorkspaceTestCommon.SAFE_DATA_SIZE; -import static us.kbase.workspace.test.WorkspaceTestCommon.ATYPE; -import static us.kbase.workspace.test.WorkspaceTestCommon.ATYPE_1_0; -import static us.kbase.workspace.test.WorkspaceTestCommon.ATYPE2; -import static us.kbase.workspace.test.WorkspaceTestCommon.ATYPE2_2_1; -import static us.kbase.workspace.test.WorkspaceTestCommon.ATYPE2_2_0; -import static us.kbase.workspace.test.WorkspaceTestCommon.ATYPE2_1_0; -import static us.kbase.workspace.test.WorkspaceTestCommon.ATYPE2_0_1; +import static us.kbase.test.workspace.WorkspaceTestCommon.ATYPE; +import static us.kbase.test.workspace.WorkspaceTestCommon.ATYPE2; +import static us.kbase.test.workspace.WorkspaceTestCommon.ATYPE2_0_1; +import static us.kbase.test.workspace.WorkspaceTestCommon.ATYPE2_1_0; +import static us.kbase.test.workspace.WorkspaceTestCommon.ATYPE2_2_0; +import static us.kbase.test.workspace.WorkspaceTestCommon.ATYPE2_2_1; +import static us.kbase.test.workspace.WorkspaceTestCommon.ATYPE_1_0; +import static us.kbase.test.workspace.WorkspaceTestCommon.SAFE_DATA; +import static us.kbase.test.workspace.WorkspaceTestCommon.SAFE_DATA_MD5; +import static us.kbase.test.workspace.WorkspaceTestCommon.SAFE_DATA_SIZE; +import static us.kbase.test.workspace.WorkspaceTestCommon.basicProv; import java.io.File; import java.nio.file.Paths; @@ -38,8 +38,9 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; -import us.kbase.common.test.TestCommon; import us.kbase.common.test.controllers.mongo.MongoController; +import us.kbase.test.common.TestCommon; +import us.kbase.test.workspace.WorkspaceTestCommon; import us.kbase.typedobj.core.AbsoluteTypeDefId; import us.kbase.typedobj.core.LocalTypeProvider; import us.kbase.typedobj.core.TempFilesManager; @@ -68,7 +69,6 @@ import us.kbase.workspace.database.mongo.GridFSBlobStore; import us.kbase.workspace.database.mongo.MongoWorkspaceDB; import us.kbase.workspace.database.provenance.Provenance; -import us.kbase.workspace.test.WorkspaceTestCommon; /** Workspace library level integration tests that don't need to be run against multiple * backends or with varying memory usage strategies. See the notes in {@link WorkspaceTest}. diff --git a/src/us/kbase/workspace/test/workspace/WorkspaceListenerTest.java b/src/test/java/us/kbase/test/workspace/workspace/WorkspaceListenerTest.java similarity index 99% rename from src/us/kbase/workspace/test/workspace/WorkspaceListenerTest.java rename to src/test/java/us/kbase/test/workspace/workspace/WorkspaceListenerTest.java index 7a8226bae..ff5105d8f 100644 --- a/src/us/kbase/workspace/test/workspace/WorkspaceListenerTest.java +++ b/src/test/java/us/kbase/test/workspace/workspace/WorkspaceListenerTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.workspace; +package us.kbase.test.workspace.workspace; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyLong; @@ -10,9 +10,9 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.when; import static org.mockito.Mockito.verify; -import static us.kbase.common.test.TestCommon.inst; -import static us.kbase.common.test.TestCommon.set; -import static us.kbase.workspace.test.WorkspaceTestCommon.basicProv; +import static us.kbase.test.common.TestCommon.inst; +import static us.kbase.test.common.TestCommon.set; +import static us.kbase.test.workspace.WorkspaceTestCommon.basicProv; import java.time.Instant; import java.util.Arrays; diff --git a/src/us/kbase/workspace/test/workspace/WorkspaceLongTest.java b/src/test/java/us/kbase/test/workspace/workspace/WorkspaceLongTest.java similarity index 98% rename from src/us/kbase/workspace/test/workspace/WorkspaceLongTest.java rename to src/test/java/us/kbase/test/workspace/workspace/WorkspaceLongTest.java index 7c8371448..5dd816c74 100644 --- a/src/us/kbase/workspace/test/workspace/WorkspaceLongTest.java +++ b/src/test/java/us/kbase/test/workspace/workspace/WorkspaceLongTest.java @@ -1,11 +1,10 @@ -package us.kbase.workspace.test.workspace; +package us.kbase.test.workspace.workspace; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; -import static us.kbase.common.test.TestCommon.opt; -import static us.kbase.workspace.test.LongTextForTestUsage.TEXT1000; -import static us.kbase.workspace.test.WorkspaceTestCommon.basicProv; - +import static us.kbase.test.common.TestCommon.opt; +import static us.kbase.test.workspace.LongTextForTestUsage.TEXT1000; +import static us.kbase.test.workspace.WorkspaceTestCommon.basicProv; import java.io.File; import java.io.InputStream; diff --git a/src/us/kbase/workspace/test/workspace/WorkspaceObjectDataTest.java b/src/test/java/us/kbase/test/workspace/workspace/WorkspaceObjectDataTest.java similarity index 98% rename from src/us/kbase/workspace/test/workspace/WorkspaceObjectDataTest.java rename to src/test/java/us/kbase/test/workspace/workspace/WorkspaceObjectDataTest.java index fb2a9af01..7ed890ed4 100644 --- a/src/us/kbase/workspace/test/workspace/WorkspaceObjectDataTest.java +++ b/src/test/java/us/kbase/test/workspace/workspace/WorkspaceObjectDataTest.java @@ -1,12 +1,12 @@ -package us.kbase.workspace.test.workspace; +package us.kbase.test.workspace.workspace; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import static us.kbase.common.test.TestCommon.assertExceptionCorrect; -import static us.kbase.common.test.TestCommon.inst; -import static us.kbase.common.test.TestCommon.opt; -import static us.kbase.workspace.test.WorkspaceTestCommon.basicProv; +import static us.kbase.test.common.TestCommon.assertExceptionCorrect; +import static us.kbase.test.common.TestCommon.inst; +import static us.kbase.test.common.TestCommon.opt; +import static us.kbase.test.workspace.WorkspaceTestCommon.basicProv; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -20,7 +20,7 @@ import com.google.common.collect.ImmutableMap; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.typedobj.core.AbsoluteTypeDefId; import us.kbase.typedobj.core.SubsetSelection; import us.kbase.typedobj.core.TypeDefName; diff --git a/src/us/kbase/workspace/test/workspace/WorkspaceTest.java b/src/test/java/us/kbase/test/workspace/workspace/WorkspaceTest.java similarity index 99% rename from src/us/kbase/workspace/test/workspace/WorkspaceTest.java rename to src/test/java/us/kbase/test/workspace/workspace/WorkspaceTest.java index 819c0b8e0..3fe7df809 100644 --- a/src/us/kbase/workspace/test/workspace/WorkspaceTest.java +++ b/src/test/java/us/kbase/test/workspace/workspace/WorkspaceTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.workspace; +package us.kbase.test.workspace.workspace; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; @@ -8,18 +8,18 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static us.kbase.common.test.TestCommon.inst; -import static us.kbase.common.test.TestCommon.list; -import static us.kbase.common.test.TestCommon.now; -import static us.kbase.common.test.TestCommon.opt; -import static us.kbase.common.test.TestCommon.set; -import static us.kbase.workspace.test.LongTextForTestUsage.LONG_TEXT_PART; -import static us.kbase.workspace.test.LongTextForTestUsage.LONG_TEXT; -import static us.kbase.workspace.test.LongTextForTestUsage.TEXT100; -import static us.kbase.workspace.test.LongTextForTestUsage.TEXT101; -import static us.kbase.workspace.test.LongTextForTestUsage.TEXT256; -import static us.kbase.workspace.test.LongTextForTestUsage.TEXT1000; -import static us.kbase.workspace.test.WorkspaceTestCommon.basicProv; +import static us.kbase.test.common.TestCommon.inst; +import static us.kbase.test.common.TestCommon.list; +import static us.kbase.test.common.TestCommon.now; +import static us.kbase.test.common.TestCommon.opt; +import static us.kbase.test.common.TestCommon.set; +import static us.kbase.test.workspace.LongTextForTestUsage.LONG_TEXT; +import static us.kbase.test.workspace.LongTextForTestUsage.LONG_TEXT_PART; +import static us.kbase.test.workspace.LongTextForTestUsage.TEXT100; +import static us.kbase.test.workspace.LongTextForTestUsage.TEXT1000; +import static us.kbase.test.workspace.LongTextForTestUsage.TEXT101; +import static us.kbase.test.workspace.LongTextForTestUsage.TEXT256; +import static us.kbase.test.workspace.WorkspaceTestCommon.basicProv; import java.io.File; import java.io.StringReader; @@ -57,7 +57,7 @@ import com.google.common.collect.Sets; import us.kbase.common.service.JsonTokenStream; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.typedobj.core.AbsoluteTypeDefId; import us.kbase.typedobj.core.SubsetSelection; import us.kbase.typedobj.core.TempFileListener; diff --git a/src/us/kbase/workspace/test/workspace/WorkspaceTester.java b/src/test/java/us/kbase/test/workspace/workspace/WorkspaceTester.java similarity index 98% rename from src/us/kbase/workspace/test/workspace/WorkspaceTester.java rename to src/test/java/us/kbase/test/workspace/workspace/WorkspaceTester.java index d933fae52..c45001416 100644 --- a/src/us/kbase/workspace/test/workspace/WorkspaceTester.java +++ b/src/test/java/us/kbase/test/workspace/workspace/WorkspaceTester.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.workspace; +package us.kbase.test.workspace.workspace; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertNotNull; @@ -6,14 +6,14 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static us.kbase.common.test.TestCommon.assertExceptionCorrect; -import static us.kbase.workspace.test.WorkspaceTestCommon.ATYPE_0_1; -import static us.kbase.workspace.test.WorkspaceTestCommon.ATYPE_1_0; -import static us.kbase.workspace.test.WorkspaceTestCommon.ATYPE_2_0; -import static us.kbase.workspace.test.WorkspaceTestCommon.ATYPE2_0_1; -import static us.kbase.workspace.test.WorkspaceTestCommon.ATYPE2_1_0; -import static us.kbase.workspace.test.WorkspaceTestCommon.ATYPE2_2_0; -import static us.kbase.workspace.test.WorkspaceTestCommon.ATYPE2_2_1; +import static us.kbase.test.common.TestCommon.assertExceptionCorrect; +import static us.kbase.test.workspace.WorkspaceTestCommon.ATYPE2_0_1; +import static us.kbase.test.workspace.WorkspaceTestCommon.ATYPE2_1_0; +import static us.kbase.test.workspace.WorkspaceTestCommon.ATYPE2_2_0; +import static us.kbase.test.workspace.WorkspaceTestCommon.ATYPE2_2_1; +import static us.kbase.test.workspace.WorkspaceTestCommon.ATYPE_0_1; +import static us.kbase.test.workspace.WorkspaceTestCommon.ATYPE_1_0; +import static us.kbase.test.workspace.WorkspaceTestCommon.ATYPE_2_0; import java.io.File; import java.io.IOException; @@ -44,9 +44,12 @@ import org.junit.runners.Parameterized.Parameters; import org.slf4j.LoggerFactory; -import us.kbase.common.test.TestCommon; import us.kbase.common.test.TestException; import us.kbase.common.test.controllers.mongo.MongoController; +import us.kbase.test.common.TestCommon; +import us.kbase.test.workspace.JsonTokenStreamOCStat; +import us.kbase.test.workspace.WorkspaceTestCommon; +import us.kbase.test.workspace.controllers.minio.MinioController; import us.kbase.typedobj.core.LocalTypeProvider; import us.kbase.typedobj.core.TempFilesManager; import us.kbase.typedobj.core.TypeDefId; @@ -88,9 +91,6 @@ import us.kbase.workspace.database.provenance.Provenance; import us.kbase.workspace.database.provenance.ProvenanceAction; import us.kbase.workspace.database.provenance.SubAction; -import us.kbase.workspace.test.JsonTokenStreamOCStat; -import us.kbase.workspace.test.WorkspaceTestCommon; -import us.kbase.workspace.test.controllers.minio.MinioController; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; import software.amazon.awssdk.regions.Region; diff --git a/src/us/kbase/workspace/test/workspace/WorkspaceUnitTest.java b/src/test/java/us/kbase/test/workspace/workspace/WorkspaceUnitTest.java similarity index 99% rename from src/us/kbase/workspace/test/workspace/WorkspaceUnitTest.java rename to src/test/java/us/kbase/test/workspace/workspace/WorkspaceUnitTest.java index e6cae3287..2303288d4 100644 --- a/src/us/kbase/workspace/test/workspace/WorkspaceUnitTest.java +++ b/src/test/java/us/kbase/test/workspace/workspace/WorkspaceUnitTest.java @@ -1,4 +1,4 @@ -package us.kbase.workspace.test.workspace; +package us.kbase.test.workspace.workspace; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -11,10 +11,10 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static us.kbase.common.test.TestCommon.now; -import static us.kbase.common.test.TestCommon.list; -import static us.kbase.common.test.TestCommon.set; -import static us.kbase.workspace.test.WorkspaceTestCommon.basicProv; +import static us.kbase.test.common.TestCommon.list; +import static us.kbase.test.common.TestCommon.now; +import static us.kbase.test.common.TestCommon.set; +import static us.kbase.test.workspace.WorkspaceTestCommon.basicProv; import java.io.IOException; import java.time.Instant; @@ -51,7 +51,7 @@ import us.kbase.workspace.exceptions.WorkspaceAuthorizationException; import us.kbase.auth.AuthToken; import us.kbase.common.service.UObject; -import us.kbase.common.test.TestCommon; +import us.kbase.test.common.TestCommon; import us.kbase.typedobj.core.AbsoluteTypeDefId; import us.kbase.typedobj.core.SubsetSelection; import us.kbase.typedobj.core.TempFilesManager; diff --git a/src/us/kbase/workspace/test/workspace/WorkspaceUserMetadataTest.java b/src/test/java/us/kbase/test/workspace/workspace/WorkspaceUserMetadataTest.java similarity index 98% rename from src/us/kbase/workspace/test/workspace/WorkspaceUserMetadataTest.java rename to src/test/java/us/kbase/test/workspace/workspace/WorkspaceUserMetadataTest.java index 33830193e..29b320529 100644 --- a/src/us/kbase/workspace/test/workspace/WorkspaceUserMetadataTest.java +++ b/src/test/java/us/kbase/test/workspace/workspace/WorkspaceUserMetadataTest.java @@ -1,9 +1,9 @@ -package us.kbase.workspace.test.workspace; +package us.kbase.test.workspace.workspace; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.fail; -import static us.kbase.common.test.TestCommon.assertExceptionCorrect; +import static us.kbase.test.common.TestCommon.assertExceptionCorrect; import java.util.HashMap; import java.util.Map; diff --git a/src/us/kbase/typedobj/db/test/backward.Annotations.2.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/backward.Annotations.2.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/backward.Annotations.2.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/backward.Annotations.2.spec.properties diff --git a/src/us/kbase/typedobj/db/test/backward.Annotations.3.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/backward.Annotations.3.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/backward.Annotations.3.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/backward.Annotations.3.spec.properties diff --git a/src/us/kbase/typedobj/db/test/backward.Annotations.4.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/backward.Annotations.4.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/backward.Annotations.4.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/backward.Annotations.4.spec.properties diff --git a/src/us/kbase/typedobj/db/test/backward.Annotations.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/backward.Annotations.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/backward.Annotations.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/backward.Annotations.spec.properties diff --git a/src/us/kbase/typedobj/db/test/backward.Expression.2.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/backward.Expression.2.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/backward.Expression.2.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/backward.Expression.2.spec.properties diff --git a/src/us/kbase/typedobj/db/test/backward.Expression.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/backward.Expression.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/backward.Expression.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/backward.Expression.spec.properties diff --git a/src/us/kbase/typedobj/db/test/backward.Regulation.2.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/backward.Regulation.2.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/backward.Regulation.2.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/backward.Regulation.2.spec.properties diff --git a/src/us/kbase/typedobj/db/test/backward.Regulation.3.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/backward.Regulation.3.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/backward.Regulation.3.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/backward.Regulation.3.spec.properties diff --git a/src/us/kbase/typedobj/db/test/backward.Regulation.4.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/backward.Regulation.4.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/backward.Regulation.4.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/backward.Regulation.4.spec.properties diff --git a/src/us/kbase/typedobj/db/test/backward.Regulation.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/backward.Regulation.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/backward.Regulation.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/backward.Regulation.spec.properties diff --git a/src/us/kbase/typedobj/db/test/deps.DepModule.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/deps.DepModule.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/deps.DepModule.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/deps.DepModule.spec.properties diff --git a/src/us/kbase/typedobj/db/test/deps.SomeModule.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/deps.SomeModule.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/deps.SomeModule.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/deps.SomeModule.spec.properties diff --git a/src/us/kbase/typedobj/db/test/descr.Descr.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/descr.Descr.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/descr.Descr.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/descr.Descr.spec.properties diff --git a/src/us/kbase/typedobj/db/test/error.Common.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/error.Common.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/error.Common.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/error.Common.spec.properties diff --git a/src/us/kbase/typedobj/db/test/error.DoubleModule.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/error.DoubleModule.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/error.DoubleModule.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/error.DoubleModule.spec.properties diff --git a/src/us/kbase/typedobj/db/test/error.LongFuncName.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/error.LongFuncName.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/error.LongFuncName.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/error.LongFuncName.spec.properties diff --git a/src/us/kbase/typedobj/db/test/error.LongTypeName.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/error.LongTypeName.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/error.LongTypeName.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/error.LongTypeName.spec.properties diff --git a/src/us/kbase/typedobj/db/test/error.StructDuplication.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/error.StructDuplication.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/error.StructDuplication.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/error.StructDuplication.spec.properties diff --git a/src/us/kbase/typedobj/db/test/error.Test.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/error.Test.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/error.Test.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/error.Test.spec.properties diff --git a/src/us/kbase/typedobj/db/test/md5.Common.2.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/md5.Common.2.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/md5.Common.2.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/md5.Common.2.spec.properties diff --git a/src/us/kbase/typedobj/db/test/md5.Common.3.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/md5.Common.3.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/md5.Common.3.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/md5.Common.3.spec.properties diff --git a/src/us/kbase/typedobj/db/test/md5.Common.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/md5.Common.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/md5.Common.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/md5.Common.spec.properties diff --git a/src/us/kbase/typedobj/db/test/md5.Upper.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/md5.Upper.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/md5.Upper.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/md5.Upper.spec.properties diff --git a/src/us/kbase/typedobj/db/test/restrict.Common.2.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/restrict.Common.2.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/restrict.Common.2.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/restrict.Common.2.spec.properties diff --git a/src/us/kbase/typedobj/db/test/restrict.Common.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/restrict.Common.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/restrict.Common.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/restrict.Common.spec.properties diff --git a/src/us/kbase/typedobj/db/test/restrict.Middle.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/restrict.Middle.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/restrict.Middle.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/restrict.Middle.spec.properties diff --git a/src/us/kbase/typedobj/db/test/restrict.Upper.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/restrict.Upper.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/restrict.Upper.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/restrict.Upper.spec.properties diff --git a/src/us/kbase/typedobj/db/test/rollback.First.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/rollback.First.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/rollback.First.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/rollback.First.spec.properties diff --git a/src/us/kbase/typedobj/db/test/simple.Annotation.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/simple.Annotation.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/simple.Annotation.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/simple.Annotation.spec.properties diff --git a/src/us/kbase/typedobj/db/test/simple.Regulation.2.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/simple.Regulation.2.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/simple.Regulation.2.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/simple.Regulation.2.spec.properties diff --git a/src/us/kbase/typedobj/db/test/simple.Regulation.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/simple.Regulation.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/simple.Regulation.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/simple.Regulation.spec.properties diff --git a/src/us/kbase/typedobj/db/test/simple.Sequence.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/simple.Sequence.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/simple.Sequence.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/simple.Sequence.spec.properties diff --git a/src/us/kbase/typedobj/db/test/simple.Taxonomy.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/simple.Taxonomy.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/simple.Taxonomy.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/simple.Taxonomy.spec.properties diff --git a/src/us/kbase/typedobj/db/test/stop.Dependant.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/stop.Dependant.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/stop.Dependant.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/stop.Dependant.spec.properties diff --git a/src/us/kbase/typedobj/db/test/stop.Regulation.2.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/stop.Regulation.2.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/stop.Regulation.2.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/stop.Regulation.2.spec.properties diff --git a/src/us/kbase/typedobj/db/test/stop.Regulation.spec.properties b/src/test/resources/us/kbase/test/typedobj/db/stop.Regulation.spec.properties similarity index 100% rename from src/us/kbase/typedobj/db/test/stop.Regulation.spec.properties rename to src/test/resources/us/kbase/test/typedobj/db/stop.Regulation.spec.properties diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/FBA.FBAModel.invalid.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/FBA.FBAModel.invalid.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/FBA.FBAModel.invalid.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/FBA.FBAModel.invalid.instance.1 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/FBA.FBAModel.valid.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/FBA.FBAModel.valid.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/FBA.FBAModel.valid.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/FBA.FBAModel.valid.instance.1 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/FBA.FBAModel.valid.instance.2 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/FBA.FBAModel.valid.instance.2 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/FBA.FBAModel.valid.instance.2 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/FBA.FBAModel.valid.instance.2 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/FBA.FBAResult.valid.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/FBA.FBAResult.valid.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/FBA.FBAResult.valid.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/FBA.FBAResult.valid.instance.1 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/FBA.spec b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/FBA.spec similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/FBA.spec rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/FBA.spec diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.BigNumberObj.invalid.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.BigNumberObj.invalid.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.BigNumberObj.invalid.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.BigNumberObj.invalid.instance.1 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.BigNumberObj.invalid.instance.2 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.BigNumberObj.invalid.instance.2 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.BigNumberObj.invalid.instance.2 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.BigNumberObj.invalid.instance.2 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.BigNumberObj.invalid.instance.3 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.BigNumberObj.invalid.instance.3 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.BigNumberObj.invalid.instance.3 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.BigNumberObj.invalid.instance.3 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.BigNumberObj.invalid.instance.4 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.BigNumberObj.invalid.instance.4 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.BigNumberObj.invalid.instance.4 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.BigNumberObj.invalid.instance.4 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.BigNumberObj.valid.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.BigNumberObj.valid.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.BigNumberObj.valid.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.BigNumberObj.valid.instance.1 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.BigNumberObj.valid.instance.2 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.BigNumberObj.valid.instance.2 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.BigNumberObj.valid.instance.2 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.BigNumberObj.valid.instance.2 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.Genome.invalid.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.Genome.invalid.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.Genome.invalid.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.Genome.invalid.instance.1 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.Genome.invalid.instance.2 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.Genome.invalid.instance.2 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.Genome.invalid.instance.2 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.Genome.invalid.instance.2 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.Genome.invalid.instance.3 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.Genome.invalid.instance.3 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.Genome.invalid.instance.3 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.Genome.invalid.instance.3 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.Genome.invalid.instance.4 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.Genome.invalid.instance.4 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.Genome.invalid.instance.4 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.Genome.invalid.instance.4 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.Genome.valid.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.Genome.valid.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.Genome.valid.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.Genome.valid.instance.1 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.Genome.valid.instance.2 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.Genome.valid.instance.2 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.Genome.valid.instance.2 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.Genome.valid.instance.2 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.Genome.valid.instance.3 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.Genome.valid.instance.3 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.Genome.valid.instance.3 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.Genome.valid.instance.3 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.1 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.10 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.10 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.10 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.10 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.11 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.11 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.11 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.11 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.12 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.12 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.12 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.12 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.13 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.13 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.13 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.13 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.14 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.14 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.14 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.14 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.15 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.15 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.15 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.15 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.16 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.16 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.16 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.16 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.17 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.17 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.17 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.17 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.2 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.2 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.2 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.2 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.3 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.3 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.3 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.3 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.4 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.4 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.4 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.4 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.5 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.5 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.5 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.5 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.6 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.6 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.6 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.6 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.7 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.7 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.7 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.7 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.8 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.8 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.8 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.8 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.9 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.9 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.invalid.instance.9 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.invalid.instance.9 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.valid.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.valid.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.valid.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.valid.instance.1 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.valid.instance.2 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.valid.instance.2 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.valid.instance.2 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.valid.instance.2 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.valid.instance.3 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.valid.instance.3 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.valid.instance.3 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.valid.instance.3 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.valid.instance.4 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.valid.instance.4 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.valid.instance.4 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.valid.instance.4 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.valid.instance.5 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.valid.instance.5 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.NumberObj.valid.instance.5 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.NumberObj.valid.instance.5 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.RandomObject.invalid.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.RandomObject.invalid.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.RandomObject.invalid.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.RandomObject.invalid.instance.1 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.RandomObject.valid.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.RandomObject.valid.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.RandomObject.valid.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.RandomObject.valid.instance.1 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.RandomObject.valid.instance.2 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.RandomObject.valid.instance.2 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.RandomObject.valid.instance.2 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.RandomObject.valid.instance.2 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.TupleObject.invalid.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.TupleObject.invalid.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.TupleObject.invalid.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.TupleObject.invalid.instance.1 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.TupleObject.invalid.instance.2 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.TupleObject.invalid.instance.2 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.TupleObject.invalid.instance.2 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.TupleObject.invalid.instance.2 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.TupleObject.valid.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.TupleObject.valid.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.TupleObject.valid.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.TupleObject.valid.instance.1 diff --git a/src/us/kbase/typedobj/test/files/BasicValidation/KB.spec b/src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.spec similarity index 100% rename from src/us/kbase/typedobj/test/files/BasicValidation/KB.spec rename to src/test/resources/us/kbase/test/typedobj/files/BasicValidation/KB.spec diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/KB.spec b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/KB.spec similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/KB.spec rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/KB.spec diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.001 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.001 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.001 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.001 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.002 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.002 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.002 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.002 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.003 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.003 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.003 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.003 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.004 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.004 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.004 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.004 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.005 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.005 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.005 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.005 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.006 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.006 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.006 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.006 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.007 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.007 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.007 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.007 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.008 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.008 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.008 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.008 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.009 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.009 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.009 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.009 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.010 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.010 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.010 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.010 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.011 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.011 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.011 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.011 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.012 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.012 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.012 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.012 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.013 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.013 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.013 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.013 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.014 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.014 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.014 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.014 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.015 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.015 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.015 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.015 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.016 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.016 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.016 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.016 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.017 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.017 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.017 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.017 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.018 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.018 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.018 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.018 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.019 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.019 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.019 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.019 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.020 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.020 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.020 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.020 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.021 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.021 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.021 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.021 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.022 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.022 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.022 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.022 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.023 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.023 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.023 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.023 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.024 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.024 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.024 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.024 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.025 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.025 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.025 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.025 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.026 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.026 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.026 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.026 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.027 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.027 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.027 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.027 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.028 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.028 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.028 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.028 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.029 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.029 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.029 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.029 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.030 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.030 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.030 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.030 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.031 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.031 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.031 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.031 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.032 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.032 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.032 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.032 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.033 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.033 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.033 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.033 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.034 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.034 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.034 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.034 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.035 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.035 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.035 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.035 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.036 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.036 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.036 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.036 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.037 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.037 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.037 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.037 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.038 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.038 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.038 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.038 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.039 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.039 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.039 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.039 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.040 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.040 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.040 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.040 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.041 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.041 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.041 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.041 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.042 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.042 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.042 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.042 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.043 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.043 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.043 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.043 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.044 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.044 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.044 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.044 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.045 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.045 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.045 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.045 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.046 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.046 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.046 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.046 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.047 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.047 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.047 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.047 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.048 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.048 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.048 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.048 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.049 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.049 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.049 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.049 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.050 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.050 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.050 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.050 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.051 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.051 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.051 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.051 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.052 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.052 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.052 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.052 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.053 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.053 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.053 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.053 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.054 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.054 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.054 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.054 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.055 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.055 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.055 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.055 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.056 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.056 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.056 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.056 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.057 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.057 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.057 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.057 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.058 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.058 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.058 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.058 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.059 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.059 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.059 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.059 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.060 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.060 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.060 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.060 diff --git a/src/us/kbase/typedobj/test/files/DetailedValidation/instance.061 b/src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.061 similarity index 100% rename from src/us/kbase/typedobj/test/files/DetailedValidation/instance.061 rename to src/test/resources/us/kbase/test/typedobj/files/DetailedValidation/instance.061 diff --git a/src/us/kbase/typedobj/test/files/IdProcessing/FBA.spec b/src/test/resources/us/kbase/test/typedobj/files/IdProcessing/FBA.spec similarity index 100% rename from src/us/kbase/typedobj/test/files/IdProcessing/FBA.spec rename to src/test/resources/us/kbase/test/typedobj/files/IdProcessing/FBA.spec diff --git a/src/us/kbase/typedobj/test/files/IdProcessing/KB.AltIDs.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.AltIDs.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/IdProcessing/KB.AltIDs.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.AltIDs.instance.1 diff --git a/src/us/kbase/typedobj/test/files/IdProcessing/KB.AltIDs.instance.1.ids b/src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.AltIDs.instance.1.ids similarity index 100% rename from src/us/kbase/typedobj/test/files/IdProcessing/KB.AltIDs.instance.1.ids rename to src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.AltIDs.instance.1.ids diff --git a/src/us/kbase/typedobj/test/files/IdProcessing/KB.DeepFeatureMap.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.DeepFeatureMap.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/IdProcessing/KB.DeepFeatureMap.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.DeepFeatureMap.instance.1 diff --git a/src/us/kbase/typedobj/test/files/IdProcessing/KB.DeepFeatureMap.instance.1.ids b/src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.DeepFeatureMap.instance.1.ids similarity index 100% rename from src/us/kbase/typedobj/test/files/IdProcessing/KB.DeepFeatureMap.instance.1.ids rename to src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.DeepFeatureMap.instance.1.ids diff --git a/src/us/kbase/typedobj/test/files/IdProcessing/KB.FeatureMap.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.FeatureMap.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/IdProcessing/KB.FeatureMap.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.FeatureMap.instance.1 diff --git a/src/us/kbase/typedobj/test/files/IdProcessing/KB.FeatureMap.instance.1.ids b/src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.FeatureMap.instance.1.ids similarity index 100% rename from src/us/kbase/typedobj/test/files/IdProcessing/KB.FeatureMap.instance.1.ids rename to src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.FeatureMap.instance.1.ids diff --git a/src/us/kbase/typedobj/test/files/IdProcessing/KB.FeatureMap.instance.2 b/src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.FeatureMap.instance.2 similarity index 100% rename from src/us/kbase/typedobj/test/files/IdProcessing/KB.FeatureMap.instance.2 rename to src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.FeatureMap.instance.2 diff --git a/src/us/kbase/typedobj/test/files/IdProcessing/KB.FeatureMap.instance.2.ids b/src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.FeatureMap.instance.2.ids similarity index 100% rename from src/us/kbase/typedobj/test/files/IdProcessing/KB.FeatureMap.instance.2.ids rename to src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.FeatureMap.instance.2.ids diff --git a/src/us/kbase/typedobj/test/files/IdProcessing/KB.Genome.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.Genome.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/IdProcessing/KB.Genome.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.Genome.instance.1 diff --git a/src/us/kbase/typedobj/test/files/IdProcessing/KB.Genome.instance.1.ids b/src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.Genome.instance.1.ids similarity index 100% rename from src/us/kbase/typedobj/test/files/IdProcessing/KB.Genome.instance.1.ids rename to src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.Genome.instance.1.ids diff --git a/src/us/kbase/typedobj/test/files/IdProcessing/KB.Genome.instance.2 b/src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.Genome.instance.2 similarity index 100% rename from src/us/kbase/typedobj/test/files/IdProcessing/KB.Genome.instance.2 rename to src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.Genome.instance.2 diff --git a/src/us/kbase/typedobj/test/files/IdProcessing/KB.Genome.instance.2.ids b/src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.Genome.instance.2.ids similarity index 100% rename from src/us/kbase/typedobj/test/files/IdProcessing/KB.Genome.instance.2.ids rename to src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.Genome.instance.2.ids diff --git a/src/us/kbase/typedobj/test/files/IdProcessing/KB.NestedFeaturesKey.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.NestedFeaturesKey.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/IdProcessing/KB.NestedFeaturesKey.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.NestedFeaturesKey.instance.1 diff --git a/src/us/kbase/typedobj/test/files/IdProcessing/KB.NestedFeaturesKey.instance.1.ids b/src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.NestedFeaturesKey.instance.1.ids similarity index 100% rename from src/us/kbase/typedobj/test/files/IdProcessing/KB.NestedFeaturesKey.instance.1.ids rename to src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.NestedFeaturesKey.instance.1.ids diff --git a/src/us/kbase/typedobj/test/files/IdProcessing/KB.NestedFeaturesList.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.NestedFeaturesList.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/IdProcessing/KB.NestedFeaturesList.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.NestedFeaturesList.instance.1 diff --git a/src/us/kbase/typedobj/test/files/IdProcessing/KB.NestedFeaturesList.instance.1.ids b/src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.NestedFeaturesList.instance.1.ids similarity index 100% rename from src/us/kbase/typedobj/test/files/IdProcessing/KB.NestedFeaturesList.instance.1.ids rename to src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.NestedFeaturesList.instance.1.ids diff --git a/src/us/kbase/typedobj/test/files/IdProcessing/KB.NestedFeaturesValue.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.NestedFeaturesValue.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/IdProcessing/KB.NestedFeaturesValue.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.NestedFeaturesValue.instance.1 diff --git a/src/us/kbase/typedobj/test/files/IdProcessing/KB.NestedFeaturesValue.instance.1.ids b/src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.NestedFeaturesValue.instance.1.ids similarity index 100% rename from src/us/kbase/typedobj/test/files/IdProcessing/KB.NestedFeaturesValue.instance.1.ids rename to src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.NestedFeaturesValue.instance.1.ids diff --git a/src/us/kbase/typedobj/test/files/IdProcessing/KB.WeirdTuple.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.WeirdTuple.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/IdProcessing/KB.WeirdTuple.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.WeirdTuple.instance.1 diff --git a/src/us/kbase/typedobj/test/files/IdProcessing/KB.WeirdTuple.instance.1.ids b/src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.WeirdTuple.instance.1.ids similarity index 100% rename from src/us/kbase/typedobj/test/files/IdProcessing/KB.WeirdTuple.instance.1.ids rename to src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.WeirdTuple.instance.1.ids diff --git a/src/us/kbase/typedobj/test/files/IdProcessing/KB.spec b/src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.spec similarity index 100% rename from src/us/kbase/typedobj/test/files/IdProcessing/KB.spec rename to src/test/resources/us/kbase/test/typedobj/files/IdProcessing/KB.spec diff --git a/src/us/kbase/typedobj/test/files/MetadataExtraction/KB.FloatStructure.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.FloatStructure.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/MetadataExtraction/KB.FloatStructure.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.FloatStructure.instance.1 diff --git a/src/us/kbase/typedobj/test/files/MetadataExtraction/KB.MappingStruct.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.MappingStruct.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/MetadataExtraction/KB.MappingStruct.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.MappingStruct.instance.1 diff --git a/src/us/kbase/typedobj/test/files/MetadataExtraction/KB.MetaDataT1.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.MetaDataT1.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/MetadataExtraction/KB.MetaDataT1.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.MetaDataT1.instance.1 diff --git a/src/us/kbase/typedobj/test/files/MetadataExtraction/KB.MetaDataT2.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.MetaDataT2.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/MetadataExtraction/KB.MetaDataT2.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.MetaDataT2.instance.1 diff --git a/src/us/kbase/typedobj/test/files/MetadataExtraction/KB.MetaDataT3.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.MetaDataT3.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/MetadataExtraction/KB.MetaDataT3.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.MetaDataT3.instance.1 diff --git a/src/us/kbase/typedobj/test/files/MetadataExtraction/KB.MetaDataT4.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.MetaDataT4.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/MetadataExtraction/KB.MetaDataT4.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.MetaDataT4.instance.1 diff --git a/src/us/kbase/typedobj/test/files/MetadataExtraction/KB.MetaDataT5.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.MetaDataT5.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/MetadataExtraction/KB.MetaDataT5.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.MetaDataT5.instance.1 diff --git a/src/us/kbase/typedobj/test/files/MetadataExtraction/KB.MetaDataT6.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.MetaDataT6.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/MetadataExtraction/KB.MetaDataT6.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.MetaDataT6.instance.1 diff --git a/src/us/kbase/typedobj/test/files/MetadataExtraction/KB.MetaDataT7.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.MetaDataT7.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/MetadataExtraction/KB.MetaDataT7.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.MetaDataT7.instance.1 diff --git a/src/us/kbase/typedobj/test/files/MetadataExtraction/KB.MetaDataT8.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.MetaDataT8.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/MetadataExtraction/KB.MetaDataT8.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.MetaDataT8.instance.1 diff --git a/src/us/kbase/typedobj/test/files/MetadataExtraction/KB.MetaDataT9.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.MetaDataT9.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/MetadataExtraction/KB.MetaDataT9.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.MetaDataT9.instance.1 diff --git a/src/us/kbase/typedobj/test/files/MetadataExtraction/KB.NoExtractionData.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.NoExtractionData.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/MetadataExtraction/KB.NoExtractionData.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.NoExtractionData.instance.1 diff --git a/src/us/kbase/typedobj/test/files/MetadataExtraction/KB.SimpleStructure.instance.1 b/src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.SimpleStructure.instance.1 similarity index 100% rename from src/us/kbase/typedobj/test/files/MetadataExtraction/KB.SimpleStructure.instance.1 rename to src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.SimpleStructure.instance.1 diff --git a/src/us/kbase/typedobj/test/files/MetadataExtraction/KB.SimpleStructure.instance.2 b/src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.SimpleStructure.instance.2 similarity index 100% rename from src/us/kbase/typedobj/test/files/MetadataExtraction/KB.SimpleStructure.instance.2 rename to src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.SimpleStructure.instance.2 diff --git a/src/us/kbase/typedobj/test/files/MetadataExtraction/KB.SimpleStructure.instance.3 b/src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.SimpleStructure.instance.3 similarity index 100% rename from src/us/kbase/typedobj/test/files/MetadataExtraction/KB.SimpleStructure.instance.3 rename to src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.SimpleStructure.instance.3 diff --git a/src/us/kbase/typedobj/test/files/MetadataExtraction/KB.SimpleStructure.instance.4 b/src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.SimpleStructure.instance.4 similarity index 100% rename from src/us/kbase/typedobj/test/files/MetadataExtraction/KB.SimpleStructure.instance.4 rename to src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.SimpleStructure.instance.4 diff --git a/src/us/kbase/typedobj/test/files/MetadataExtraction/KB.SimpleStructure.instance.5 b/src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.SimpleStructure.instance.5 similarity index 100% rename from src/us/kbase/typedobj/test/files/MetadataExtraction/KB.SimpleStructure.instance.5 rename to src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.SimpleStructure.instance.5 diff --git a/src/us/kbase/typedobj/test/files/MetadataExtraction/KB.SimpleStructure.instance.6 b/src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.SimpleStructure.instance.6 similarity index 100% rename from src/us/kbase/typedobj/test/files/MetadataExtraction/KB.SimpleStructure.instance.6 rename to src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.SimpleStructure.instance.6 diff --git a/src/us/kbase/typedobj/test/files/MetadataExtraction/KB.spec b/src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.spec similarity index 100% rename from src/us/kbase/typedobj/test/files/MetadataExtraction/KB.spec rename to src/test/resources/us/kbase/test/typedobj/files/MetadataExtraction/KB.spec diff --git a/src/us/kbase/typedobj/test/files/SubdataExtraction/01.ExtractField.instance b/src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/01.ExtractField.instance similarity index 100% rename from src/us/kbase/typedobj/test/files/SubdataExtraction/01.ExtractField.instance rename to src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/01.ExtractField.instance diff --git a/src/us/kbase/typedobj/test/files/SubdataExtraction/02.ExtractNestedField.instance b/src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/02.ExtractNestedField.instance similarity index 100% rename from src/us/kbase/typedobj/test/files/SubdataExtraction/02.ExtractNestedField.instance rename to src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/02.ExtractNestedField.instance diff --git a/src/us/kbase/typedobj/test/files/SubdataExtraction/03.ExtractFieldFail.instance b/src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/03.ExtractFieldFail.instance similarity index 100% rename from src/us/kbase/typedobj/test/files/SubdataExtraction/03.ExtractFieldFail.instance rename to src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/03.ExtractFieldFail.instance diff --git a/src/us/kbase/typedobj/test/files/SubdataExtraction/04.ExtractFromArray.instance b/src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/04.ExtractFromArray.instance similarity index 100% rename from src/us/kbase/typedobj/test/files/SubdataExtraction/04.ExtractFromArray.instance rename to src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/04.ExtractFromArray.instance diff --git a/src/us/kbase/typedobj/test/files/SubdataExtraction/05.ExtractAllFromMap.instance b/src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/05.ExtractAllFromMap.instance similarity index 100% rename from src/us/kbase/typedobj/test/files/SubdataExtraction/05.ExtractAllFromMap.instance rename to src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/05.ExtractAllFromMap.instance diff --git a/src/us/kbase/typedobj/test/files/SubdataExtraction/06.ExtractAllFromList.instance b/src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/06.ExtractAllFromList.instance similarity index 100% rename from src/us/kbase/typedobj/test/files/SubdataExtraction/06.ExtractAllFromList.instance rename to src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/06.ExtractAllFromList.instance diff --git a/src/us/kbase/typedobj/test/files/SubdataExtraction/07.ExtractArrayPosFail.instance b/src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/07.ExtractArrayPosFail.instance similarity index 100% rename from src/us/kbase/typedobj/test/files/SubdataExtraction/07.ExtractArrayPosFail.instance rename to src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/07.ExtractArrayPosFail.instance diff --git a/src/us/kbase/typedobj/test/files/SubdataExtraction/08.ExtractArrayPosFail2.instance b/src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/08.ExtractArrayPosFail2.instance similarity index 100% rename from src/us/kbase/typedobj/test/files/SubdataExtraction/08.ExtractArrayPosFail2.instance rename to src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/08.ExtractArrayPosFail2.instance diff --git a/src/us/kbase/typedobj/test/files/SubdataExtraction/09.ExtractNestedField2.instance b/src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/09.ExtractNestedField2.instance similarity index 100% rename from src/us/kbase/typedobj/test/files/SubdataExtraction/09.ExtractNestedField2.instance rename to src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/09.ExtractNestedField2.instance diff --git a/src/us/kbase/typedobj/test/files/SubdataExtraction/10.ExtractArrayElements.instance b/src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/10.ExtractArrayElements.instance similarity index 100% rename from src/us/kbase/typedobj/test/files/SubdataExtraction/10.ExtractArrayElements.instance rename to src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/10.ExtractArrayElements.instance diff --git a/src/us/kbase/typedobj/test/files/SubdataExtraction/11.ExtractBooleansAndNull.instance b/src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/11.ExtractBooleansAndNull.instance similarity index 100% rename from src/us/kbase/typedobj/test/files/SubdataExtraction/11.ExtractBooleansAndNull.instance rename to src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/11.ExtractBooleansAndNull.instance diff --git a/src/us/kbase/typedobj/test/files/SubdataExtraction/12.ExtractNumbers.instance b/src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/12.ExtractNumbers.instance similarity index 100% rename from src/us/kbase/typedobj/test/files/SubdataExtraction/12.ExtractNumbers.instance rename to src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/12.ExtractNumbers.instance diff --git a/src/us/kbase/typedobj/test/files/SubdataExtraction/13.ExtractWithOptionalFieldsMissing.instance b/src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/13.ExtractWithOptionalFieldsMissing.instance similarity index 100% rename from src/us/kbase/typedobj/test/files/SubdataExtraction/13.ExtractWithOptionalFieldsMissing.instance rename to src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/13.ExtractWithOptionalFieldsMissing.instance diff --git a/src/us/kbase/typedobj/test/files/SubdataExtraction/14.ExtractBadPathFail.instance b/src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/14.ExtractBadPathFail.instance similarity index 100% rename from src/us/kbase/typedobj/test/files/SubdataExtraction/14.ExtractBadPathFail.instance rename to src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/14.ExtractBadPathFail.instance diff --git a/src/us/kbase/typedobj/test/files/SubdataExtraction/15.ExtractPathEscaped.instance b/src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/15.ExtractPathEscaped.instance similarity index 100% rename from src/us/kbase/typedobj/test/files/SubdataExtraction/15.ExtractPathEscaped.instance rename to src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/15.ExtractPathEscaped.instance diff --git a/src/us/kbase/typedobj/test/files/SubdataExtraction/16.ExtractPathEscapedBad.instance b/src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/16.ExtractPathEscapedBad.instance similarity index 100% rename from src/us/kbase/typedobj/test/files/SubdataExtraction/16.ExtractPathEscapedBad.instance rename to src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/16.ExtractPathEscapedBad.instance diff --git a/src/us/kbase/typedobj/test/files/SubdataExtraction/17.ExtractPathEscapedBad2.instance b/src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/17.ExtractPathEscapedBad2.instance similarity index 100% rename from src/us/kbase/typedobj/test/files/SubdataExtraction/17.ExtractPathEscapedBad2.instance rename to src/test/resources/us/kbase/test/typedobj/files/SubdataExtraction/17.ExtractPathEscapedBad2.instance diff --git a/src/us/kbase/typedobj/test/files/t4/FBA.spec b/src/test/resources/us/kbase/test/typedobj/files/t4/FBA.spec similarity index 100% rename from src/us/kbase/typedobj/test/files/t4/FBA.spec rename to src/test/resources/us/kbase/test/typedobj/files/t4/FBA.spec diff --git a/src/us/kbase/typedobj/test/files/t4/KB.spec b/src/test/resources/us/kbase/test/typedobj/files/t4/KB.spec similarity index 100% rename from src/us/kbase/typedobj/test/files/t4/KB.spec rename to src/test/resources/us/kbase/test/typedobj/files/t4/KB.spec diff --git a/src/us/kbase/workspace/test/docserver/docserverTestFile.html b/src/test/resources/us/kbase/test/workspace/docserver/docserverTestFile.html similarity index 100% rename from src/us/kbase/workspace/test/docserver/docserverTestFile.html rename to src/test/resources/us/kbase/test/workspace/docserver/docserverTestFile.html diff --git a/src/us/kbase/workspace/test/docserver/fake.css b/src/test/resources/us/kbase/test/workspace/docserver/fake.css similarity index 100% rename from src/us/kbase/workspace/test/docserver/fake.css rename to src/test/resources/us/kbase/test/workspace/docserver/fake.css diff --git a/src/us/kbase/workspace/test/docserver/fake.gif b/src/test/resources/us/kbase/test/workspace/docserver/fake.gif similarity index 100% rename from src/us/kbase/workspace/test/docserver/fake.gif rename to src/test/resources/us/kbase/test/workspace/docserver/fake.gif diff --git a/src/us/kbase/workspace/test/docserver/fake.js b/src/test/resources/us/kbase/test/workspace/docserver/fake.js similarity index 100% rename from src/us/kbase/workspace/test/docserver/fake.js rename to src/test/resources/us/kbase/test/workspace/docserver/fake.js diff --git a/src/us/kbase/workspace/test/docserver/fake.png b/src/test/resources/us/kbase/test/workspace/docserver/fake.png similarity index 100% rename from src/us/kbase/workspace/test/docserver/fake.png rename to src/test/resources/us/kbase/test/workspace/docserver/fake.png diff --git a/src/us/kbase/workspace/test/docserver/fake.spec b/src/test/resources/us/kbase/test/workspace/docserver/fake.spec similarity index 100% rename from src/us/kbase/workspace/test/docserver/fake.spec rename to src/test/resources/us/kbase/test/workspace/docserver/fake.spec diff --git a/src/us/kbase/workspace/test/docserver/fake.txt b/src/test/resources/us/kbase/test/workspace/docserver/fake.txt similarity index 100% rename from src/us/kbase/workspace/test/docserver/fake.txt rename to src/test/resources/us/kbase/test/workspace/docserver/fake.txt diff --git a/src/us/kbase/workspace/test/docserver/fake.weirdsuffix b/src/test/resources/us/kbase/test/workspace/docserver/fake.weirdsuffix similarity index 100% rename from src/us/kbase/workspace/test/docserver/fake.weirdsuffix rename to src/test/resources/us/kbase/test/workspace/docserver/fake.weirdsuffix diff --git a/src/us/kbase/workspace/test/docserver/files/docserverTestFile2.html b/src/test/resources/us/kbase/test/workspace/docserver/files/docserverTestFile2.html similarity index 100% rename from src/us/kbase/workspace/test/docserver/files/docserverTestFile2.html rename to src/test/resources/us/kbase/test/workspace/docserver/files/docserverTestFile2.html diff --git a/src/us/kbase/workspace/test/docserver/files/index.html b/src/test/resources/us/kbase/test/workspace/docserver/files/index.html similarity index 100% rename from src/us/kbase/workspace/test/docserver/files/index.html rename to src/test/resources/us/kbase/test/workspace/docserver/files/index.html diff --git a/src/us/kbase/workspace/test/docserver/index.html b/src/test/resources/us/kbase/test/workspace/docserver/index.html similarity index 100% rename from src/us/kbase/workspace/test/docserver/index.html rename to src/test/resources/us/kbase/test/workspace/docserver/index.html diff --git a/src/us/kbase/workspace/test/workspace/long_test_get_object_subset.json.gz.properties b/src/test/resources/us/kbase/test/workspace/workspace/long_test_get_object_subset.json.gz.properties similarity index 100% rename from src/us/kbase/workspace/test/workspace/long_test_get_object_subset.json.gz.properties rename to src/test/resources/us/kbase/test/workspace/workspace/long_test_get_object_subset.json.gz.properties