diff --git a/pandamonium-theorem-prover/build.gradle b/pandamonium-theorem-prover/build.gradle index 9909528..f93378a 100644 --- a/pandamonium-theorem-prover/build.gradle +++ b/pandamonium-theorem-prover/build.gradle @@ -16,6 +16,9 @@ plugins { id 'org.unbroken-dome.test-sets' version '1.4.5' id 'war' } + +apply plugin: 'org.springframework.boot' + description = 'Pandamonium Theorem Prover' group 'edu.msudenver.tsp' @@ -38,10 +41,42 @@ allprojects { apply plugin: 'jacoco' apply plugin: 'org.unbroken-dome.test-sets' apply plugin: 'idea' - apply plugin: 'org.springframework.boot' apply plugin: 'io.spring.dependency-management' } +subprojects { + repositories { + mavenCentral() + } + + dependencies { + compile 'org.apache.commons:commons-lang3:3.5' + // The production code uses the SLF4J logging API at compile time + compile 'org.slf4j:slf4j-api:1.7.21' + compile "joda-time:joda-time:2.2" + compile('org.springframework:spring-context:5.0.9.RELEASE') + + testCompile group: 'junit', name: 'junit', version: '4.11' + testCompile group: 'junit', name: 'junit', version: '4.12' + testCompile('org.mockito:mockito-core:1.10.19') {exclude(group: 'org.hamcrest')} + + compileOnly 'org.projectlombok:lombok:1.18.4' + } + + test { + if (System.properties['test.profile'] != 'integrationTest') { + exclude '**/*integrationTest*' + } else { + exclude '**/*edu/*' + } + } + + testSets { + unitTest + integrationTest + } +} + bootJar { baseName = 'gs-spring-boot' version = '0.1.0' @@ -65,7 +100,7 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.11' testCompile group: 'junit', name: 'junit', version: '4.12' - testCompile("org.springframework.boot:spring-boot-starter-test") + testCompile "org.springframework:spring-test:5.0.9.RELEASE" testCompile('org.mockito:mockito-core:1.10.19') {exclude(group: 'org.hamcrest')} compileOnly 'org.projectlombok:lombok:1.18.4' diff --git a/pandamonium-theorem-prover/lib/jas-2.6.5961-bin.jar b/pandamonium-theorem-prover/lib/jas-2.6.5961-bin.jar new file mode 100644 index 0000000..1705916 Binary files /dev/null and b/pandamonium-theorem-prover/lib/jas-2.6.5961-bin.jar differ diff --git a/pandamonium-theorem-prover/lombok.config b/pandamonium-theorem-prover/lombok.config index 0c4a2b9..7012d1b 100644 --- a/pandamonium-theorem-prover/lombok.config +++ b/pandamonium-theorem-prover/lombok.config @@ -3,5 +3,4 @@ lombok.accessors.chain = true lombok.accessors.fluent = false lombok.addLombokGeneratedAnnotation = true lombok.log.fieldName = LOG -lombok.toString.includeFieldNames = true -lombok.data.flagUsage = error \ No newline at end of file +lombok.toString.includeFieldNames = true \ No newline at end of file diff --git a/pandamonium-theorem-prover/persistence/build.gradle b/pandamonium-theorem-prover/persistence/build.gradle new file mode 100644 index 0000000..b8e0e3f --- /dev/null +++ b/pandamonium-theorem-prover/persistence/build.gradle @@ -0,0 +1,17 @@ +plugins { + id 'java' +} + +group 'edu.msudenver.tsp' +version '1.0' + +sourceCompatibility = 1.8 + +repositories { + mavenCentral() +} + +dependencies { + testCompile group: 'junit', name: 'junit', version: '4.12' + compile fileTree(dir: 'lib', include: '**/*.jar') +} diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/PersistenceConfig.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/PersistenceConfig.java new file mode 100644 index 0000000..34a2b13 --- /dev/null +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/PersistenceConfig.java @@ -0,0 +1,10 @@ +package edu.msudenver.tsp.persistence; + +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; + +@Configuration +@ComponentScan +public class PersistenceConfig { + +} diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/BaseDao.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/BaseDao.java new file mode 100644 index 0000000..7a9d832 --- /dev/null +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/BaseDao.java @@ -0,0 +1,28 @@ +package edu.msudenver.tsp.persistence.dao; + +class BaseDao { + +// T findById(final int id) { +// //TODO insert DB calls for finding objects by their ID's +// } + +// List queryForList(final String query) { +// //TODO insert DB calls for querying for lists based on the specified query +// } + +// T save(final T t) { +// //TODO insert DB calls here for insert and update +// } + + void delete(final T t) { + //TODO insert DB calls here to delete + } + +// private T insert(final T object) { +// // TODO insert DB calls to insert records +// } +// +// private T update(final T object) { +// //TODO insert DB calls to update records +// } +} diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/DefinitionDao.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/DefinitionDao.java new file mode 100644 index 0000000..f54d733 --- /dev/null +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/DefinitionDao.java @@ -0,0 +1,4 @@ +package edu.msudenver.tsp.persistence.dao; + +public class DefinitionDao extends BaseDao { +} diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/NotationDao.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/NotationDao.java new file mode 100644 index 0000000..52bfa9e --- /dev/null +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/NotationDao.java @@ -0,0 +1,4 @@ +package edu.msudenver.tsp.persistence.dao; + +public class NotationDao extends BaseDao { +} diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/ProofDao.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/ProofDao.java new file mode 100644 index 0000000..61120b8 --- /dev/null +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/ProofDao.java @@ -0,0 +1,4 @@ +package edu.msudenver.tsp.persistence.dao; + +public class ProofDao extends BaseDao { +} diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/TheoremDao.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/TheoremDao.java new file mode 100644 index 0000000..6c27914 --- /dev/null +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dao/TheoremDao.java @@ -0,0 +1,4 @@ +package edu.msudenver.tsp.persistence.dao; + +public class TheoremDao extends BaseDao { +} diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/BaseDto.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/BaseDto.java new file mode 100644 index 0000000..811ac68 --- /dev/null +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/BaseDto.java @@ -0,0 +1,9 @@ +package edu.msudenver.tsp.persistence.dto; + +import lombok.Data; + +@Data +class BaseDto { + private String id; + private int version; +} diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/DefinitionDto.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/DefinitionDto.java new file mode 100644 index 0000000..04f3dcd --- /dev/null +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/DefinitionDto.java @@ -0,0 +1,4 @@ +package edu.msudenver.tsp.persistence.dto; + +public class DefinitionDto extends BaseDto { +} diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/NotationDto.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/NotationDto.java new file mode 100644 index 0000000..feabde1 --- /dev/null +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/NotationDto.java @@ -0,0 +1,4 @@ +package edu.msudenver.tsp.persistence.dto; + +public class NotationDto extends BaseDto { +} diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/ProofDto.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/ProofDto.java new file mode 100644 index 0000000..195340e --- /dev/null +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/ProofDto.java @@ -0,0 +1,4 @@ +package edu.msudenver.tsp.persistence.dto; + +public class ProofDto extends BaseDto { +} diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/TheoremDto.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/TheoremDto.java new file mode 100644 index 0000000..0761432 --- /dev/null +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/TheoremDto.java @@ -0,0 +1,4 @@ +package edu.msudenver.tsp.persistence.dto; + +public class TheoremDto extends BaseDto { +} diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/DefinitionManager.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/DefinitionManager.java new file mode 100644 index 0000000..ed0052b --- /dev/null +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/DefinitionManager.java @@ -0,0 +1,11 @@ +package edu.msudenver.tsp.persistence.manager; + +import edu.msudenver.tsp.persistence.dao.DefinitionDao; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +@Component +@AllArgsConstructor +public class DefinitionManager { + final private DefinitionDao definitionDao; +} diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ManagerConfig.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ManagerConfig.java new file mode 100644 index 0000000..93c0dc7 --- /dev/null +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ManagerConfig.java @@ -0,0 +1,10 @@ +package edu.msudenver.tsp.persistence.manager; + +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; + +@Configuration +@ComponentScan +public class ManagerConfig { + +} diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/NotationManager.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/NotationManager.java new file mode 100644 index 0000000..f298199 --- /dev/null +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/NotationManager.java @@ -0,0 +1,11 @@ +package edu.msudenver.tsp.persistence.manager; + +import edu.msudenver.tsp.persistence.dao.NotationDao; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +@Component +@AllArgsConstructor +public class NotationManager { + final private NotationDao notationDao; +} diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ProofManager.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ProofManager.java new file mode 100644 index 0000000..a248b8b --- /dev/null +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/ProofManager.java @@ -0,0 +1,11 @@ +package edu.msudenver.tsp.persistence.manager; + +import edu.msudenver.tsp.persistence.dao.ProofDao; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +@Component +@AllArgsConstructor +public class ProofManager { + final private ProofDao proofDao; +} diff --git a/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/TheoremManager.java b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/TheoremManager.java new file mode 100644 index 0000000..1d8dc2c --- /dev/null +++ b/pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/manager/TheoremManager.java @@ -0,0 +1,11 @@ +package edu.msudenver.tsp.persistence.manager; + +import edu.msudenver.tsp.persistence.dao.TheoremDao; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Component; + +@Component +@AllArgsConstructor +public class TheoremManager { + final private TheoremDao theoremDao; +} diff --git a/pandamonium-theorem-prover/services/build.gradle b/pandamonium-theorem-prover/services/build.gradle new file mode 100644 index 0000000..efcc2d3 --- /dev/null +++ b/pandamonium-theorem-prover/services/build.gradle @@ -0,0 +1,18 @@ +plugins { + id 'java' +} + +group 'edu.msudenver.tsp' +version '1.0' + +sourceCompatibility = 1.8 + +repositories { + mavenCentral() +} + +dependencies { + compile project(':persistence') + testCompile group: 'junit', name: 'junit', version: '4.12' + compile fileTree(dir: 'lib', include: '**/*.jar') +} diff --git a/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserConfig.java b/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserConfig.java new file mode 100644 index 0000000..eb1c4f2 --- /dev/null +++ b/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserConfig.java @@ -0,0 +1,11 @@ +package edu.msudenver.tsp.services.parser; + +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; + +@Configuration +@ComponentScan +//@PropertySource("classpath:development.properties") +public class ParserConfig { + +} diff --git a/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserService.java b/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserService.java new file mode 100644 index 0000000..8c71f25 --- /dev/null +++ b/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/parser/ParserService.java @@ -0,0 +1,26 @@ +package edu.msudenver.tsp.services.parser; + +import edu.msudenver.tsp.persistence.manager.DefinitionManager; +import edu.msudenver.tsp.persistence.manager.NotationManager; +import edu.msudenver.tsp.persistence.manager.ProofManager; +import edu.msudenver.tsp.persistence.manager.TheoremManager; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +class ParserService { + private final DefinitionManager definitionManager; + private final TheoremManager theoremManager; + private final NotationManager notationManager; + private final ProofManager proofManager; + + @Autowired + public ParserService(final DefinitionManager definitionManager, final TheoremManager theoremManager, + final NotationManager notationManager, final ProofManager proofManager) { + this.definitionManager = definitionManager; + this.theoremManager = theoremManager; + this.notationManager = notationManager; + this.proofManager = proofManager; + } + +} diff --git a/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/ScoringConfig.java b/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/ScoringConfig.java new file mode 100644 index 0000000..3a4aa63 --- /dev/null +++ b/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/ScoringConfig.java @@ -0,0 +1,16 @@ +package edu.msudenver.tsp.services.scoring; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; + +@Configuration +@ComponentScan +//@PropertySource("classpath:development.properties") +public class ScoringConfig { + + @Bean + public TheoremScoringService theoremScoringService() { + return new TheoremScoringService(); + } +} diff --git a/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/TheoremScoringService.java b/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/TheoremScoringService.java new file mode 100644 index 0000000..6dad106 --- /dev/null +++ b/pandamonium-theorem-prover/services/src/main/java/edu/msudenver/tsp/services/scoring/TheoremScoringService.java @@ -0,0 +1,8 @@ +package edu.msudenver.tsp.services.scoring; + +import org.springframework.stereotype.Service; + +@Service +class TheoremScoringService { + +} diff --git a/pandamonium-theorem-prover/services/src/test/java/edu/msudenver/tsp/services/parser/ParserServiceTest.java b/pandamonium-theorem-prover/services/src/test/java/edu/msudenver/tsp/services/parser/ParserServiceTest.java new file mode 100644 index 0000000..1ae6e5e --- /dev/null +++ b/pandamonium-theorem-prover/services/src/test/java/edu/msudenver/tsp/services/parser/ParserServiceTest.java @@ -0,0 +1,17 @@ +package edu.msudenver.tsp.services.parser; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.runners.MockitoJUnitRunner; + +import static org.junit.Assert.assertEquals; + +@RunWith(MockitoJUnitRunner.class) +public class ParserServiceTest { + + @Test + public void test() { + assertEquals(3,3); + } + +} \ No newline at end of file diff --git a/pandamonium-theorem-prover/services/src/test/java/edu/msudenver/tsp/services/scoring/TheoremScoringServiceTest.java b/pandamonium-theorem-prover/services/src/test/java/edu/msudenver/tsp/services/scoring/TheoremScoringServiceTest.java new file mode 100644 index 0000000..f116fb6 --- /dev/null +++ b/pandamonium-theorem-prover/services/src/test/java/edu/msudenver/tsp/services/scoring/TheoremScoringServiceTest.java @@ -0,0 +1,16 @@ +package edu.msudenver.tsp.services.scoring; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.runners.MockitoJUnitRunner; + +import static org.junit.Assert.assertEquals; + +@RunWith(MockitoJUnitRunner.class) +public class TheoremScoringServiceTest { + + @Test + public void test() { + assertEquals(3,3); + } +} \ No newline at end of file diff --git a/pandamonium-theorem-prover/settings.gradle b/pandamonium-theorem-prover/settings.gradle index eef59f5..e68f768 100644 --- a/pandamonium-theorem-prover/settings.gradle +++ b/pandamonium-theorem-prover/settings.gradle @@ -1,2 +1,5 @@ rootProject.name = 'pandamonium-theorem-prover' +include 'services' +include 'persistence' +include 'utilities' diff --git a/pandamonium-theorem-prover/src/main/java/hello/Application.java b/pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/Application.java similarity index 96% rename from pandamonium-theorem-prover/src/main/java/hello/Application.java rename to pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/Application.java index b7cb82e..c8f0854 100644 --- a/pandamonium-theorem-prover/src/main/java/hello/Application.java +++ b/pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/Application.java @@ -1,4 +1,4 @@ -package hello; +package edu.msudenver.tsp.website; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; diff --git a/pandamonium-theorem-prover/src/main/java/hello/HelloController.java b/pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/HelloController.java similarity index 73% rename from pandamonium-theorem-prover/src/main/java/hello/HelloController.java rename to pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/HelloController.java index 66a5927..0e6a635 100644 --- a/pandamonium-theorem-prover/src/main/java/hello/HelloController.java +++ b/pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/HelloController.java @@ -1,4 +1,4 @@ -package hello; +package edu.msudenver.tsp.website; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -8,6 +8,6 @@ public class HelloController { @RequestMapping("/") public String index() { - return "Greetings from Spring Boot!"; + return "Welcome to Project Pandamonium!"; } } 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/edu/msudenver/tsp/website/WebsiteConfig.java b/pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/WebsiteConfig.java new file mode 100644 index 0000000..92cb387 --- /dev/null +++ b/pandamonium-theorem-prover/src/main/java/edu/msudenver/tsp/website/WebsiteConfig.java @@ -0,0 +1,12 @@ +package edu.msudenver.tsp.website; + +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; + +@Configuration +@ComponentScan +//@PropertySource("classpath:development.properties") +public class WebsiteConfig { + + +} diff --git a/pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/HelloControllerTest.java b/pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/HelloControllerTest.java new file mode 100644 index 0000000..ba94e3f --- /dev/null +++ b/pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/HelloControllerTest.java @@ -0,0 +1,13 @@ +package edu.msudenver.tsp.website; + +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + +public class HelloControllerTest { + + @Test + public void test() { + assertEquals(3, 3); + } +} 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/HelloControllerTest.java b/pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/integrationTest/HelloControllerIntegrationTest.java similarity index 67% rename from pandamonium-theorem-prover/src/test/java/HelloControllerTest.java rename to pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/integrationTest/HelloControllerIntegrationTest.java index de8c699..00f8fd7 100644 --- a/pandamonium-theorem-prover/src/test/java/HelloControllerTest.java +++ b/pandamonium-theorem-prover/src/test/java/edu/msudenver/tsp/website/integrationTest/HelloControllerIntegrationTest.java @@ -1,3 +1,5 @@ +package edu.msudenver.tsp.website.integrationTest; + import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -5,10 +7,9 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) -public class HelloControllerTest { - +public class HelloControllerIntegrationTest { @Test public void test() { - assertEquals(3, 3); + assertEquals(3,3); } } diff --git a/pandamonium-theorem-prover/src/test/java/integrationTest/HelloControllerIntegrationTest.java b/pandamonium-theorem-prover/src/test/java/integrationTest/HelloControllerIntegrationTest.java deleted file mode 100644 index 3b4f67d..0000000 --- a/pandamonium-theorem-prover/src/test/java/integrationTest/HelloControllerIntegrationTest.java +++ /dev/null @@ -1,36 +0,0 @@ -package integrationTest; - -import hello.Application; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.client.TestRestTemplate; -import org.springframework.boot.web.server.LocalServerPort; -import org.springframework.http.ResponseEntity; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -import java.net.URL; - -import static org.junit.Assert.assertEquals; - -@RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class) -public class HelloControllerIntegrationTest { - @LocalServerPort private int port; - private URL base; - @Autowired private TestRestTemplate testRestTemplate; - - @Before - public void setUp() throws Exception { - this.base = new URL("http://localhost:" + port + "/"); - } - - @Test - public void testGetHello() { - final ResponseEntity response = testRestTemplate.getForEntity(base.toString(), - String.class); - assertEquals("Greetings from Spring Boot!", response.getBody()); - } -} diff --git a/pandamonium-theorem-prover/utilities/build.gradle b/pandamonium-theorem-prover/utilities/build.gradle new file mode 100644 index 0000000..b8e0e3f --- /dev/null +++ b/pandamonium-theorem-prover/utilities/build.gradle @@ -0,0 +1,17 @@ +plugins { + id 'java' +} + +group 'edu.msudenver.tsp' +version '1.0' + +sourceCompatibility = 1.8 + +repositories { + mavenCentral() +} + +dependencies { + testCompile group: 'junit', name: 'junit', version: '4.12' + compile fileTree(dir: 'lib', include: '**/*.jar') +}