From 683d6e22c4e9f6383dd5e4cf3cb4edd4cd4dd91c Mon Sep 17 00:00:00 2001 From: atusa17 Date: Sun, 3 Feb 2019 19:26:57 -0700 Subject: [PATCH] Updated the package architecture --- pandamonium-theorem-prover/build.gradle | 4 ++-- pandamonium-theorem-prover/persistence/build.gradle | 13 +++++++++++++ .../tsp/persistence}/PersistenceConfig.java | 2 ++ .../msudenver/tsp/persistence}/dao/BaseDao.java | 2 +- .../tsp/persistence}/dao/DefinitionDao.java | 2 +- .../msudenver/tsp/persistence}/dao/NotationDao.java | 2 +- .../msudenver/tsp/persistence}/dao/ProofDao.java | 2 +- .../msudenver/tsp/persistence}/dao/TheoremDao.java | 2 +- .../msudenver/tsp/persistence}/dto/BaseDto.java | 2 +- .../tsp/persistence}/dto/DefinitionDto.java | 2 +- .../msudenver/tsp/persistence}/dto/NotationDto.java | 2 +- .../msudenver/tsp/persistence}/dto/ProofDto.java | 2 +- .../msudenver/tsp/persistence}/dto/TheoremDto.java | 2 +- .../tsp/persistence}/manager/DefinitionManager.java | 4 ++-- .../tsp/persistence}/manager/ManagerConfig.java | 10 +++++----- .../tsp/persistence}/manager/NotationManager.java | 4 ++-- .../tsp/persistence}/manager/ProofManager.java | 4 ++-- .../tsp/persistence}/manager/TheoremManager.java | 4 ++-- pandamonium-theorem-prover/services/build.gradle | 13 +++++++++++++ .../tsp/services}/parser/ParserConfig.java | 2 +- .../tsp/services}/parser/ParserService.java | 2 +- .../tsp/services}/scoring/ScoringConfig.java | 2 +- .../services}/scoring/TheoremScoringService.java | 2 +- .../tsp/services}/parser/ParserServiceTest.java | 2 +- .../scoring/TheoremScoringServiceTest.java | 2 +- .../src/main/java/ProofsDriver.java | 2 -- .../edu/msudenver/tsp/website/ProofsDriver.java | 4 ++++ .../msudenver/tsp/website}/WebsiteConfig.java | 2 ++ .../src/test/java/ProofsDriverTest.java | 3 --- .../msudenver/tsp/website}/HelloControllerTest.java | 2 ++ .../edu/msudenver/tsp/website/ProofsDriverTest.java | 5 +++++ .../HelloControllerIntegrationTest.java | 2 +- pandamonium-theorem-prover/utilities/build.gradle | 13 +++++++++++++ 33 files changed, 86 insertions(+), 37 deletions(-) rename pandamonium-theorem-prover/persistence/src/main/java/{ => edu/msudenver/tsp/persistence}/PersistenceConfig.java (73%) rename pandamonium-theorem-prover/persistence/src/main/java/{ => edu/msudenver/tsp/persistence}/dao/BaseDao.java (82%) rename pandamonium-theorem-prover/persistence/src/main/java/{ => edu/msudenver/tsp/persistence}/dao/DefinitionDao.java (52%) rename pandamonium-theorem-prover/persistence/src/main/java/{ => edu/msudenver/tsp/persistence}/dao/NotationDao.java (51%) rename pandamonium-theorem-prover/persistence/src/main/java/{ => edu/msudenver/tsp/persistence}/dao/ProofDao.java (50%) rename pandamonium-theorem-prover/persistence/src/main/java/{ => edu/msudenver/tsp/persistence}/dao/TheoremDao.java (51%) rename pandamonium-theorem-prover/persistence/src/main/java/{ => edu/msudenver/tsp/persistence}/dto/BaseDto.java (68%) rename pandamonium-theorem-prover/persistence/src/main/java/{ => edu/msudenver/tsp/persistence}/dto/DefinitionDto.java (52%) rename pandamonium-theorem-prover/persistence/src/main/java/{ => edu/msudenver/tsp/persistence}/dto/NotationDto.java (51%) rename pandamonium-theorem-prover/persistence/src/main/java/{ => edu/msudenver/tsp/persistence}/dto/ProofDto.java (50%) rename pandamonium-theorem-prover/persistence/src/main/java/{ => edu/msudenver/tsp/persistence}/dto/TheoremDto.java (51%) rename pandamonium-theorem-prover/persistence/src/main/java/{ => edu/msudenver/tsp/persistence}/manager/DefinitionManager.java (64%) rename pandamonium-theorem-prover/persistence/src/main/java/{ => edu/msudenver/tsp/persistence}/manager/ManagerConfig.java (75%) rename pandamonium-theorem-prover/persistence/src/main/java/{ => edu/msudenver/tsp/persistence}/manager/NotationManager.java (64%) rename pandamonium-theorem-prover/persistence/src/main/java/{ => edu/msudenver/tsp/persistence}/manager/ProofManager.java (64%) rename pandamonium-theorem-prover/persistence/src/main/java/{ => edu/msudenver/tsp/persistence}/manager/TheoremManager.java (64%) rename pandamonium-theorem-prover/services/src/main/java/{ => edu/msudenver/tsp/services}/parser/ParserConfig.java (91%) rename pandamonium-theorem-prover/services/src/main/java/{ => edu/msudenver/tsp/services}/parser/ParserService.java (65%) rename pandamonium-theorem-prover/services/src/main/java/{ => edu/msudenver/tsp/services}/scoring/ScoringConfig.java (91%) rename pandamonium-theorem-prover/services/src/main/java/{ => edu/msudenver/tsp/services}/scoring/TheoremScoringService.java (67%) rename pandamonium-theorem-prover/services/src/test/java/{ => edu/msudenver/tsp/services}/parser/ParserServiceTest.java (77%) rename pandamonium-theorem-prover/services/src/test/java/{ => edu/msudenver/tsp/services}/scoring/TheoremScoringServiceTest.java (78%) delete mode 100644 pandamonium-theorem-prover/src/main/java/ProofsDriver.java create mode 100644 pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/ProofsDriver.java rename pandamonium-theorem-prover/src/main/java/{ => edu/msudenver/tsp/website}/WebsiteConfig.java (89%) delete mode 100644 pandamonium-theorem-prover/src/test/java/ProofsDriverTest.java rename pandamonium-theorem-prover/src/test/java/{ => edu/msudenver/tsp/website}/HelloControllerTest.java (89%) create mode 100644 pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/ProofsDriverTest.java rename pandamonium-theorem-prover/src/test/java/{ => edu/msudenver/tsp/website}/integrationTest/HelloControllerIntegrationTest.java (96%) diff --git a/pandamonium-theorem-prover/build.gradle b/pandamonium-theorem-prover/build.gradle index 9909528..dc94101 100644 --- a/pandamonium-theorem-prover/build.gradle +++ b/pandamonium-theorem-prover/build.gradle @@ -74,8 +74,8 @@ dependencies { } test { - if (System.properties['test.profile'] != 'integrationTest') { - exclude '**/*integrationTest*' + if (System.properties['test.profile'] != 'edu.msudenver.tsp.website.integrationTest') { + exclude '**/*edu.msudenver.tsp.website.integrationTest*' } else { exclude '**/*edu/*' } diff --git a/pandamonium-theorem-prover/persistence/build.gradle b/pandamonium-theorem-prover/persistence/build.gradle index 00161ec..ccb8a8e 100644 --- a/pandamonium-theorem-prover/persistence/build.gradle +++ b/pandamonium-theorem-prover/persistence/build.gradle @@ -14,3 +14,16 @@ repositories { dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' } + +test { + if (System.properties['test.profile'] != 'edu.msudenver.tsp.persistence.integrationTest') { + exclude '**/*edu.msudenver.tsp.persistence.integrationTest*' + } else { + exclude '**/*edu/*' + } +} + +testSets { + unitTest + integrationTest +} diff --git a/pandamonium-theorem-prover/persistence/src/main/java/PersistenceConfig.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/PersistenceConfig.java similarity index 73% rename from pandamonium-theorem-prover/persistence/src/main/java/PersistenceConfig.java rename to pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/PersistenceConfig.java index 90c8d4f..d106aa8 100644 --- a/pandamonium-theorem-prover/persistence/src/main/java/PersistenceConfig.java +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/PersistenceConfig.java @@ -1,3 +1,5 @@ +package edu.msudenver.tsp.persistence; + import org.springframework.context.annotation.Configuration; @Configuration diff --git a/pandamonium-theorem-prover/persistence/src/main/java/dao/BaseDao.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/BaseDao.java similarity index 82% rename from pandamonium-theorem-prover/persistence/src/main/java/dao/BaseDao.java rename to pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/BaseDao.java index 344d682..c8d066a 100644 --- a/pandamonium-theorem-prover/persistence/src/main/java/dao/BaseDao.java +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/BaseDao.java @@ -1,4 +1,4 @@ -package dao; +package edu.msudenver.tsp.persistence.dao; class BaseDao { diff --git a/pandamonium-theorem-prover/persistence/src/main/java/dao/DefinitionDao.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/DefinitionDao.java similarity index 52% rename from pandamonium-theorem-prover/persistence/src/main/java/dao/DefinitionDao.java rename to pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/DefinitionDao.java index a63614d..f54d733 100644 --- a/pandamonium-theorem-prover/persistence/src/main/java/dao/DefinitionDao.java +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/DefinitionDao.java @@ -1,4 +1,4 @@ -package dao; +package edu.msudenver.tsp.persistence.dao; public class DefinitionDao extends BaseDao { } diff --git a/pandamonium-theorem-prover/persistence/src/main/java/dao/NotationDao.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/NotationDao.java similarity index 51% rename from pandamonium-theorem-prover/persistence/src/main/java/dao/NotationDao.java rename to pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/NotationDao.java index b4d1524..52bfa9e 100644 --- a/pandamonium-theorem-prover/persistence/src/main/java/dao/NotationDao.java +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/NotationDao.java @@ -1,4 +1,4 @@ -package dao; +package edu.msudenver.tsp.persistence.dao; public class NotationDao extends BaseDao { } diff --git a/pandamonium-theorem-prover/persistence/src/main/java/dao/ProofDao.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/ProofDao.java similarity index 50% rename from pandamonium-theorem-prover/persistence/src/main/java/dao/ProofDao.java rename to pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/ProofDao.java index 71349ee..61120b8 100644 --- a/pandamonium-theorem-prover/persistence/src/main/java/dao/ProofDao.java +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/ProofDao.java @@ -1,4 +1,4 @@ -package dao; +package edu.msudenver.tsp.persistence.dao; public class ProofDao extends BaseDao { } diff --git a/pandamonium-theorem-prover/persistence/src/main/java/dao/TheoremDao.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/TheoremDao.java similarity index 51% rename from pandamonium-theorem-prover/persistence/src/main/java/dao/TheoremDao.java rename to pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/TheoremDao.java index b0b6510..6c27914 100644 --- a/pandamonium-theorem-prover/persistence/src/main/java/dao/TheoremDao.java +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/TheoremDao.java @@ -1,4 +1,4 @@ -package dao; +package edu.msudenver.tsp.persistence.dao; public class TheoremDao extends BaseDao { } diff --git a/pandamonium-theorem-prover/persistence/src/main/java/dto/BaseDto.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/BaseDto.java similarity index 68% rename from pandamonium-theorem-prover/persistence/src/main/java/dto/BaseDto.java rename to pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/BaseDto.java index 5c0e033..811ac68 100644 --- a/pandamonium-theorem-prover/persistence/src/main/java/dto/BaseDto.java +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/BaseDto.java @@ -1,4 +1,4 @@ -package dto; +package edu.msudenver.tsp.persistence.dto; import lombok.Data; diff --git a/pandamonium-theorem-prover/persistence/src/main/java/dto/DefinitionDto.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/DefinitionDto.java similarity index 52% rename from pandamonium-theorem-prover/persistence/src/main/java/dto/DefinitionDto.java rename to pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/DefinitionDto.java index 80cd9d2..04f3dcd 100644 --- a/pandamonium-theorem-prover/persistence/src/main/java/dto/DefinitionDto.java +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/DefinitionDto.java @@ -1,4 +1,4 @@ -package dto; +package edu.msudenver.tsp.persistence.dto; public class DefinitionDto extends BaseDto { } diff --git a/pandamonium-theorem-prover/persistence/src/main/java/dto/NotationDto.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/NotationDto.java similarity index 51% rename from pandamonium-theorem-prover/persistence/src/main/java/dto/NotationDto.java rename to pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/NotationDto.java index 8084dd9..feabde1 100644 --- a/pandamonium-theorem-prover/persistence/src/main/java/dto/NotationDto.java +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/NotationDto.java @@ -1,4 +1,4 @@ -package dto; +package edu.msudenver.tsp.persistence.dto; public class NotationDto extends BaseDto { } diff --git a/pandamonium-theorem-prover/persistence/src/main/java/dto/ProofDto.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/ProofDto.java similarity index 50% rename from pandamonium-theorem-prover/persistence/src/main/java/dto/ProofDto.java rename to pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/ProofDto.java index 06c2ae9..195340e 100644 --- a/pandamonium-theorem-prover/persistence/src/main/java/dto/ProofDto.java +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/ProofDto.java @@ -1,4 +1,4 @@ -package dto; +package edu.msudenver.tsp.persistence.dto; public class ProofDto extends BaseDto { } diff --git a/pandamonium-theorem-prover/persistence/src/main/java/dto/TheoremDto.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/TheoremDto.java similarity index 51% rename from pandamonium-theorem-prover/persistence/src/main/java/dto/TheoremDto.java rename to pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/TheoremDto.java index 2b180f4..0761432 100644 --- a/pandamonium-theorem-prover/persistence/src/main/java/dto/TheoremDto.java +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/TheoremDto.java @@ -1,4 +1,4 @@ -package dto; +package edu.msudenver.tsp.persistence.dto; public class TheoremDto extends BaseDto { } diff --git a/pandamonium-theorem-prover/persistence/src/main/java/manager/DefinitionManager.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/DefinitionManager.java similarity index 64% rename from pandamonium-theorem-prover/persistence/src/main/java/manager/DefinitionManager.java rename to pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/DefinitionManager.java index f6f98d6..e12987e 100644 --- a/pandamonium-theorem-prover/persistence/src/main/java/manager/DefinitionManager.java +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/DefinitionManager.java @@ -1,6 +1,6 @@ -package manager; +package edu.msudenver.tsp.persistence.manager; -import dao.DefinitionDao; +import edu.msudenver.tsp.persistence.dao.DefinitionDao; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; diff --git a/pandamonium-theorem-prover/persistence/src/main/java/manager/ManagerConfig.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ManagerConfig.java similarity index 75% rename from pandamonium-theorem-prover/persistence/src/main/java/manager/ManagerConfig.java rename to pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ManagerConfig.java index c2c4417..7f8a5d5 100644 --- a/pandamonium-theorem-prover/persistence/src/main/java/manager/ManagerConfig.java +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ManagerConfig.java @@ -1,9 +1,9 @@ -package manager; +package edu.msudenver.tsp.persistence.manager; -import dao.DefinitionDao; -import dao.NotationDao; -import dao.ProofDao; -import dao.TheoremDao; +import edu.msudenver.tsp.persistence.dao.DefinitionDao; +import edu.msudenver.tsp.persistence.dao.NotationDao; +import edu.msudenver.tsp.persistence.dao.ProofDao; +import edu.msudenver.tsp.persistence.dao.TheoremDao; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; diff --git a/pandamonium-theorem-prover/persistence/src/main/java/manager/NotationManager.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/NotationManager.java similarity index 64% rename from pandamonium-theorem-prover/persistence/src/main/java/manager/NotationManager.java rename to pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/NotationManager.java index a8e6d0f..a6d50c5 100644 --- a/pandamonium-theorem-prover/persistence/src/main/java/manager/NotationManager.java +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/NotationManager.java @@ -1,6 +1,6 @@ -package manager; +package edu.msudenver.tsp.persistence.manager; -import dao.NotationDao; +import edu.msudenver.tsp.persistence.dao.NotationDao; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; diff --git a/pandamonium-theorem-prover/persistence/src/main/java/manager/ProofManager.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ProofManager.java similarity index 64% rename from pandamonium-theorem-prover/persistence/src/main/java/manager/ProofManager.java rename to pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ProofManager.java index 4f50c14..54115c4 100644 --- a/pandamonium-theorem-prover/persistence/src/main/java/manager/ProofManager.java +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ProofManager.java @@ -1,6 +1,6 @@ -package manager; +package edu.msudenver.tsp.persistence.manager; -import dao.ProofDao; +import edu.msudenver.tsp.persistence.dao.ProofDao; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; diff --git a/pandamonium-theorem-prover/persistence/src/main/java/manager/TheoremManager.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/TheoremManager.java similarity index 64% rename from pandamonium-theorem-prover/persistence/src/main/java/manager/TheoremManager.java rename to pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/TheoremManager.java index 7956c4d..3fdad3e 100644 --- a/pandamonium-theorem-prover/persistence/src/main/java/manager/TheoremManager.java +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/TheoremManager.java @@ -1,6 +1,6 @@ -package manager; +package edu.msudenver.tsp.persistence.manager; -import dao.TheoremDao; +import edu.msudenver.tsp.persistence.dao.TheoremDao; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; diff --git a/pandamonium-theorem-prover/services/build.gradle b/pandamonium-theorem-prover/services/build.gradle index b8e0e3f..bd8203e 100644 --- a/pandamonium-theorem-prover/services/build.gradle +++ b/pandamonium-theorem-prover/services/build.gradle @@ -15,3 +15,16 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' compile fileTree(dir: 'lib', include: '**/*.jar') } + +test { + if (System.properties['test.profile'] != 'edu.msudenver.tsp.services.integrationTest') { + exclude '**/*edu.msudenver.tsp.services.integrationTest*' + } else { + exclude '**/*edu/*' + } +} + +testSets { + unitTest + integrationTest +} diff --git a/pandamonium-theorem-prover/services/src/main/java/parser/ParserConfig.java b/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserConfig.java similarity index 91% rename from pandamonium-theorem-prover/services/src/main/java/parser/ParserConfig.java rename to pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserConfig.java index 95fa30b..8cdc76a 100644 --- a/pandamonium-theorem-prover/services/src/main/java/parser/ParserConfig.java +++ b/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserConfig.java @@ -1,4 +1,4 @@ -package parser; +package edu.msudenver.tsp.services.parser; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; diff --git a/pandamonium-theorem-prover/services/src/main/java/parser/ParserService.java b/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserService.java similarity index 65% rename from pandamonium-theorem-prover/services/src/main/java/parser/ParserService.java rename to pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserService.java index 11c6604..64726fb 100644 --- a/pandamonium-theorem-prover/services/src/main/java/parser/ParserService.java +++ b/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserService.java @@ -1,4 +1,4 @@ -package parser; +package edu.msudenver.tsp.services.parser; import org.springframework.stereotype.Service; diff --git a/pandamonium-theorem-prover/services/src/main/java/scoring/ScoringConfig.java b/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/ScoringConfig.java similarity index 91% rename from pandamonium-theorem-prover/services/src/main/java/scoring/ScoringConfig.java rename to pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/ScoringConfig.java index 318ce9e..98614e3 100644 --- a/pandamonium-theorem-prover/services/src/main/java/scoring/ScoringConfig.java +++ b/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/ScoringConfig.java @@ -1,4 +1,4 @@ -package scoring; +package edu.msudenver.tsp.services.scoring; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; diff --git a/pandamonium-theorem-prover/services/src/main/java/scoring/TheoremScoringService.java b/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/TheoremScoringService.java similarity index 67% rename from pandamonium-theorem-prover/services/src/main/java/scoring/TheoremScoringService.java rename to pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/TheoremScoringService.java index b15e600..6dad106 100644 --- a/pandamonium-theorem-prover/services/src/main/java/scoring/TheoremScoringService.java +++ b/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/TheoremScoringService.java @@ -1,4 +1,4 @@ -package scoring; +package edu.msudenver.tsp.services.scoring; import org.springframework.stereotype.Service; diff --git a/pandamonium-theorem-prover/services/src/test/java/parser/ParserServiceTest.java b/pandamonium-theorem-prover/services/src/test/java/edu/msudenver/tsp/services/parser/ParserServiceTest.java similarity index 77% rename from pandamonium-theorem-prover/services/src/test/java/parser/ParserServiceTest.java rename to pandamonium-theorem-prover/services/src/test/java/edu/msudenver/tsp/services/parser/ParserServiceTest.java index 342fcbe..e74ff33 100644 --- a/pandamonium-theorem-prover/services/src/test/java/parser/ParserServiceTest.java +++ b/pandamonium-theorem-prover/services/src/test/java/edu/msudenver/tsp/services/parser/ParserServiceTest.java @@ -1,4 +1,4 @@ -package parser; +package edu.msudenver.tsp.services.parser; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; diff --git a/pandamonium-theorem-prover/services/src/test/java/scoring/TheoremScoringServiceTest.java b/pandamonium-theorem-prover/services/src/test/java/edu/msudenver/tsp/services/scoring/TheoremScoringServiceTest.java similarity index 78% rename from pandamonium-theorem-prover/services/src/test/java/scoring/TheoremScoringServiceTest.java rename to pandamonium-theorem-prover/services/src/test/java/edu/msudenver/tsp/services/scoring/TheoremScoringServiceTest.java index 57c2cf6..886bbf2 100644 --- a/pandamonium-theorem-prover/services/src/test/java/scoring/TheoremScoringServiceTest.java +++ b/pandamonium-theorem-prover/services/src/test/java/edu/msudenver/tsp/services/scoring/TheoremScoringServiceTest.java @@ -1,4 +1,4 @@ -package scoring; +package edu.msudenver.tsp.services.scoring; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; diff --git a/pandamonium-theorem-prover/src/main/java/ProofsDriver.java b/pandamonium-theorem-prover/src/main/java/ProofsDriver.java deleted file mode 100644 index ea5ea80..0000000 --- a/pandamonium-theorem-prover/src/main/java/ProofsDriver.java +++ /dev/null @@ -1,2 +0,0 @@ -public class ProofsDriver { -} diff --git a/pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/ProofsDriver.java b/pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/ProofsDriver.java new file mode 100644 index 0000000..a6d4715 --- /dev/null +++ b/pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/ProofsDriver.java @@ -0,0 +1,4 @@ +package edu.msudenver.tsp.website; + +public class ProofsDriver { +} diff --git a/pandamonium-theorem-prover/src/main/java/WebsiteConfig.java b/pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/WebsiteConfig.java similarity index 89% rename from pandamonium-theorem-prover/src/main/java/WebsiteConfig.java rename to pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/WebsiteConfig.java index e4569f9..35ab05c 100644 --- a/pandamonium-theorem-prover/src/main/java/WebsiteConfig.java +++ b/pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/WebsiteConfig.java @@ -1,3 +1,5 @@ +package edu.msudenver.tsp.website; + import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; diff --git a/pandamonium-theorem-prover/src/test/java/ProofsDriverTest.java b/pandamonium-theorem-prover/src/test/java/ProofsDriverTest.java deleted file mode 100644 index a406456..0000000 --- a/pandamonium-theorem-prover/src/test/java/ProofsDriverTest.java +++ /dev/null @@ -1,3 +0,0 @@ -public class ProofsDriverTest { - -} \ No newline at end of file diff --git a/pandamonium-theorem-prover/src/test/java/HelloControllerTest.java b/pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/HelloControllerTest.java similarity index 89% rename from pandamonium-theorem-prover/src/test/java/HelloControllerTest.java rename to pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/HelloControllerTest.java index de8c699..a6c4ae9 100644 --- a/pandamonium-theorem-prover/src/test/java/HelloControllerTest.java +++ b/pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/HelloControllerTest.java @@ -1,3 +1,5 @@ +package edu.msudenver.tsp.website; + import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/ProofsDriverTest.java b/pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/ProofsDriverTest.java new file mode 100644 index 0000000..04a68e1 --- /dev/null +++ b/pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/ProofsDriverTest.java @@ -0,0 +1,5 @@ +package edu.msudenver.tsp.website; + +public class ProofsDriverTest { + +} \ No newline at end of file diff --git a/pandamonium-theorem-prover/src/test/java/integrationTest/HelloControllerIntegrationTest.java b/pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/integrationTest/HelloControllerIntegrationTest.java similarity index 96% rename from pandamonium-theorem-prover/src/test/java/integrationTest/HelloControllerIntegrationTest.java rename to pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/integrationTest/HelloControllerIntegrationTest.java index 3b4f67d..3e4ab1e 100644 --- a/pandamonium-theorem-prover/src/test/java/integrationTest/HelloControllerIntegrationTest.java +++ b/pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/integrationTest/HelloControllerIntegrationTest.java @@ -1,4 +1,4 @@ -package integrationTest; +package edu.msudenver.tsp.website.integrationTest; import hello.Application; import org.junit.Before; diff --git a/pandamonium-theorem-prover/utilities/build.gradle b/pandamonium-theorem-prover/utilities/build.gradle index 00161ec..acb5d94 100644 --- a/pandamonium-theorem-prover/utilities/build.gradle +++ b/pandamonium-theorem-prover/utilities/build.gradle @@ -14,3 +14,16 @@ repositories { dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' } + +test { + if (System.properties['test.profile'] != 'edu.msudenver.tsp.utilities.integrationTest') { + exclude '**/*edu.msudenver.tsp.utilities.integrationTest*' + } else { + exclude '**/*edu/*' + } +} + +testSets { + unitTest + integrationTest +} \ No newline at end of file