uncommitted - jformatstring
Ready changes
Summary
Import uploads missing from VCS:Diff
diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
new file mode 100644
index 0000000..6857a8d
--- /dev/null
+++ b/.pc/.quilt_patches
@@ -0,0 +1 @@
+debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
new file mode 100644
index 0000000..c206706
--- /dev/null
+++ b/.pc/.quilt_series
@@ -0,0 +1 @@
+series
diff --git a/.pc/.version b/.pc/.version
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/.pc/.version
@@ -0,0 +1 @@
+2
diff --git a/.pc/0001-RemoveExternalLibDependencyAndFixTestModule.patch/build.xml b/.pc/0001-RemoveExternalLibDependencyAndFixTestModule.patch/build.xml
new file mode 100644
index 0000000..8334226
--- /dev/null
+++ b/.pc/0001-RemoveExternalLibDependencyAndFixTestModule.patch/build.xml
@@ -0,0 +1,78 @@
+
+<project name="jFormatString" default="build">
+
+ <property file="local.properties" />
+
+ <property file="build.properties" />
+
+ <property name="anttask.jar" value="${findbugs.home}/lib/findbugs-ant.jar" />
+
+ <path id="compileClasspath">
+ <fileset dir="lib" />
+ </path>
+
+ <target name="build" depends="clean,jarFile,findbugs" />
+
+ <target name="classes">
+ <mkdir dir="build/classes" />
+ <javac destdir="build/classes" source="1.5" target="1.5" debug="on"
+ includeantruntime="false">
+ <src path="src/java" />
+ <src path="src/junit" />
+ <classpath>
+ <pathelement location="build/classes" />
+ </classpath>
+ <classpath refid="compileClasspath" />
+ </javac>
+ </target>
+
+ <target name="jarFile" depends="classes">
+ <jar destfile="build/jFormatString.jar">
+ <fileset dir="build/classes">
+ <include name="**/*.class" />
+ </fileset>
+ <fileset dir="src/java">
+ <include name="**/*.java" />
+ </fileset>
+ </jar>
+ </target>
+
+
+ <target name="clean">
+ <delete dir="build/classes" />
+ </target>
+
+
+ <target name="findbugs" depends="classes" if="findbugs.home">
+ <echo>FB home ${findbugs.home}</echo>
+ <echo>FB ant ${anttask.jar}</echo>
+ <taskdef resource="edu/umd/cs/findbugs/anttask/tasks.properties"
+ classpath="${anttask.jar}" />
+ <findbugs home="${findbugs.home}" output="xml:withMessages"
+ projectName="jFormatString" chooseVisitors="+CheckExpectedWarnings"
+ outputFile="build/bugs.xml">
+ <class location="build/classes/" />
+ <sourcePath path="src/java" />
+ <sourcePath path="src/junit" />
+ </findbugs>
+
+
+
+ <taskdef name="filterBugs" classname="edu.umd.cs.findbugs.anttask.FilterBugsTask"
+ classpath="${anttask.jar}" />
+ <taskdef name="printBugs"
+ classname="edu.umd.cs.findbugs.anttask.ConvertXmlToTextTask"
+ classpath="${anttask.jar}" />
+ <filterBugs home="${findbugs.home}" priority="1"
+ bugPattern="FB" inputFile="build/bugs.xml" outputFile="build/unexpected.xml">
+ </filterBugs>
+ <printBugs home="${findbugs.home}" inputFile="build/unexpected.xml"
+ format="text">
+ </printBugs>
+
+
+ </target>
+
+</project>
+
+<!-- vim:set ts=4: -->
diff --git a/.pc/0001-RemoveExternalLibDependencyAndFixTestModule.patch/src/junit/edu/umd/cs/findbugs/formatStringChecker/FormatterRuntimeTest.java b/.pc/0001-RemoveExternalLibDependencyAndFixTestModule.patch/src/junit/edu/umd/cs/findbugs/formatStringChecker/FormatterRuntimeTest.java
new file mode 100644
index 0000000..bcb82dc
--- /dev/null
+++ b/.pc/0001-RemoveExternalLibDependencyAndFixTestModule.patch/src/junit/edu/umd/cs/findbugs/formatStringChecker/FormatterRuntimeTest.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright 2013 by Bill Pugh.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. This
+ * particular file as subject to the "Classpath" exception.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+package edu.umd.cs.findbugs.formatStringChecker;
+
+import static org.junit.Assert.assertEquals;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.IllegalFormatConversionException;
+import java.util.MissingFormatArgumentException;
+import java.util.UnknownFormatConversionException;
+
+import org.junit.Test;
+
+import edu.umd.cs.findbugs.annotations.ExpectWarning;
+import edu.umd.cs.findbugs.annotations.NoWarning;
+
+public class FormatterRuntimeTest {
+
+ @Test
+ @NoWarning("FS")
+ public void shouldWork() {
+ System.out.println(String.format("%d%n%d", 42, (short) 42));
+ System.out.println(String.format("%d%n", new BigInteger("42")));
+ System.out.println(String.format("%f%n", new BigDecimal(42)));
+
+ }
+
+ @Test(expected = IllegalFormatConversionException.class)
+ @ExpectWarning("FS")
+ public void stringWhereIntegerExpected() {
+ System.out.println(String.format("%d", "test"));
+ }
+
+ @Test(expected = MissingFormatArgumentException.class)
+ @ExpectWarning("FS")
+ public void notEnoughParameters() {
+ System.out.println(String.format("%s%s", "test"));
+ }
+
+ @ExpectWarning("VA_FORMAT_STRING_BAD_CONVERSION_FROM_ARRAY")
+ public void passingAnArray() {
+ System.out.println(System.out.printf("%s", new int[] { 42, 17 }));
+ }
+
+ @ExpectWarning("FS")
+ public void passingAnIntToABoolean() {
+ System.out.println(System.out.printf("%b", 0));
+ }
+
+ @Test(expected = UnknownFormatConversionException.class)
+ @ExpectWarning("FS")
+ public void formatDateWithY() {
+ System.out.println(String.format("%Y", new Date()));
+ }
+
+ @Test
+ @NoWarning("FS")
+ public void testBug1874856FalsePositive() {
+ // None of these should yield warnings
+ Calendar c = new GregorianCalendar(1993, 4, 23);
+ String s1 = String.format("s1 Duke's Birthday: %1$tm %1$te, %1$tY", c);
+ System.out.println(s1);
+ String s2 = String.format("s2 Duke's Birthday: %1$tm %<te, %<tY", c);
+ System.out.println(s2);
+ String s3 = String.format("s3 Duke's Birthday: %2$tm %<te, %<tY", c, c);
+ System.out.println(s3);
+ String s4 = String.format(
+ "s4 Duke's Birthday: %2$tm %<te, %te %<tY %te", c, c);
+ System.out.println(s4);
+ String s6 = String.format("s6 Duke's Birthday: %1.1f %2$te, %1$f", 1.0,
+ c);
+ System.out.println(s6);
+ }
+
+ @Test(expected = MissingFormatArgumentException.class)
+ @ExpectWarning("FS")
+ public void testBug1874856TruePositive() {
+ Calendar c = new GregorianCalendar(1993, 4, 23);
+ // Actually, this one should generate a warning
+ String s5 = String.format(
+ "s5 Duke's Birthday: %<te, %te %<tY %te %12$tm ", c, c, c, c,
+ c, c, c, c, c, c, c, c);
+ System.out.println(s5);
+
+ }
+
+ @Test(expected = IllegalFormatConversionException.class)
+ @ExpectWarning("FS")
+ public void testDateMismatch() {
+ System.out.printf("%tY\n", "2008");
+ }
+
+ @Test
+ @ExpectWarning("FS")
+ public void testSqlDates() {
+ Calendar c = new GregorianCalendar(1993, 4, 23, 12, 34, 56);
+ java.sql.Date date = new java.sql.Date(c.getTimeInMillis());
+ java.sql.Time time = new java.sql.Time(c.getTimeInMillis());
+ java.sql.Timestamp timestamp = new java.sql.Timestamp(
+ c.getTimeInMillis());
+ assertEquals("05/23/93 12:34:56",
+ String.format("%1$tD %1$tT", date, date));
+ assertEquals("05/23/93 12:34:56",
+ String.format("%1$tD %1$tT", time, time));
+ assertEquals("05/23/93 12:34:56",
+ String.format("%1$tD %1$tT", timestamp, timestamp));
+
+ }
+
+}
diff --git a/.pc/applied-patches b/.pc/applied-patches
new file mode 100644
index 0000000..20046f3
--- /dev/null
+++ b/.pc/applied-patches
@@ -0,0 +1 @@
+0001-RemoveExternalLibDependencyAndFixTestModule.patch
diff --git a/build.xml b/build.xml
index 8334226..e546904 100644
--- a/build.xml
+++ b/build.xml
@@ -5,13 +5,7 @@
<property file="build.properties" />
- <property name="anttask.jar" value="${findbugs.home}/lib/findbugs-ant.jar" />
-
- <path id="compileClasspath">
- <fileset dir="lib" />
- </path>
-
- <target name="build" depends="clean,jarFile,findbugs" />
+ <target name="build" depends="clean,jarFile" />
<target name="classes">
<mkdir dir="build/classes" />
@@ -20,9 +14,9 @@
<src path="src/java" />
<src path="src/junit" />
<classpath>
+ <pathelement path="/usr/share/java/junit4.jar"/>
<pathelement location="build/classes" />
</classpath>
- <classpath refid="compileClasspath" />
</javac>
</target>
@@ -37,42 +31,35 @@
</jar>
</target>
+ <property name="junit.dir" value="build/junit" />
+ <target name="test" depends="classes">
+ <echo>Running JUnit test cases for jformatstring...</echo>
+ <delete dir="${junit.dir}"/>
+ <mkdir dir="${junit.dir}"/>
+ <junit
+ fork="yes"
+ printsummary="true"
+ haltonfailure="true"
+ haltonerror="true">
+ <classpath>
+ <pathelement path="build/classes"/>
+ <pathelement path="/usr/share/java/junit4.jar"/>
+ </classpath>
+ <formatter type="xml"/>
+ <!-- junit needs fileset to point to .java files (not .class) -->
+ <batchtest todir="${junit.dir}">
+ <fileset dir="src/junit">
+ <include name="**/*Test.java"/>
+ <include name="**/Test*.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
<target name="clean">
<delete dir="build/classes" />
</target>
-
- <target name="findbugs" depends="classes" if="findbugs.home">
- <echo>FB home ${findbugs.home}</echo>
- <echo>FB ant ${anttask.jar}</echo>
- <taskdef resource="edu/umd/cs/findbugs/anttask/tasks.properties"
- classpath="${anttask.jar}" />
- <findbugs home="${findbugs.home}" output="xml:withMessages"
- projectName="jFormatString" chooseVisitors="+CheckExpectedWarnings"
- outputFile="build/bugs.xml">
- <class location="build/classes/" />
- <sourcePath path="src/java" />
- <sourcePath path="src/junit" />
- </findbugs>
-
-
-
- <taskdef name="filterBugs" classname="edu.umd.cs.findbugs.anttask.FilterBugsTask"
- classpath="${anttask.jar}" />
- <taskdef name="printBugs"
- classname="edu.umd.cs.findbugs.anttask.ConvertXmlToTextTask"
- classpath="${anttask.jar}" />
- <filterBugs home="${findbugs.home}" priority="1"
- bugPattern="FB" inputFile="build/bugs.xml" outputFile="build/unexpected.xml">
- </filterBugs>
- <printBugs home="${findbugs.home}" inputFile="build/unexpected.xml"
- format="text">
- </printBugs>
-
-
- </target>
-
</project>
<!-- vim:set ts=4: -->
diff --git a/debian/changelog b/debian/changelog
index cea8e6d..7cb1123 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jformatstring (0.10~20131207-2.1) unstable; urgency=medium
+
+ * Non maintainer upload by the Reproducible Builds team.
+ * No source change upload to rebuild on buildd with .buildinfo files.
+
+ -- Holger Levsen <holger@debian.org> Mon, 28 Dec 2020 12:14:59 +0100
+
jformatstring (0.10~20131207-2) unstable; urgency=medium
* Team upload.
diff --git a/src/junit/edu/umd/cs/findbugs/formatStringChecker/FormatterRuntimeTest.java b/src/junit/edu/umd/cs/findbugs/formatStringChecker/FormatterRuntimeTest.java
index bcb82dc..2ca3883 100644
--- a/src/junit/edu/umd/cs/findbugs/formatStringChecker/FormatterRuntimeTest.java
+++ b/src/junit/edu/umd/cs/findbugs/formatStringChecker/FormatterRuntimeTest.java
@@ -33,13 +33,9 @@ import java.util.UnknownFormatConversionException;
import org.junit.Test;
-import edu.umd.cs.findbugs.annotations.ExpectWarning;
-import edu.umd.cs.findbugs.annotations.NoWarning;
-
public class FormatterRuntimeTest {
@Test
- @NoWarning("FS")
public void shouldWork() {
System.out.println(String.format("%d%n%d", 42, (short) 42));
System.out.println(String.format("%d%n", new BigInteger("42")));
@@ -48,35 +44,29 @@ public class FormatterRuntimeTest {
}
@Test(expected = IllegalFormatConversionException.class)
- @ExpectWarning("FS")
public void stringWhereIntegerExpected() {
System.out.println(String.format("%d", "test"));
}
@Test(expected = MissingFormatArgumentException.class)
- @ExpectWarning("FS")
public void notEnoughParameters() {
System.out.println(String.format("%s%s", "test"));
}
- @ExpectWarning("VA_FORMAT_STRING_BAD_CONVERSION_FROM_ARRAY")
public void passingAnArray() {
System.out.println(System.out.printf("%s", new int[] { 42, 17 }));
}
- @ExpectWarning("FS")
public void passingAnIntToABoolean() {
System.out.println(System.out.printf("%b", 0));
}
@Test(expected = UnknownFormatConversionException.class)
- @ExpectWarning("FS")
public void formatDateWithY() {
System.out.println(String.format("%Y", new Date()));
}
@Test
- @NoWarning("FS")
public void testBug1874856FalsePositive() {
// None of these should yield warnings
Calendar c = new GregorianCalendar(1993, 4, 23);
@@ -95,7 +85,6 @@ public class FormatterRuntimeTest {
}
@Test(expected = MissingFormatArgumentException.class)
- @ExpectWarning("FS")
public void testBug1874856TruePositive() {
Calendar c = new GregorianCalendar(1993, 4, 23);
// Actually, this one should generate a warning
@@ -107,13 +96,11 @@ public class FormatterRuntimeTest {
}
@Test(expected = IllegalFormatConversionException.class)
- @ExpectWarning("FS")
public void testDateMismatch() {
System.out.printf("%tY\n", "2008");
}
@Test
- @ExpectWarning("FS")
public void testSqlDates() {
Calendar c = new GregorianCalendar(1993, 4, 23, 12, 34, 56);
java.sql.Date date = new java.sql.Date(c.getTimeInMillis());
Debdiff
File lists identical (after any substitutions)
No differences were encountered in the control files