split unit and integration tests
authorEugene Petrenko <eugene.petrenko@gmail.com>
Wed, 10 Aug 2011 15:20:43 +0000 (19:20 +0400)
committerEugene Petrenko <eugene.petrenko@gmail.com>
Wed, 10 Aug 2011 15:20:43 +0000 (19:20 +0400)
.idea/misc.xml
.idea/runConfigurations/Run_Fast_Tests.xml [moved from .idea/runConfigurations/Run_Tests.xml with 85% similarity]
.idea/runConfigurations/Run_Integration_Tests.xml [moved from .idea/runConfigurations/Run_Tests_TeamCity.xml with 78% similarity]
nuget-server/src/jetbrains/buildServer/nuget/server/trigger/TriggerTasks.java [new file with mode: 0644]
nuget-tests/src/testng-nuget-fast.xml [moved from nuget-tests/src/testng-nuget-tests..xml with 80% similarity]
nuget-tests/src/testng-nuget-integration.xml [new file with mode: 0644]

index 34bba6bdb9629ac136b97eda48b36da2528a5209..9594b8c3e03cd129e06b2d94be7867fd8c30e850 100644 (file)
     <option name="LOCALE" />\r
     <option name="OPEN_IN_BROWSER" value="true" />\r
   </component>\r
+  <component name="NullableNotNullManager">\r
+    <option name="myDefaultNullable" value="org.jetbrains.annotations.Nullable" />\r
+    <option name="myDefaultNotNull" value="org.jetbrains.annotations.NotNull" />\r
+    <option name="myNullables">\r
+      <value>\r
+        <list size="0" />\r
+      </value>\r
+    </option>\r
+    <option name="myNotNulls">\r
+      <value>\r
+        <list size="3">\r
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />\r
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />\r
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />\r
+        </list>\r
+      </value>\r
+    </option>\r
+  </component>\r
   <component name="ProjectResources">\r
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>\r
   </component>\r
similarity index 85%
rename from .idea/runConfigurations/Run_Tests.xml
rename to .idea/runConfigurations/Run_Fast_Tests.xml
index 2cfc583dc8adca0d26d9087fa51db1652e0808a4..ac9252618ce91acf8307fa9f2748a71c86f10cd2 100644 (file)
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">\r
-  <configuration default="false" name="Run Tests" type="TestNG" factoryName="TestNG">\r
-    <extension name="coverage" enabled="true" merge="false" sample_coverage="true" runner="idea">\r
+  <configuration default="false" name="Run Fast Tests" type="TestNG" factoryName="TestNG">\r
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">\r
       <pattern>\r
         <option name="PATTERN" value="jetbrains.*" />\r
         <option name="ENABLED" value="true" />\r
@@ -9,7 +9,7 @@
     <module name="nuget-tests" />\r
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />\r
     <option name="ALTERNATIVE_JRE_PATH" value="" />\r
-    <option name="SUITE_NAME" value="$PROJECT_DIR$/nuget-tests/src/testng-nuget-tests..xml" />\r
+    <option name="SUITE_NAME" value="$PROJECT_DIR$/nuget-tests/src/testng-nuget-fast.xml" />\r
     <option name="PACKAGE_NAME" value="" />\r
     <option name="MAIN_CLASS_NAME" value="" />\r
     <option name="METHOD_NAME" value="" />\r
similarity index 78%
rename from .idea/runConfigurations/Run_Tests_TeamCity.xml
rename to .idea/runConfigurations/Run_Integration_Tests.xml
index 36da977f3ef8aab5760d87e94c63c3fafc19ea9e..824c746a8661197835da35c39fb44bd5d1831f00 100644 (file)
@@ -1,10 +1,15 @@
 <component name="ProjectRunConfigurationManager">\r
-  <configuration default="false" name="Run Tests TeamCity" type="TestNG" factoryName="TestNG">\r
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />\r
+  <configuration default="false" name="Run Integration Tests" type="TestNG" factoryName="TestNG">\r
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">\r
+      <pattern>\r
+        <option name="PATTERN" value="jetbrains.*" />\r
+        <option name="ENABLED" value="true" />\r
+      </pattern>\r
+    </extension>\r
     <module name="nuget-tests" />\r
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />\r
     <option name="ALTERNATIVE_JRE_PATH" value="" />\r
-    <option name="SUITE_NAME" value="$PROJECT_DIR$/nuget-tests/src/testng-nuget-tests..xml" />\r
+    <option name="SUITE_NAME" value="$PROJECT_DIR$/nuget-tests/src/testng-nuget-integration.xml" />\r
     <option name="PACKAGE_NAME" value="" />\r
     <option name="MAIN_CLASS_NAME" value="" />\r
     <option name="METHOD_NAME" value="" />\r
@@ -28,8 +33,6 @@
     <RunnerSettings RunnerId="Profile ">\r
       <option name="myExternalizedOptions" value="&#13;&#10;snapshots-dir=&#13;&#10;additional-options2=onexit\=snapshot&#13;&#10;" />\r
     </RunnerSettings>\r
-    <RunnerSettings RunnerId="Run" />\r
-    <ConfigurationWrapper RunnerId="Run" />\r
     <method />\r
   </configuration>\r
 </component>
\ No newline at end of file
diff --git a/nuget-server/src/jetbrains/buildServer/nuget/server/trigger/TriggerTasks.java b/nuget-server/src/jetbrains/buildServer/nuget/server/trigger/TriggerTasks.java
new file mode 100644 (file)
index 0000000..e97f930
--- /dev/null
@@ -0,0 +1,24 @@
+/*\r
+ * Copyright 2000-2011 JetBrains s.r.o.\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ * http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+\r
+package jetbrains.buildServer.nuget.server.trigger;\r
+\r
+/**\r
+ * Created by Eugene Petrenko (eugene.petrenko@gmail.com)\r
+ * Date: 10.08.11 18:46\r
+ */\r
+public class TriggerTasks {\r
+}\r
similarity index 80%
rename from nuget-tests/src/testng-nuget-tests..xml
rename to nuget-tests/src/testng-nuget-fast.xml
index 3cd0aa20a88ca7776c685d770c6db3d85d30be85..bc4ef387962fa5c1dd15f557857f7f4a3ae061cd 100644 (file)
       <class name="jetbrains.buildServer.nuget.tests.agent.MatchFilesBuildProcessTest"/>\r
     </classes>\r
   </test>\r
-\r
-  <test name="nuget integration test">\r
-    <classes>\r
-      <class name="jetbrains.buildServer.nuget.tests.integration.InstallPackageIntegtatoinTest"/>\r
-      <class name="jetbrains.buildServer.nuget.tests.integration.NuGetExecutorTest"/>\r
-      <class name="jetbrains.buildServer.nuget.tests.integration.PackagesPublishIntegrationTest"/>\r
-    </classes>\r
-  </test>\r
 </suite>\r
 \r
diff --git a/nuget-tests/src/testng-nuget-integration.xml b/nuget-tests/src/testng-nuget-integration.xml
new file mode 100644 (file)
index 0000000..0d42ca6
--- /dev/null
@@ -0,0 +1,11 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">\r
+<suite name="nuget">\r
+  <test name="nuget integration test">\r
+    <classes>\r
+      <class name="jetbrains.buildServer.nuget.tests.integration.InstallPackageIntegtatoinTest"/>\r
+      <class name="jetbrains.buildServer.nuget.tests.integration.NuGetExecutorTest"/>\r
+      <class name="jetbrains.buildServer.nuget.tests.integration.PackagesPublishIntegrationTest"/>\r
+    </classes>\r
+  </test>\r
+</suite>\r
+\r