mumuki-java-runner 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bf0c7e563b47d1319d58d5182df60adbb288de8
-  data.tar.gz: 25b86a5e426eadd2773e0c9d8500b69678555951
+  metadata.gz: 0a541271b702736638069bec61f59aabb4c448fc
+  data.tar.gz: aaa46fb1556615c7c8690527c58c31f986371254
 SHA512:
-  metadata.gz: bf17f20de127e1365e33524ee8a9be1bb9cd2680ce68e17a92b5f899af84be457ff3309ee50761a73263ef193e349f3eebf5af00c3ab092b991ffe1457460b39
-  data.tar.gz: 01e4f8236d9938835f2e1f3a9d1351403f00516a13346e53766c1f2ecf0c676f4990d26d817ac47b6b3bc0dfc99b0b4ca91095b0a3d31236ea1d5b122ca33e38
+  metadata.gz: 599d52e7d4669ac2a7ac3cf470bfa6ad3fb545ecd76bea143b4ba89cae42f2c3017fa675503f50cd954d83965cdc7f9d7a92bcb48b9ae2267cf7c04e402d767a
+  data.tar.gz: 8f298391002b59499a250c594fd15ef65d7d06a0d3fafa6be0e49d75ecf90c5dc7b429665991a76c2f33946c3c6ff3e540ab80c604d9929b4b3d77fafa02a194

data/lib/java_runner.rb

@@ -3,8 +3,8 @@ require 'mumukit'
 Mumukit.runner_name = 'java'
 Mumukit.configure do |config|
   config.docker_image = 'mumuki/mumuki-junit-worker'
-
 end
 
+require_relative './version'
 require_relative './test_hook'
-require_relative './metadata_hook'
+require_relative './metadata_hook'

data/lib/test_hook.rb

@@ -1,5 +1,6 @@
 class JavaTestHook < Mumukit::Templates::FileHook
   isolated true
+  structured true
 
   def tempfile_extension
     '.java'
@@ -9,6 +10,14 @@ class JavaTestHook < Mumukit::Templates::FileHook
     "runjunit #{filename}"
   end
 
+  def to_structured_result(result)
+    transform(JSON.parse(result))
+  end
+
+  def transform(examples)
+    examples.map { |e| [e[0], e[1].to_sym, e[2]] }
+  end
+
   def post_process_file(file, result, status)
     if result.include? '!!TEST FINISHED WITH COMPILATION ERROR!!'
       [result, :errored]
@@ -22,21 +31,57 @@ class JavaTestHook < Mumukit::Templates::FileHook
 import java.util.*;
 import java.util.function.*;
 import java.util.stream.*;
+import java.util.stream.Collectors.*;
 import java.time.*;
+import org.junit.runner.RunWith;
 import org.junit.*;
-
+import org.junit.runner.*;
+import org.junit.runner.notification.*;
+import org.junit.runners.*;
+import org.junit.runners.model.InitializationError;
+import org.apache.commons.text.StringEscapeUtils;
 #{request.content}
-
 #{request.extra}
 
 public class SubmissionTest {
-#{request.test}
-
-public static void main(String args[]) {
-  org.junit.runner.JUnitCore.main("SubmissionTest");
+  #{request.test}
+  public static void main(String[] args) {
+    JUnitCore core = new JUnitCore();
+    core.addListener(new MuListener());
+    core.run(SubmissionTest.class);
+  }
 }
+class MuListener extends RunListener {
+  private Map<String, Collection<String>> tests = new HashMap<>();
+  @Override
+  public void testStarted(Description description) throws Exception {
+    String methodName = description.getMethodName();
+    tests.put(methodName, Arrays.asList(methodName, "passed"));
+  }
+
+  @Override
+  public void testFailure(Failure failure) {
+    String methodName = failure.getDescription().getMethodName();
+    tests.put(methodName, Arrays.asList(methodName, "failed", failure.getMessage()));
+  }
+
+  @Override
+  public void testRunFinished(Result r) {
+    String result = prettyFormatResults(tests.values());
+    System.out.println(StringEscapeUtils.unescapeJson(result));
+  }
+
+  public String prettyFormatString(String string) {
+    return ("\\\""+string+"\\\"");
+  }
+  public String prettyFormatExample(Collection<String> example) {
+    return "["+example.stream().map(element -> prettyFormatString(element)).collect(Collectors.joining(",")) +"]";
+  }
+  public String prettyFormatResults(Collection<Collection<String>> results) {
+    return "["+results.stream().map(element -> prettyFormatExample(element)).collect(Collectors.joining(","))+"]";
+  }
 }
 EOF
   end
 
-end
+end

data/lib/version.rb

@@ -0,0 +1,3 @@
+module JavaVersionHook
+  VERSION = '1.1.0'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-java-runner
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-27 00:00:00.000000000 Z
+date: 2017-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit
@@ -104,6 +104,7 @@ files:
 - lib/java_runner.rb
 - lib/metadata_hook.rb
 - lib/test_hook.rb
+- lib/version.rb
 homepage: http://github.com/mumuki/mumuki-java-server
 licenses:
 - MIT
@@ -124,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Java Runner for Mumuki