From 29faacb9ffcce109208d60d16a0d3627bf502d91 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Tue, 5 Mar 2013 17:17:00 -0600 Subject: rename --- build.sbt | 2 +- src/main/scala/org/perl8/test/ExternalTest.scala | 2 +- src/main/scala/org/perl8/test/Test.scala | 9 ++++---- src/main/scala/org/perl8/test/TestMore.scala | 10 ++++----- .../org/perl8/test/harness/MultiTestReporter.scala | 4 ++-- .../scala/org/perl8/test/harness/Reporter.scala | 4 ++-- .../org/perl8/test/harness/SummarizedTests.scala | 15 +++++++------ .../org/perl8/test/harness/SummaryReporter.scala | 8 +++---- .../scala/org/perl8/test/harness/TAPReporter.scala | 6 ++--- .../scala/org/perl8/test/harness/TestHarness.scala | 18 +++++++-------- .../scala/org/perl8/test/harness/package.scala | 2 +- src/main/scala/org/perl8/test/package.scala | 2 +- .../scala/org/perl8/test/sbt/Fingerprint.scala | 4 ++-- src/main/scala/org/perl8/test/sbt/Framework.scala | 2 +- src/main/scala/org/perl8/test/sbt/Runner.scala | 8 +++---- .../scala/org/perl8/test/sbt/SBTReporter.scala | 8 +++---- src/main/scala/org/perl8/test/sbt/package.scala | 2 +- src/main/scala/org/perl8/test/tap/Consumer.scala | 15 +++++++------ src/main/scala/org/perl8/test/tap/Parser.scala | 16 ++++++------- src/main/scala/org/perl8/test/tap/Producer.scala | 8 +++---- src/main/scala/org/perl8/test/tap/TAPEvent.scala | 21 ++++++++--------- src/main/scala/org/perl8/test/tap/TAPResult.scala | 26 ++++++++++++---------- .../scala/org/perl8/test/tap/TestBuilder.scala | 6 ++--- src/main/scala/org/perl8/test/tap/package.scala | 2 +- src/test/scala/org/perl8/test/ExtensionTest.scala | 4 ++-- .../scala/org/perl8/test/ExternalTestTest.scala | 2 +- src/test/scala/org/perl8/test/PlanTest.scala | 4 ++-- src/test/scala/org/perl8/test/TestMoreTest.scala | 4 ++-- src/test/scala/org/perl8/test/tap/ParserTest.scala | 4 ++-- .../scala/org/perl8/test/tap/TestBuilderTest.scala | 4 ++-- 30 files changed, 114 insertions(+), 108 deletions(-) diff --git a/build.sbt b/build.sbt index 5805811..b8d70f7 100644 --- a/build.sbt +++ b/build.sbt @@ -8,4 +8,4 @@ libraryDependencies += "org.scala-tools.testing" % "test-interface" % "0.5" scalacOptions ++= Seq("-deprecation", "-unchecked", "-feature") -testFrameworks += new TestFramework("org.perl8.test.sbt.Framework") +testFrameworks += new TestFramework("com.iinteractive.test.sbt.Framework") diff --git a/src/main/scala/org/perl8/test/ExternalTest.scala b/src/main/scala/org/perl8/test/ExternalTest.scala index 4cb738c..7855aa8 100644 --- a/src/main/scala/org/perl8/test/ExternalTest.scala +++ b/src/main/scala/org/perl8/test/ExternalTest.scala @@ -1,4 +1,4 @@ -package org.perl8.test +package com.iinteractive.test import scala.concurrent.Await import scala.concurrent.duration.Duration diff --git a/src/main/scala/org/perl8/test/Test.scala b/src/main/scala/org/perl8/test/Test.scala index ffe75b9..2161de3 100644 --- a/src/main/scala/org/perl8/test/Test.scala +++ b/src/main/scala/org/perl8/test/Test.scala @@ -1,4 +1,4 @@ -package org.perl8.test +package com.iinteractive.test /** Base trait for test classes in this framework. Any tests that should be * autodiscovered by `sbt test` should extend this trait, and implement @@ -22,9 +22,10 @@ trait Test { * * Summarizing test reporters tend to repeatedly update the same line on * the terminal, so this method makes calls to - * [[org.perl8.test.tap.TestBuilder#diag diag]] (which sends messages to - * stderr, where they are typically displayed as-is) prefix the message - * with a newline, to ensure that the output starts on its own line. + * [[com.iinteractive.test.tap.TestBuilder#diag diag]] (which sends + * messages to stderr, where they are typically displayed as-is) prefix the + * message with a newline, to ensure that the output starts on its own + * line. */ def runInHarness: Int = runTests(true) diff --git a/src/main/scala/org/perl8/test/TestMore.scala b/src/main/scala/org/perl8/test/TestMore.scala index 1141b90..eb5210b 100644 --- a/src/main/scala/org/perl8/test/TestMore.scala +++ b/src/main/scala/org/perl8/test/TestMore.scala @@ -1,8 +1,8 @@ -package org.perl8.test +package com.iinteractive.test import scala.util.matching.Regex -import org.perl8.test.tap.TestBuilder +import com.iinteractive.test.tap.TestBuilder /** This class is an implementation of the excellent * [[https://metacpan.org/module/Test::More Test::More]] testing library for @@ -38,7 +38,7 @@ import org.perl8.test.tap.TestBuilder * framework with sbt by adding this line to your `build.sbt` file: * * 
-  * testFrameworks += new TestFramework("org.perl8.test.sbt.Framework")
+  * testFrameworks += new TestFramework("com.iinteractive.test.sbt.Framework")
   *
* * Then, any classes in your test directory which extend `TestMore` will be @@ -465,7 +465,7 @@ class TestMore (plan: Plan = NoPlan) extends Test with DelayedInit { !ignoreFrame(frame) } val idx = stack.lastIndexWhere { frame => - frame.getClassName == "org.perl8.test.TestMore" && + frame.getClassName == "com.iinteractive.test.TestMore" && frame.getMethodName == "hideTestMethod" } val caller = idx match { @@ -502,7 +502,7 @@ class TestMore (plan: Plan = NoPlan) extends Test with DelayedInit { // ignore everything in this class, except the hideTestMethod call which we // use as a stack trace marker - (className == "org.perl8.test.TestMore" && + (className == "com.iinteractive.test.TestMore" && methodName != "hideTestMethod") || // when you call a method in a class when the method is defined in a // trait, it calls a stub which calls the real definition in the trait. diff --git a/src/main/scala/org/perl8/test/harness/MultiTestReporter.scala b/src/main/scala/org/perl8/test/harness/MultiTestReporter.scala index 8437c4a..56f32fd 100644 --- a/src/main/scala/org/perl8/test/harness/MultiTestReporter.scala +++ b/src/main/scala/org/perl8/test/harness/MultiTestReporter.scala @@ -1,10 +1,10 @@ -package org.perl8.test.harness +package com.iinteractive.test.harness /** Classes that implement `MultiTestReporter` are capable of running a group * of test classes, given their names. This typically involves some sort of * summarization. * - * @see [[org.perl8.test.harness.Reporter Reporter]]. + * @see [[com.iinteractive.test.harness.Reporter Reporter]]. */ trait MultiTestReporter { /** Runs the test classes identifed by the list of fully qualified class diff --git a/src/main/scala/org/perl8/test/harness/Reporter.scala b/src/main/scala/org/perl8/test/harness/Reporter.scala index bf818db..a47444b 100644 --- a/src/main/scala/org/perl8/test/harness/Reporter.scala +++ b/src/main/scala/org/perl8/test/harness/Reporter.scala @@ -1,9 +1,9 @@ -package org.perl8.test.harness +package com.iinteractive.test.harness /** Classes that implement `Reporter` are capable of running a test class, * given its name. * - * @see [[org.perl8.test.harness.MultiTestReporter MultiTestReporter]]. + * @see [[com.iinteractive.test.harness.MultiTestReporter MultiTestReporter]]. */ trait Reporter { /** Runs the test class identifed by the fully qualified class name diff --git a/src/main/scala/org/perl8/test/harness/SummarizedTests.scala b/src/main/scala/org/perl8/test/harness/SummarizedTests.scala index 207cc18..cd555dd 100644 --- a/src/main/scala/org/perl8/test/harness/SummarizedTests.scala +++ b/src/main/scala/org/perl8/test/harness/SummarizedTests.scala @@ -1,4 +1,4 @@ -package org.perl8.test.harness +package com.iinteractive.test.harness import java.io.{PipedInputStream,PipedOutputStream} import scala.concurrent.Await @@ -6,17 +6,18 @@ import scala.concurrent.duration.Duration import scala.concurrent.ExecutionContext.Implicits.global import scala.concurrent.Future -import org.perl8.test.tap.{Parser,TAPEvent,TAPResult,TodoDirective} -import org.perl8.test.Test +import com.iinteractive.test.tap.{Parser,TAPEvent,TAPResult,TodoDirective} +import com.iinteractive.test.Test /** This is a trait for classes that run tests and summarize the results. It * provides a single `runOneTest` method, which runs a test class and - * produces a stream of [[org.perl8.test.tap.TAPEvent TAP events]] which can - * be used to produce whatever summarized output you need. + * produces a stream of [[com.iinteractive.test.tap.TAPEvent TAP events]] + * which can be used to produce whatever summarized output you need. */ trait SummarizedTests { - /** Runs a single [[org.perl8.test.Test test]] instance, calling `cb` with - * each [[org.perl8.test.tap.TAPEvent TAP event]] as it is produced. + /** Runs a single [[com.iinteractive.test.Test test]] instance, calling `cb` + * with each [[com.iinteractive.test.tap.TAPEvent TAP event]] as it is + * produced. * * @return The overall result of the test instance. */ diff --git a/src/main/scala/org/perl8/test/harness/SummaryReporter.scala b/src/main/scala/org/perl8/test/harness/SummaryReporter.scala index 1901bcf..a5fe1e0 100644 --- a/src/main/scala/org/perl8/test/harness/SummaryReporter.scala +++ b/src/main/scala/org/perl8/test/harness/SummaryReporter.scala @@ -1,8 +1,8 @@ -package org.perl8.test.harness +package com.iinteractive.test.harness -import org.perl8.test.tap.{TAPEvent,StartEvent,ResultEvent,PlanEvent,EndEvent} -import org.perl8.test.tap.{TAPResult,TodoDirective} -import org.perl8.test.Test +import com.iinteractive.test.tap.{TAPEvent,TAPResult,TodoDirective} +import com.iinteractive.test.tap.{StartEvent,ResultEvent,PlanEvent,EndEvent} +import com.iinteractive.test.Test /** Runs a series of tests. The TAP output from these tests is parsed, and * output is produced which is similar in style to Perl's diff --git a/src/main/scala/org/perl8/test/harness/TAPReporter.scala b/src/main/scala/org/perl8/test/harness/TAPReporter.scala index 58dd175..8a4dc9f 100644 --- a/src/main/scala/org/perl8/test/harness/TAPReporter.scala +++ b/src/main/scala/org/perl8/test/harness/TAPReporter.scala @@ -1,7 +1,7 @@ -package org.perl8.test.harness +package com.iinteractive.test.harness -import org.perl8.test.tap -import org.perl8.test.Test +import com.iinteractive.test.tap +import com.iinteractive.test.Test /** Runs a single test. The TAP stream from that test is written directly to * stdout/stderr. diff --git a/src/main/scala/org/perl8/test/harness/TestHarness.scala b/src/main/scala/org/perl8/test/harness/TestHarness.scala index f2f3553..7b8f4ae 100644 --- a/src/main/scala/org/perl8/test/harness/TestHarness.scala +++ b/src/main/scala/org/perl8/test/harness/TestHarness.scala @@ -1,4 +1,4 @@ -package org.perl8.test.harness +package com.iinteractive.test.harness /** This is the entry point to running tests written with this library from * the command line. Note that this library also implements the @@ -9,7 +9,7 @@ package org.perl8.test.harness * will run that test and write its TAP stream to the console. * * {{{ - * $ scala org.perl8.test.harness.TestHarness MyTest + * $ scala com.iinteractive.test.harness.TestHarness MyTest * ok 1 * ok 2 * 1..2 @@ -21,7 +21,7 @@ package org.perl8.test.harness * [[https://metacpan.org/module/Test::Harness Perl's Test::Harness]]. * * {{{ - * $ scala org.perl8.test.harness.TestHarness MyTest1 MyTest2 + * $ scala com.iinteractive.test.harness.TestHarness MyTest1 MyTest2 * MyTest1 .. ok * MyTest2 .. ok * All tests successful. @@ -32,16 +32,16 @@ package org.perl8.test.harness * This application also accepts a few command line options to customize its * behavior: * - * - `-r`: Alternative [[org.perl8.test.harness.Reporter Reporter]] class to - * use for running a single test. + * - `-r`: Alternative [[com.iinteractive.test.harness.Reporter Reporter]] + * class to use for running a single test. * - `-R`: Alternative - * [[org.perl8.test.harness.MultiTestReporter MultiTestReporter]] + * [[com.iinteractive.test.harness.MultiTestReporter MultiTestReporter]] * class to use for running a group of tests. Also enables using the * MultiTestReporter for a single test. * - `--help`: Prints usage information. */ object TestHarness { - import org.perl8.test.Test + import com.iinteractive.test.Test /** Entry point for the harness application. */ def main (args: Array[String]) { @@ -66,8 +66,8 @@ object TestHarness { protected def parseOpts (args: List[String]): Map[String, Any] = args match { case Nil => Map( - "single-reporter" -> "org.perl8.test.harness.TAPReporter", - "multi-reporter" -> "org.perl8.test.harness.SummaryReporter", + "single-reporter" -> "com.iinteractive.test.harness.TAPReporter", + "multi-reporter" -> "com.iinteractive.test.harness.SummaryReporter", "prefer-single" -> true, "test-classes" -> Nil ) diff --git a/src/main/scala/org/perl8/test/harness/package.scala b/src/main/scala/org/perl8/test/harness/package.scala index 919abc2..1b74f9d 100644 --- a/src/main/scala/org/perl8/test/harness/package.scala +++ b/src/main/scala/org/perl8/test/harness/package.scala @@ -1,4 +1,4 @@ -package org.perl8.test +package com.iinteractive.test /** Classes to handle running test instances and providing output. */ package object harness { diff --git a/src/main/scala/org/perl8/test/package.scala b/src/main/scala/org/perl8/test/package.scala index 5b9edbb..98cba60 100644 --- a/src/main/scala/org/perl8/test/package.scala +++ b/src/main/scala/org/perl8/test/package.scala @@ -1,4 +1,4 @@ -package org.perl8 +package com.iinteractive package object test { import language.implicitConversions diff --git a/src/main/scala/org/perl8/test/sbt/Fingerprint.scala b/src/main/scala/org/perl8/test/sbt/Fingerprint.scala index c60c97b..bab13c5 100644 --- a/src/main/scala/org/perl8/test/sbt/Fingerprint.scala +++ b/src/main/scala/org/perl8/test/sbt/Fingerprint.scala @@ -1,4 +1,4 @@ -package org.perl8.test.sbt +package com.iinteractive.test.sbt import org.scalatools.testing @@ -7,5 +7,5 @@ import org.scalatools.testing */ object Fingerprint extends testing.SubclassFingerprint { def isModule: Boolean = false - def superClassName: String = "org.perl8.test.Test" + def superClassName: String = "com.iinteractive.test.Test" } diff --git a/src/main/scala/org/perl8/test/sbt/Framework.scala b/src/main/scala/org/perl8/test/sbt/Framework.scala index e8b5c57..bb3d0bb 100644 --- a/src/main/scala/org/perl8/test/sbt/Framework.scala +++ b/src/main/scala/org/perl8/test/sbt/Framework.scala @@ -1,4 +1,4 @@ -package org.perl8.test.sbt +package com.iinteractive.test.sbt import org.scalatools.testing diff --git a/src/main/scala/org/perl8/test/sbt/Runner.scala b/src/main/scala/org/perl8/test/sbt/Runner.scala index 442e4eb..0eee4cf 100644 --- a/src/main/scala/org/perl8/test/sbt/Runner.scala +++ b/src/main/scala/org/perl8/test/sbt/Runner.scala @@ -1,13 +1,13 @@ -package org.perl8.test.sbt +package com.iinteractive.test.sbt import org.scalatools.testing -import org.perl8.test.harness.SummaryReporter -import org.perl8.test.Test +import com.iinteractive.test.harness.SummaryReporter +import com.iinteractive.test.Test /** Implementation of * [[http://github.com/harrah/test-interface/blob/master/src/org/scalatools/testing/Runner2.java org.scalatools.testing.Runner2]] - * using [[org.perl8.test.sbt.SBTReporter SBTReporter]]. + * using [[com.iinteractive.test.sbt.SBTReporter SBTReporter]]. */ class Runner ( loader: ClassLoader, diff --git a/src/main/scala/org/perl8/test/sbt/SBTReporter.scala b/src/main/scala/org/perl8/test/sbt/SBTReporter.scala index 9671f8e..34df60d 100644 --- a/src/main/scala/org/perl8/test/sbt/SBTReporter.scala +++ b/src/main/scala/org/perl8/test/sbt/SBTReporter.scala @@ -1,10 +1,10 @@ -package org.perl8.test.sbt +package com.iinteractive.test.sbt import org.scalatools.testing -import org.perl8.test.harness.{Reporter,SummarizedTests} -import org.perl8.test.tap.{TAPEvent,ResultEvent,EndEvent} -import org.perl8.test.Test +import com.iinteractive.test.harness.{Reporter,SummarizedTests} +import com.iinteractive.test.tap.{TAPEvent,ResultEvent,EndEvent} +import com.iinteractive.test.Test /** Runs a single test under the SBT test harness. */ class SBTReporter ( diff --git a/src/main/scala/org/perl8/test/sbt/package.scala b/src/main/scala/org/perl8/test/sbt/package.scala index 2f97e65..eeb1f68 100644 --- a/src/main/scala/org/perl8/test/sbt/package.scala +++ b/src/main/scala/org/perl8/test/sbt/package.scala @@ -1,4 +1,4 @@ -package org.perl8.test +package com.iinteractive.test /** Classes for interoperating with `sbt test`. */ package object sbt diff --git a/src/main/scala/org/perl8/test/tap/Consumer.scala b/src/main/scala/org/perl8/test/tap/Consumer.scala index e822212..09a2f0a 100644 --- a/src/main/scala/org/perl8/test/tap/Consumer.scala +++ b/src/main/scala/org/perl8/test/tap/Consumer.scala @@ -1,13 +1,13 @@ -package org.perl8.test.tap +package com.iinteractive.test.tap -import org.perl8.test.{Plan,NumericPlan,SkipAll} +import com.iinteractive.test.{Plan,NumericPlan,SkipAll} /** Contains a method to parse an individual line of TAP. */ object Consumer { /** Parses a line of TAP. * - * @return A [[org.perl8.test.tap.Consumer.Line Line]] object corresponding - * to the parsed line. + * @return A [[com.iinteractive.test.tap.Consumer.Line Line]] object + * corresponding to the parsed line. */ def parseLine (line: String): Line = { commentRx.findFirstMatchIn(line).map { m => @@ -81,7 +81,8 @@ object Consumer { /** A parsed TAP line containing a test plan. * - * @param plan The [[org.perl8.test.Plan Plan]] that this line represents. + * @param plan The [[com.iinteractive.test.Plan Plan]] that this line + * represents. */ case class PlanLine private[Consumer] ( plan: Plan, @@ -99,8 +100,8 @@ object Consumer { /** A parsed TAP line containing a test result. * - * @param result The [[org.perl8.test.tap.TestResult TestResult]] that this - * line represents. + * @param result The [[com.iinteractive.test.tap.TestResult TestResult]] + * that this line represents. */ case class ResultLine private[Consumer] ( result: TestResult, diff --git a/src/main/scala/org/perl8/test/tap/Parser.scala b/src/main/scala/org/perl8/test/tap/Parser.scala index 66a2c04..7bc44d3 100644 --- a/src/main/scala/org/perl8/test/tap/Parser.scala +++ b/src/main/scala/org/perl8/test/tap/Parser.scala @@ -1,4 +1,4 @@ -package org.perl8.test.tap +package com.iinteractive.test.tap import java.io.{ByteArrayInputStream,InputStream,OutputStream} import scala.annotation.tailrec @@ -6,8 +6,8 @@ import scala.io.Source import scala.util.parsing.combinator._ import scala.util.parsing.input.{Position,Reader} -import org.perl8.test.Plan -import org.perl8.test.tap.Consumer._ +import com.iinteractive.test.Plan +import com.iinteractive.test.tap.Consumer._ /** This class parses a TAP stream. It can either parse it all at once (from a * string), or it can be used as a streaming parser, where TAP events are @@ -20,8 +20,8 @@ class Parser private ( /** Creates a parser instance. * @param cb The event handler callback. It will be called after each * meaningful line of TAP, with a - * [[org.perl8.test.tap.TAPEvent TAPEvent]] instance representing - * the event that was just parsed. + * [[com.iinteractive.test.tap.TAPEvent TAPEvent]] instance + * representing the event that was just parsed. */ def this (cb: TAPEvent => Unit = e => ()) = this(cb, "") @@ -112,9 +112,9 @@ class Parser private ( private def subtest: Parser[TAPResult] = LineParser("subtest") { in => // can't just return the result directly, because it's of a different - // type (the path dependent type associated with the new Parser instance - // we create here, rather than the path dependent type associated with - // this) + // type (the path dependent type associated with the new Parser + // instance we create here, rather than the path dependent type + // associated with this) val subParser = new TAPParser( e => (), in.first.indent diff --git a/src/main/scala/org/perl8/test/tap/Producer.scala b/src/main/scala/org/perl8/test/tap/Producer.scala index 7f5edaf..3ed8d7e 100644 --- a/src/main/scala/org/perl8/test/tap/Producer.scala +++ b/src/main/scala/org/perl8/test/tap/Producer.scala @@ -1,8 +1,8 @@ -package org.perl8.test.tap +package com.iinteractive.test.tap /** Contains functions for producing individual lines of TAP. */ object Producer { - import org.perl8.test.Plan + import com.iinteractive.test.Plan /** Returns a test result. * @@ -48,8 +48,8 @@ object Producer { /** Returns a test plan. * - * @example `1..5` ([[org.perl8.test.NumericPlan NumericPlan]]) - * @example `1..0 # SKIP don't run this test` ([[org.perl8.test.SkipAll SkipAll]]) + * @example `1..5` ([[com.iinteractive.test.NumericPlan NumericPlan]]) + * @example `1..0 # SKIP don't run this test` ([[com.iinteractive.test.SkipAll SkipAll]]) */ def plan (plan: Plan): String = plan.skipAll.map(m => "1..0 # SKIP " + m).getOrElse("1.." + plan.plan) diff --git a/src/main/scala/org/perl8/test/tap/TAPEvent.scala b/src/main/scala/org/perl8/test/tap/TAPEvent.scala index 0f9318b..1c2e88d 100644 --- a/src/main/scala/org/perl8/test/tap/TAPEvent.scala +++ b/src/main/scala/org/perl8/test/tap/TAPEvent.scala @@ -1,6 +1,6 @@ -package org.perl8.test.tap +package com.iinteractive.test.tap -import org.perl8.test.Plan +import com.iinteractive.test.Plan /** An event emitted while parsing a TAP stream. */ sealed trait TAPEvent @@ -9,23 +9,24 @@ sealed trait TAPEvent case object StartEvent extends TAPEvent /** The end of a TAP stream. - * @param result The [[org.perl8.test.tap.TAPResult TAPResult]] containing - * information about all of the tests which just finished - * running. This will be the same thing that is returned by the - * call to [[org.perl8.test.tap.Parser Parser]]'s `parse` + * @param result The [[com.iinteractive.test.tap.TAPResult TAPResult]] + * containing information about all of the tests which just + * finished running. This will be the same thing that is + * returned by the call to + * [[com.iinteractive.test.tap.Parser Parser]]'s `parse` * method. */ case class EndEvent private[tap] (result: TAPResult) extends TAPEvent /** An individual test result. - * @param result The [[org.perl8.test.tap.TestResult TestResult]] containing - * information about the corresponding test. + * @param result The [[com.iinteractive.test.tap.TestResult TestResult]] + * containing information about the corresponding test. */ case class ResultEvent private[tap] (result: TestResult) extends TAPEvent /** A test plan. - * @param plan The [[org.perl8.test.Plan Plan]] corresponding to the line that - * was parsed. + * @param plan The [[com.iinteractive.test.Plan Plan]] corresponding to the + * line that was parsed. */ case class PlanEvent private[tap] (plan: Plan) extends TAPEvent diff --git a/src/main/scala/org/perl8/test/tap/TAPResult.scala b/src/main/scala/org/perl8/test/tap/TAPResult.scala index 2a23122..c3c4926 100644 --- a/src/main/scala/org/perl8/test/tap/TAPResult.scala +++ b/src/main/scala/org/perl8/test/tap/TAPResult.scala @@ -1,15 +1,16 @@ -package org.perl8.test.tap +package com.iinteractive.test.tap -import org.perl8.test.{Plan,NumericPlan,SkipAll} +import com.iinteractive.test.{Plan,NumericPlan,SkipAll} /** The summarized results of a TAP stream. Contains the - * [[org.perl8.test.Plan Plan]] that was given, as well as a list of - * [[org.perl8.test.tap.TestResult TestResults]] corresponding to each of the - * tests in the stream. + * [[com.iinteractive.test.Plan Plan]] that was given, as well as a list of + * [[com.iinteractive.test.tap.TestResult TestResults]] corresponding to each + * of the tests in the stream. * - * @param plan The [[org.perl8.test.Plan Plan]] from the TAP stream - * @param results The list of [[org.perl8.test.tap.TestResult TestResults]] - * from the TAP stream + * @param plan The [[com.iinteractive.test.Plan Plan]] from the TAP stream + * @param results The list of + * [[com.iinteractive.test.tap.TestResult TestResults]] from + * the TAP stream */ class TAPResult (val plan: Plan, val results: Seq[TestResult]) { /** Returns true if the number of tests executed was compatible with the @@ -60,10 +61,11 @@ class TAPResult (val plan: Plan, val results: Seq[TestResult]) { * @param passed True if the test passed * @param number The test number in the TAP stream * @param description The test description - * @param directive The [[org.perl8.test.tap.Directive Directive]] (either - * skip or todo) that was provided for this test, if any - * @param subtest The [[org.perl8.test.tap.TAPResult]] for the subtest - * that this test corresponds to, if any + * @param directive The [[com.iinteractive.test.tap.Directive Directive]] + * (either skip or todo) that was provided for this test, + * if any + * @param subtest The [[com.iinteractive.test.tap.TAPResult]] for the + * subtest that this test corresponds to, if any */ class TestResult ( val passed: Boolean, diff --git a/src/main/scala/org/perl8/test/tap/TestBuilder.scala b/src/main/scala/org/perl8/test/tap/TestBuilder.scala index 3ee4706..62fdf02 100644 --- a/src/main/scala/org/perl8/test/tap/TestBuilder.scala +++ b/src/main/scala/org/perl8/test/tap/TestBuilder.scala @@ -1,6 +1,6 @@ -package org.perl8.test.tap +package com.iinteractive.test.tap -import org.perl8.test._ +import com.iinteractive.test._ /** This class provides a convenient yet low level API for generating TAP * streams. Each instance of this class handles a single TAP stream, and @@ -22,7 +22,7 @@ class TestBuilder private ( /** Creates a new builder instance, and emits the corresponding plan line, * unless the plan is not given. * - * @param plan [[org.perl8.test.Plan plan]] for this test. + * @param plan [[com.iinteractive.test.Plan plan]] for this test. * @param terminalInUse Whether this test is being run from a harness which * will not just be writing directly to the output. * This will make things written to `Console.err` have diff --git a/src/main/scala/org/perl8/test/tap/package.scala b/src/main/scala/org/perl8/test/tap/package.scala index 7721d7f..312f996 100644 --- a/src/main/scala/org/perl8/test/tap/package.scala +++ b/src/main/scala/org/perl8/test/tap/package.scala @@ -1,4 +1,4 @@ -package org.perl8.test +package com.iinteractive.test /** Classes for TAP generation and parsing. */ package object tap { diff --git a/src/test/scala/org/perl8/test/ExtensionTest.scala b/src/test/scala/org/perl8/test/ExtensionTest.scala index a74392e..5c49f21 100644 --- a/src/test/scala/org/perl8/test/ExtensionTest.scala +++ b/src/test/scala/org/perl8/test/ExtensionTest.scala @@ -1,8 +1,8 @@ -package org.perl8.test +package com.iinteractive.test import java.io.ByteArrayOutputStream -import org.perl8.test.tap.Parser +import com.iinteractive.test.tap.Parser trait NumberZero { this: TestMore => def is_zero (i: Int, desc: String): Boolean = hideTestMethod { diff --git a/src/test/scala/org/perl8/test/ExternalTestTest.scala b/src/test/scala/org/perl8/test/ExternalTestTest.scala index 23fa961..e830abe 100644 --- a/src/test/scala/org/perl8/test/ExternalTestTest.scala +++ b/src/test/scala/org/perl8/test/ExternalTestTest.scala @@ -1,3 +1,3 @@ -package org.perl8.test +package com.iinteractive.test class ExternalTestTest extends ExternalTest("perl", "perl/test.t") diff --git a/src/test/scala/org/perl8/test/PlanTest.scala b/src/test/scala/org/perl8/test/PlanTest.scala index e467c2f..6d1690b 100644 --- a/src/test/scala/org/perl8/test/PlanTest.scala +++ b/src/test/scala/org/perl8/test/PlanTest.scala @@ -1,8 +1,8 @@ -package org.perl8.test +package com.iinteractive.test import java.io.ByteArrayOutputStream -import org.perl8.test.tap.Parser +import com.iinteractive.test.tap.Parser class PlanTest extends TestMore { private class PlanTestTest extends TestMore(2) { diff --git a/src/test/scala/org/perl8/test/TestMoreTest.scala b/src/test/scala/org/perl8/test/TestMoreTest.scala index 317aaaf..ead9823 100644 --- a/src/test/scala/org/perl8/test/TestMoreTest.scala +++ b/src/test/scala/org/perl8/test/TestMoreTest.scala @@ -1,8 +1,8 @@ -package org.perl8.test +package com.iinteractive.test import java.io.ByteArrayOutputStream -import org.perl8.test.tap.Parser +import com.iinteractive.test.tap.Parser class TestMoreTest extends TestMore { val lineZero = Thread.currentThread.getStackTrace()(1).getLineNumber + 3 diff --git a/src/test/scala/org/perl8/test/tap/ParserTest.scala b/src/test/scala/org/perl8/test/tap/ParserTest.scala index ee7fe83..bb871ee 100644 --- a/src/test/scala/org/perl8/test/tap/ParserTest.scala +++ b/src/test/scala/org/perl8/test/tap/ParserTest.scala @@ -1,6 +1,6 @@ -package org.perl8.test.tap +package com.iinteractive.test.tap -import org.perl8.test.{TestMore,SkipAll,NumericPlan} +import com.iinteractive.test.{TestMore,SkipAll,NumericPlan} class ParserTest extends TestMore { subtest ("basic") { diff --git a/src/test/scala/org/perl8/test/tap/TestBuilderTest.scala b/src/test/scala/org/perl8/test/tap/TestBuilderTest.scala index a9fbf6d..bc873c8 100644 --- a/src/test/scala/org/perl8/test/tap/TestBuilderTest.scala +++ b/src/test/scala/org/perl8/test/tap/TestBuilderTest.scala @@ -1,8 +1,8 @@ -package org.perl8.test.tap +package com.iinteractive.test.tap import java.io.ByteArrayOutputStream -import org.perl8.test.{TestMore,SkipAll,BailOutException} +import com.iinteractive.test.{TestMore,SkipAll,BailOutException} class TestBuilderTest extends TestMore { subtest ("ok") { -- cgit v1.2.3